]> sigrok.org Git - libsigrok.git/commitdiff
agilent-dmm: fix handling of continuity mode for U128x
authorAurelien Jacobs <redacted>
Tue, 13 Sep 2016 12:37:30 +0000 (14:37 +0200)
committerUwe Hermann <redacted>
Mon, 17 Oct 2016 00:24:53 +0000 (02:24 +0200)
src/hardware/agilent-dmm/protocol.c

index 01b5eaa6c63752e7f717610303a9a8eb3c734f34..b22fea9237c192a5f2d3512262b6069b68e84c46 100644 (file)
@@ -613,7 +613,7 @@ static int recv_conf_u124x_5x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                devc->cur_encoding[i] = 4;
        } else if (!strcmp(mstr, "CONT")) {
                devc->cur_mq[i] = SR_MQ_CONTINUITY;
-               devc->cur_unit[i] = SR_UNIT_BOOLEAN;
+               devc->cur_unit[i] = SR_UNIT_OHM;
                devc->cur_mqflags[i] = 0;
                devc->cur_exponent[i] = 0;
        } else if (!strcmp(mstr, "DIOD")) {
@@ -730,7 +730,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u128x[] = {
        { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u128x },
        { "^\\*([0-9])$", recv_switch },
        { "^([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))$", recv_fetc },
-       { "^\"(VOLT|CURR|RES|COND|CAP|FREQ|FC1|FC100) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
+       { "^\"(VOLT|CURR|RES|CONT|COND|CAP|FREQ|FC1|FC100) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
        { "^\"(VOLT:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
        { "^\"(CURR:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },
        { "^\"(FREQ:[ACD]+) ([-+][0-9\\.E\\-+]+),([-+][0-9]\\.[0-9]{8}E([-+][0-9]{2}))\"$", recv_conf_u124x_5x },