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

rigol-ds: Add the TRIGGER_SLOPE entry to config_get() and config_list()

This commit is contained in:
Aurelien Jacobs 2014-03-25 23:09:57 +01:00
parent 61e77667de
commit 5d336f1130
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hardware/rigol-ds/api.c
View File

@ -143,6 +143,11 @@ static const char *trigger_sources[] = {
"D15", "D15",
}; };
static const char *trigger_slopes[] = {
"r",
"f",
};
static const char *coupling[] = { static const char *coupling[] = {
"AC", "AC",
"DC", "DC",
@ -546,6 +551,15 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi,
tmp_str = devc->trigger_source; tmp_str = devc->trigger_source;
*data = g_variant_new_string(tmp_str); *data = g_variant_new_string(tmp_str);
break; break;
case SR_CONF_TRIGGER_SLOPE:
if (!strcmp(devc->trigger_slope, "POS"))
tmp_str = "r";
else if (!strcmp(devc->trigger_slope, "NEG"))
tmp_str = "f";
else
return SR_ERR_NA;
*data = g_variant_new_string(tmp_str);
break;
case SR_CONF_TIMEBASE: case SR_CONF_TIMEBASE:
for (i = 0; i < devc->num_timebases; i++) { for (i = 0; i < devc->num_timebases; i++) {
float tb = (float)devc->timebases[i][0] / devc->timebases[i][1]; float tb = (float)devc->timebases[i][0] / devc->timebases[i][1];
@ -838,6 +852,9 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
*data = g_variant_new_strv(trigger_sources, *data = g_variant_new_strv(trigger_sources,
devc->model->has_digital ? ARRAY_SIZE(trigger_sources) : 4); devc->model->has_digital ? ARRAY_SIZE(trigger_sources) : 4);
break; break;
case SR_CONF_TRIGGER_SLOPE:
*data = g_variant_new_strv(trigger_slopes, ARRAY_SIZE(trigger_slopes));
break;
case SR_CONF_DATA_SOURCE: case SR_CONF_DATA_SOURCE:
if (!devc) if (!devc)
/* Can't know this until we have the exact model. */ /* Can't know this until we have the exact model. */