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

conrad-digi-35-cpu: Fix key names for setting voltage and current

This commit is contained in:
Frank Stettner 2017-09-13 13:30:24 +02:00 committed by Uwe Hermann
parent fcc73918b0
commit 57837aeda5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hardware/conrad-digi-35-cpu/api.c
View File

@ -32,8 +32,8 @@ static const uint32_t drvopts[] = {
}; };
static const uint32_t devopts[] = { static const uint32_t devopts[] = {
SR_CONF_VOLTAGE | SR_CONF_SET, SR_CONF_VOLTAGE_TARGET | SR_CONF_SET,
SR_CONF_CURRENT | SR_CONF_SET, SR_CONF_CURRENT_LIMIT | SR_CONF_SET,
SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET, SR_CONF_OVER_CURRENT_PROTECTION_ENABLED | SR_CONF_SET,
}; };
@ -102,14 +102,14 @@ static int config_set(uint32_t key, GVariant *data,
(void)cg; (void)cg;
switch (key) { switch (key) {
case SR_CONF_VOLTAGE: case SR_CONF_VOLTAGE_TARGET:
dblval = g_variant_get_double(data); dblval = g_variant_get_double(data);
if ((dblval < 0.0) || (dblval > 35.0)) { if ((dblval < 0.0) || (dblval > 35.0)) {
sr_err("Voltage out of range (0 - 35.0)!"); sr_err("Voltage out of range (0 - 35.0)!");
return SR_ERR_ARG; return SR_ERR_ARG;
} }
return send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5)); return send_msg1(sdi, 'V', (int) (dblval * 10 + 0.5));
case SR_CONF_CURRENT: case SR_CONF_CURRENT_LIMIT:
dblval = g_variant_get_double(data); dblval = g_variant_get_double(data);
if ((dblval < 0.01) || (dblval > 2.55)) { if ((dblval < 0.01) || (dblval > 2.55)) {
sr_err("Current out of range (0 - 2.55)!"); sr_err("Current out of range (0 - 2.55)!");