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

drivers: Simplify some more trigger slope settings.

This commit is contained in:
Uwe Hermann 2017-08-06 15:58:52 +02:00
parent 3782e57129
commit db85496ed1
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hardware/hantek-dso/api.c
View File

@ -486,8 +486,7 @@ static int config_set(uint32_t key, GVariant *data,
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0) if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
return SR_ERR_ARG; return SR_ERR_ARG;
devc->triggerslope = (trigger_slopes[idx][0] == 'r') devc->triggerslope = idx;
? SLOPE_POSITIVE : SLOPE_NEGATIVE;
break; break;
case SR_CONF_HORIZ_TRIGGERPOS: case SR_CONF_HORIZ_TRIGGERPOS:
tmp_double = g_variant_get_double(data); tmp_double = g_variant_get_double(data);

13
src/hardware/link-mso19/api.c
View File

@ -53,6 +53,10 @@ static const uint64_t samplerates[] = {
SR_HZ(100), SR_HZ(100),
}; };
static const char *trigger_slopes[2] = {
"r", "f",
};
static GSList *scan(struct sr_dev_driver *di, GSList *options) static GSList *scan(struct sr_dev_driver *di, GSList *options)
{ {
int i; int i;
@ -253,14 +257,9 @@ static int config_set(int key, GVariant *data,
case SR_CONF_CAPTURE_RATIO: case SR_CONF_CAPTURE_RATIO:
break; break;
case SR_CONF_TRIGGER_SLOPE: case SR_CONF_TRIGGER_SLOPE:
slope = g_variant_get_string(data, NULL); if ((idx = std_str_idx(data, ARRAY_AND_SIZE(trigger_slopes))) < 0)
if (!slope || !(slope[0] == 'f' || slope[0] == 'r'))
sr_err("Invalid trigger slope");
return SR_ERR_ARG; return SR_ERR_ARG;
} devc->trigger_slope = idx;
devc->trigger_slope = (slope[0] == 'r')
? SLOPE_POSITIVE : SLOPE_NEGATIVE;
break; break;
case SR_CONF_HORIZ_TRIGGERPOS: case SR_CONF_HORIZ_TRIGGERPOS:
pos = g_variant_get_double(data); pos = g_variant_get_double(data);