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

agilent-dmm: Add RMS flag to AC voltage modes.

This commit is contained in:
Bert Vermeulen 2014-08-29 21:35:07 +02:00
parent f216eb8699
commit 51b92b7da4
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -256,7 +256,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
mstr = g_match_info_fetch(match, 1); mstr = g_match_info_fetch(match, 1);
if (sr_atof_ascii(mstr, &fvalue) != SR_OK) { if (sr_atof_ascii(mstr, &fvalue) != SR_OK) {
g_free(mstr); g_free(mstr);
sr_err("Invalid float."); sr_dbg("Invalid float.");
return SR_ERR; return SR_ERR;
} }
g_free(mstr); g_free(mstr);
@ -349,12 +349,15 @@ static int recv_conf_u123x(const struct sr_dev_inst *sdi, GMatchInfo *match)
if (g_match_info_get_match_count(match) == 4) { if (g_match_info_get_match_count(match) == 4) {
mstr = g_match_info_fetch(match, 3); mstr = g_match_info_fetch(match, 3);
/* Third value, if present, is always AC or DC. */ /* Third value, if present, is always AC or DC. */
if (!strcmp(mstr, "AC")) if (!strcmp(mstr, "AC")) {
devc->cur_mqflags |= SR_MQFLAG_AC; devc->cur_mqflags |= SR_MQFLAG_AC;
else if (!strcmp(mstr, "DC")) if (devc->cur_mq == SR_MQ_VOLTAGE)
devc->cur_mqflags |= SR_MQFLAG_RMS;
} else if (!strcmp(mstr, "DC")) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags |= SR_MQFLAG_DC;
else } else {
sr_dbg("Unknown third argument."); sr_dbg("Unknown third argument.");
}
g_free(mstr); g_free(mstr);
} else } else
devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC); devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
@ -376,13 +379,16 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
devc->cur_mqflags = 0; devc->cur_mqflags = 0;
devc->cur_divider = 0; devc->cur_divider = 0;
if (mstr[4] == ':') { if (mstr[4] == ':') {
if (!strcmp(mstr + 4, "AC")) if (!strcmp(mstr + 4, "AC")) {
devc->cur_mqflags |= SR_MQFLAG_AC; devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
else if (!strcmp(mstr + 4, "DC")) } else if (!strcmp(mstr + 4, "DC")) {
devc->cur_mqflags |= SR_MQFLAG_DC; devc->cur_mqflags |= SR_MQFLAG_DC;
else } else if (!strcmp(mstr + 4, "ACDC")) {
/* "ACDC" appears as well, no idea what it means. */ /* 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); 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_AC | SR_MQFLAG_DC);
} else if(!strcmp(mstr, "CURR")) { } else if(!strcmp(mstr, "CURR")) {
@ -400,8 +406,9 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
} }
devc->cur_mqflags = 0; devc->cur_mqflags = 0;
devc->cur_divider = 0; devc->cur_divider = 0;
} else } else {
sr_dbg("Unknown first argument."); sr_dbg("Unknown first argument.");
}
g_free(mstr); g_free(mstr);
return SR_OK; return SR_OK;