SR_CONF_SERIALCOMM
};
-static const uint32_t devopts[] = {
+static const uint32_t drvopts[] = {
SR_CONF_OSCILLOSCOPE,
+};
+
+static const uint32_t devopts[] = {
SR_CONF_LIMIT_FRAMES | SR_CONF_SET,
+ SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+ SR_CONF_NUM_HDIV | SR_CONF_GET,
+ SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_LEVEL | SR_CONF_GET | SR_CONF_SET,
- SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_SET,
- SR_CONF_NUM_HDIV | SR_CONF_GET,
- SR_CONF_SAMPLERATE | SR_CONF_GET,
SR_CONF_DATA_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
};
{SERIES(DS2000A), "DS2102A", {5, 1000000000}, 2, false},
{SERIES(DS2000A), "DS2202A", {2, 1000000000}, 2, false},
{SERIES(DS2000A), "DS2302A", {1, 1000000000}, 2, false},
+ {SERIES(DS2000A), "MSO2072A", {5, 1000000000}, 2, true},
+ {SERIES(DS2000A), "MSO2102A", {5, 1000000000}, 2, true},
+ {SERIES(DS2000A), "MSO2202A", {2, 1000000000}, 2, true},
+ {SERIES(DS2000A), "MSO2302A", {1, 1000000000}, 2, true},
{SERIES(DSO1000), "DSO1002A", {5, 1000000000}, 2, false},
{SERIES(DSO1000), "DSO1004A", {5, 1000000000}, 4, false},
{SERIES(DSO1000), "DSO1012A", {2, 1000000000}, 2, false},
{SERIES(DS1000Z), "DS1104Z", {5, 1000000000}, 4, false},
{SERIES(DS1000Z), "DS1074Z-S", {5, 1000000000}, 4, false},
{SERIES(DS1000Z), "DS1104Z-S", {5, 1000000000}, 4, false},
+ {SERIES(DS1000Z), "DS1074Z Plus", {5, 1000000000}, 4, false},
+ {SERIES(DS1000Z), "DS1104Z Plus", {5, 1000000000}, 4, false},
{SERIES(DS1000Z), "MSO1074Z", {5, 1000000000}, 4, true},
{SERIES(DS1000Z), "MSO1104Z", {5, 1000000000}, 4, true},
{SERIES(DS1000Z), "MSO1074Z-S", {5, 1000000000}, 4, true},
unsigned int i;
struct dev_context *devc = NULL;
+ /* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or channel group. */
if (key == SR_CONF_SCAN_OPTIONS) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
return SR_OK;
- } else if (key == SR_CONF_DEVICE_OPTIONS && !cg) {
+ }
+
+ /* If sdi is NULL, nothing except SR_CONF_DEVICE_OPTIONS can be provided. */
+ if (key == SR_CONF_DEVICE_OPTIONS && !sdi) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
- devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+ drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
return SR_OK;
}
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
if (!cg) {
- sr_err("No channel group specified.");
- return SR_ERR_CHANNEL_GROUP;
+ /* If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not
+ * specific to a channel group must be returned. */
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
+ devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
+ return SR_OK;
}
if (cg == devc->digital_group) {
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
devc->analog_channels[ch->index] = ch->enabled;
}
} else if (ch->type == SR_CHANNEL_LOGIC) {
- /* Only one list entry for DS1000D series. All channels are retrieved
- * together when this entry is processed. */
+ /* Only one list entry for older protocols. All channels are
+ * retrieved together when this entry is processed. */
if (ch->enabled && (
- devc->model->series->protocol > PROTOCOL_V2 ||
+ devc->model->series->protocol > PROTOCOL_V3 ||
!some_digital))
devc->enabled_channels = g_slist_append(
devc->enabled_channels, ch);
/* Turn on LA module if currently off. */
if (!devc->la_enabled) {
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ devc->model->series->protocol >= PROTOCOL_V3 ?
":LA:STAT ON" : ":LA:DISP ON") != SR_OK)
return SR_ERR;
devc->la_enabled = TRUE;
if (ch->enabled != devc->digital_channels[ch->index]) {
/* Enabled channel is currently disabled, or vice versa. */
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ devc->model->series->protocol >= PROTOCOL_V3 ?
":LA:DIG%d:DISP %s" : ":DIG%d:TURN %s", ch->index,
ch->enabled ? "ON" : "OFF") != SR_OK)
return SR_ERR;
/* Turn off LA module if on and no digital channels selected. */
if (devc->la_enabled && !some_digital)
if (rigol_ds_config_set(sdi,
- devc->model->series->protocol >= PROTOCOL_V4 ?
+ devc->model->series->protocol >= PROTOCOL_V3 ?
":LA:STAT OFF" : ":LA:DISP OFF") != SR_OK)
return SR_ERR;