agilent-dmm: Assume all A and B models are identical on the wire.

[libsigrok.git] / src / hardware / agilent-dmm / sched.c

diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c
index bd9cb3885ba2ef78d528f2a3af394b691168af18..08292585803d7793c8aa0ba80a325a8047423243 100644 (file)
--- a/src/hardware/agilent-dmm/sched.c
+++ b/src/hardware/agilent-dmm/sched.c
@@ -234,6 +234,7 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
        float fvalue;
+       const char *s;
        char *mstr;
 
        sr_spew("FETC reply '%s'.", g_match_info_get_string(match));
@@ -245,16 +246,17 @@ static int recv_fetc(const struct sr_dev_inst *sdi, GMatchInfo *match)
                 * get metadata soon enough. */
                return SR_OK;
 
-       if (!strcmp(g_match_info_get_string(match), "+9.90000000E+37")) {
+       s = g_match_info_get_string(match);
+       if (!strcmp(s, "-9.90000000E+37") || !strcmp(s, "+9.90000000E+37")) {
                /* An invalid measurement shows up on the display as "O.L", but
                 * comes through like this. Since comparing 38-digit floats
                 * is rather problematic, we'll cut through this here. */
                fvalue = NAN;
        } else {
                mstr = g_match_info_fetch(match, 1);
-               if (sr_atof_ascii(mstr, &fvalue) != SR_OK || fvalue == 0.0) {
+               if (sr_atof_ascii(mstr, &fvalue) != SR_OK) {
                        g_free(mstr);
-                       sr_err("Invalid float.");
+                       sr_dbg("Invalid float.");
                        return SR_ERR;
                }
                g_free(mstr);
@@ -347,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) {
                mstr = g_match_info_fetch(match, 3);
                /* Third value, if present, is always AC or DC. */
-               if (!strcmp(mstr, "AC"))
+               if (!strcmp(mstr, "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;
-               else
+               } else {
                        sr_dbg("Unknown third argument.");
+               }
                g_free(mstr);
        } else
                devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
@@ -374,13 +379,16 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
                if (mstr[4] == ':') {
-                       if (!strcmp(mstr + 4, "AC"))
-                               devc->cur_mqflags |= SR_MQFLAG_AC;
-                       else if (!strcmp(mstr + 4, "DC"))
+                       if (!strcmp(mstr + 4, "AC")) {
+                               devc->cur_mqflags |= SR_MQFLAG_AC | SR_MQFLAG_RMS;
+                       } else if (!strcmp(mstr + 4, "DC")) {
                                devc->cur_mqflags |= SR_MQFLAG_DC;
-                       else
-                               /* "ACDC" appears as well, no idea what it means. */
+                       } else if (!strcmp(mstr + 4, "ACDC")) {
+                               /* 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
                        devc->cur_mqflags &= ~(SR_MQFLAG_AC | SR_MQFLAG_DC);
        } else if(!strcmp(mstr, "CURR")) {
@@ -398,8 +406,9 @@ static int recv_conf_u125x(const struct sr_dev_inst *sdi, GMatchInfo *match)
                }
                devc->cur_mqflags = 0;
                devc->cur_divider = 0;
-       } else
+       } else {
                sr_dbg("Unknown first argument.");
+       }
        g_free(mstr);
 
        return SR_OK;
@@ -439,7 +448,8 @@ static int recv_switch(const struct sr_dev_inst *sdi, GMatchInfo *match)
        return SR_OK;
 }
 
-SR_PRIV const struct agdmm_job agdmm_jobs_u123x[] = {
+/* Poll keys/switches and values at 7Hz, mode at 1Hz. */
+SR_PRIV const struct agdmm_job agdmm_jobs_u12xx[] = {
        { 143, send_stat },
        { 1000, send_conf },
        { 143, send_fetc },
@@ -456,13 +466,6 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = {
        { NULL, NULL }
 };
 
-SR_PRIV const struct agdmm_job agdmm_jobs_u125x[] = {
-       { 143, send_stat },
-       { 1000, send_conf },
-       { 143, send_fetc },
-       { 0, NULL }
-};
-
 SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = {
        { "^\"(\\d\\d.{18}\\d)\"$", recv_stat_u125x },
        { "^\\*([0-9])$", recv_switch },