diff --git a/DSView/pv/mainwindow.cpp b/DSView/pv/mainwindow.cpp index ed9b9c34..1c5d2075 100644 --- a/DSView/pv/mainwindow.cpp +++ b/DSView/pv/mainwindow.cpp @@ -700,7 +700,6 @@ namespace pv { s_obj["strigger"] = logicSig->get_trig(); } - if (s->signal_type() == DSO_SIGNAL) { @@ -722,6 +721,7 @@ namespace pv s_obj["mapUnit"] = analogSig->get_mapUnit(); s_obj["mapMin"] = analogSig->get_mapMin(); s_obj["mapMax"] = analogSig->get_mapMax(); + s_obj["mapDefault"] = analogSig->get_mapDefault(); } channelVar.append(s_obj); } @@ -903,6 +903,7 @@ namespace pv for (const QJsonValue &value : sessionObj["channel"].toArray()) { QJsonObject obj = value.toObject(); + if ((probe->index == obj["index"].toDouble()) && (probe->type == obj["type"].toDouble())) { @@ -921,6 +922,12 @@ namespace pv probe->map_unit = g_strdup(obj["mapUnit"].toString().toStdString().c_str()); probe->map_min = obj["mapMin"].toDouble(); probe->map_max = obj["mapMax"].toDouble(); + + if (obj.contains("mapDefault")) + { + probe->map_default = obj["mapDefault"].toBool(); + } + break; } } @@ -934,7 +941,6 @@ namespace pv // load signal setting if (mode == DSO) { - for (auto s : _session->get_signals()) { for (const QJsonValue &value : sessionObj["channel"].toArray()) diff --git a/DSView/pv/sigsession.cpp b/DSView/pv/sigsession.cpp index 5fd2d991..bc6a2d7c 100644 --- a/DSView/pv/sigsession.cpp +++ b/DSView/pv/sigsession.cpp @@ -458,6 +458,7 @@ namespace pv int run_dex = 0; clear_all_decode_task(run_dex); + clear_decode_result(); _capture_data->clear(); _view_data->clear(); diff --git a/libsigrok4DSL/hardware/DSL/dscope.c b/libsigrok4DSL/hardware/DSL/dscope.c index 70bf406c..db29510f 100644 --- a/libsigrok4DSL/hardware/DSL/dscope.c +++ b/libsigrok4DSL/hardware/DSL/dscope.c @@ -83,6 +83,7 @@ static const int32_t sessions_daq[] = { SR_CONF_SAMPLERATE, SR_CONF_LIMIT_SAMPLES, SR_CONF_OPERATION_MODE, + SR_CONF_BANDWIDTH_LIMIT, SR_CONF_TIMEBASE, SR_CONF_TRIGGER_SLOPE, SR_CONF_TRIGGER_SOURCE, diff --git a/libsigrok4DSL/hardware/DSL/dsl.c b/libsigrok4DSL/hardware/DSL/dsl.c index 979851f2..da262ea4 100644 --- a/libsigrok4DSL/hardware/DSL/dsl.c +++ b/libsigrok4DSL/hardware/DSL/dsl.c @@ -45,15 +45,6 @@ static const int32_t probeOptions[] = { SR_CONF_PROBE_MAP_MAX, }; -static const int32_t probeSessions[] = { - SR_CONF_PROBE_COUPLING, - SR_CONF_PROBE_VDIV, - SR_CONF_PROBE_MAP_DEFAULT, - SR_CONF_PROBE_MAP_UNIT, - SR_CONF_PROBE_MAP_MIN, - SR_CONF_PROBE_MAP_MAX, -}; - static const uint8_t probeCoupling[] = { SR_DC_COUPLING, SR_AC_COUPLING, @@ -1775,10 +1766,7 @@ SR_PRIV int dsl_config_list(int key, GVariant **data, const struct sr_dev_inst * *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), probeOptions, ARRAY_SIZE(probeOptions)*sizeof(int32_t), TRUE, NULL, NULL); break; - case SR_CONF_PROBE_SESSIONS: - *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), - probeSessions, ARRAY_SIZE(probeSessions)*sizeof(int32_t), TRUE, NULL, NULL); - break; + case SR_CONF_PROBE_VDIV: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); for (i = 0; devc->profile->dev_caps.vdivs[i]; i++); diff --git a/libsigrok4DSL/hardware/demo/demo.c b/libsigrok4DSL/hardware/demo/demo.c index 27a16257..e84dbfd9 100644 --- a/libsigrok4DSL/hardware/demo/demo.c +++ b/libsigrok4DSL/hardware/demo/demo.c @@ -637,10 +637,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), probeOptions, ARRAY_SIZE(probeOptions)*sizeof(int32_t), TRUE, NULL, NULL); break; - case SR_CONF_PROBE_SESSIONS: - *data = g_variant_new_from_data(G_VARIANT_TYPE("ai"), - probeSessions, ARRAY_SIZE(probeSessions)*sizeof(int32_t), TRUE, NULL, NULL); - break; + case SR_CONF_PROBE_VDIV: g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); for (i = 0; devc->profile->dev_caps.vdivs[i]; i++); diff --git a/libsigrok4DSL/hardware/demo/demo.h b/libsigrok4DSL/hardware/demo/demo.h index 4a407ea9..da1a2774 100644 --- a/libsigrok4DSL/hardware/demo/demo.h +++ b/libsigrok4DSL/hardware/demo/demo.h @@ -227,15 +227,6 @@ static const int32_t probeOptions[] = { SR_CONF_PROBE_MAP_MAX, }; -static const int32_t probeSessions[] = { - SR_CONF_PROBE_COUPLING, - SR_CONF_PROBE_VDIV, - SR_CONF_PROBE_MAP_DEFAULT, - SR_CONF_PROBE_MAP_UNIT, - SR_CONF_PROBE_MAP_MIN, - SR_CONF_PROBE_MAP_MAX, -}; - static const uint8_t probeCoupling[] = { SR_DC_COUPLING, SR_AC_COUPLING, diff --git a/libsigrok4DSL/libsigrok.h b/libsigrok4DSL/libsigrok.h index 5d6b786a..b606c152 100644 --- a/libsigrok4DSL/libsigrok.h +++ b/libsigrok4DSL/libsigrok.h @@ -984,9 +984,6 @@ enum sr_config_option_id /** Probe options */ SR_CONF_PROBE_CONFIGS = 30078, - /** Probe options */ - SR_CONF_PROBE_SESSIONS = 30079, - /** Enable */ SR_CONF_PROBE_EN = 30080,