BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rigol-ds1xx2: Unbreak listing of _VDIV and _COUPLING

This commit is contained in:
Bert Vermeulen 2013-11-03 14:16:10 +01:00 committed by Uwe Hermann
parent 5f77dffc02
commit 58f4336963
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hardware/rigol-ds1xx2/api.c
View File

@ -607,29 +607,26 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
} }
break; break;
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
for (i = 0; i < 2; i++) {
if (probe_group == &devc->analog_groups[i]) {
*data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
return SR_OK;
}
if (!probe_group) { if (!probe_group) {
sr_err("No probe group specified."); sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP; return SR_ERR_PROBE_GROUP;
} }
return SR_ERR_NA; *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
break;
case SR_CONF_VDIV: case SR_CONF_VDIV:
for (i = 0; i < 2; i++) { if (!probe_group) {
if (probe_group == &devc->analog_groups[i]) { sr_err("No probe group specified.");
return SR_ERR_PROBE_GROUP;
}
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < ARRAY_SIZE(vdivs); i++) {
rational[0] = g_variant_new_uint64(vdivs[i][0]); rational[0] = g_variant_new_uint64(vdivs[i][0]);
rational[1] = g_variant_new_uint64(vdivs[i][1]); rational[1] = g_variant_new_uint64(vdivs[i][1]);
*data = g_variant_new_tuple(rational, 2); tuple = g_variant_new_tuple(rational, 2);
return SR_OK; g_variant_builder_add_value(&gvb, tuple);
} }
if (!probe_group) { *data = g_variant_builder_end(&gvb);
sr_err("No probe group specified."); break;
return SR_ERR_PROBE_GROUP;
}
return SR_ERR_NA;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
for (i = 0; i < ARRAY_SIZE(timebases); i++) { for (i = 0; i < ARRAY_SIZE(timebases); i++) {