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

agilent-dmm: fix handling of AC/DC flags in volts mode

This commit is contained in:
Aurelien Jacobs 2016-06-12 01:41:26 +02:00
parent 4435966e43
commit 96ed86253b
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hardware/agilent-dmm/sched.c
View File

@ -449,18 +449,16 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc->cur_mqflags = 0; devc->cur_mqflags = 0;
devc->cur_exponent = 0; devc->cur_exponent = 0;
if (mstr[4] == ':') { if (mstr[4] == ':') {
if (!strncmp(mstr + 5, "AC", 2)) { if (!strncmp(mstr + 5, "ACDC", 4)) {
/* AC + DC offset */
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "AC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS; devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
} else if (!strncmp(mstr + 5, "DC", 2)) { } else if (!strncmp(mstr + 5, "DC", 2)) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags |= SR_MQFLAG_DC;
} else if (!strncmp(mstr + 5, "ACDC", 4)) {
/* AC + DC offset */
devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_DC | SR_MQFLAG_RMS;
} else {
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
} }
} else } else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC); devc->cur_mqflags |= SR_MQFLAG_DC;
} else if (!strcmp(mstr, "CURR")) { } else if (!strcmp(mstr, "CURR")) {
devc->cur_mq = SR_MQ_CURRENT; devc->cur_mq = SR_MQ_CURRENT;
devc->cur_unit = SR_UNIT_AMPERE; devc->cur_unit = SR_UNIT_AMPERE;