aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2017-01-17 23:42:18 +0100
committerAurelien Jacobs <aurel@gnuage.org>2017-01-22 19:03:29 +0100
commit29bdeeb54937cdfd3adaef98d6acee510cb91a47 (patch)
treeef67ad6e9fc885e020e94b6278b98ce1ba1109e3
parentc2e3c322e6427986208aef3df414dfc1e936552f (diff)
agilent-dmm: Add support for Vsense (Non-Contact Voltage).
-rw-r--r--src/hardware/agilent-dmm/protocol.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/hardware/agilent-dmm/protocol.c b/src/hardware/agilent-dmm/protocol.c
index 77729e8..1e178ae 100644
--- a/src/hardware/agilent-dmm/protocol.c
+++ b/src/hardware/agilent-dmm/protocol.c
@@ -742,6 +742,13 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
* an error in this mode, so don't even call it.
*/
devc->mode_squarewave = 1;
+ } else if (!strcmp(mstr, "NCV")) {
+ devc->cur_mq[i] = SR_MQ_VOLTAGE;
+ devc->cur_unit[i] = SR_UNIT_VOLT;
+ devc->cur_mqflags[i] = SR_MQFLAG_AC;
+ devc->cur_exponent[i] = -3;
+ devc->cur_digits[i] = -1;
+ devc->cur_encoding[i] = 0;
} else {
sr_dbg("Unknown first argument '%s'.", mstr);
}
@@ -946,6 +953,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u128x[] = {
{ "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
{ "^\"(PULS:PWID|PULS:PWID:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
{ "^\"(TEMP:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x },
+ { "^\"(NCV) (HIGH|LOW)\"$", recv_conf_u124x_5x },
{ "^\"(DIOD|SQU|PULS:PDUT|TEMP)\"$", recv_conf_u124x_5x },
{ "^\"((\\d{2})(\\d{5})\\d{7})\"$", recv_log_u128x },
{ "^\\*E$", recv_err },