Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / common / dmm / fs9922.c

diff --git a/hardware/common/dmm/fs9922.c b/hardware/common/dmm/fs9922.c
index 9218c73df88e3d8bf766daa54a707aa18765e5bc..c5fd63b8aab11cd1b7bc9cdb0fffe98f4287ea23 100644 (file)
--- a/hardware/common/dmm/fs9922.c
+++ b/hardware/common/dmm/fs9922.c
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "fs9922: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "fs9922"
 
 static gboolean flags_valid(const struct fs9922_info *info)
 {
@@ -54,9 +47,15 @@ static gboolean flags_valid(const struct fs9922_info *info)
                return FALSE;
        }
 
-       /* Does the packet "measure" more than one type of value? */
+       /*
+        * Does the packet "measure" more than one type of value?
+        *
+        * Note: In "diode mode", both is_diode and is_volt will be set.
+        * That is a valid use-case, so we don't want to error out below
+        * if it happens. Thus, we don't check for is_diode here.
+        */
        count = 0;
-       count += (info->is_diode) ? 1 : 0;
+       // count += (info->is_diode) ? 1 : 0;
        count += (info->is_percent) ? 1 : 0;
        count += (info->is_volt) ? 1 : 0;
        count += (info->is_ampere) ? 1 : 0;
@@ -188,7 +187,7 @@ static void parse_flags(const uint8_t *buf, struct fs9922_info *info)
        info->is_beep       = (buf[9] & (1 << 3)) != 0;
        info->is_diode      = (buf[9] & (1 << 2)) != 0;
        info->is_percent    = (buf[9] & (1 << 1)) != 0;
-       info->is_z4         = (buf[8] & (1 << 0)) != 0; /* User symbol 4 */
+       info->is_z4         = (buf[9] & (1 << 0)) != 0; /* User symbol 4 */
 
        /* Byte 10 */
        info->is_volt       = (buf[10] & (1 << 7)) != 0;
@@ -237,7 +236,8 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
                *floatval *= 1000000;
 
        /* Measurement modes */
-       if (info->is_volt) {
+       if (info->is_volt || info->is_diode) {
+               /* Note: In "diode mode" both is_diode and is_volt are set. */
                analog->mq = SR_MQ_VOLTAGE;
                analog->unit = SR_UNIT_VOLT;
        }
@@ -272,11 +272,7 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
        if (info->is_beep) {
                analog->mq = SR_MQ_CONTINUITY;
                analog->unit = SR_UNIT_BOOLEAN;
-               *floatval = (*floatval < 0.0) ? 0.0 : 1.0;
-       }
-       if (info->is_diode) {
-               analog->mq = SR_MQ_VOLTAGE;
-               analog->unit = SR_UNIT_VOLT;
+               *floatval = (*floatval == INFINITY) ? 0.0 : 1.0;
        }
        if (info->is_percent) {
                analog->mq = SR_MQ_DUTY_CYCLE;
@@ -290,6 +286,8 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
                analog->mqflags |= SR_MQFLAG_DC;
        if (info->is_auto)
                analog->mqflags |= SR_MQFLAG_AUTORANGE;
+       if (info->is_diode)
+               analog->mqflags |= SR_MQFLAG_DIODE;
        if (info->is_hold)
                analog->mqflags |= SR_MQFLAG_HOLD;
        if (info->is_max)
@@ -370,3 +368,17 @@ SR_PRIV int sr_fs9922_parse(const uint8_t *buf, float *floatval,
 
        return SR_OK;
 }
+
+SR_PRIV void sr_fs9922_z1_diode(struct sr_datafeed_analog *analog, void *info)
+{
+       struct fs9922_info *info_local;
+
+       info_local = (struct fs9922_info *)info;
+
+       /* User-defined z1 flag means "diode mode". */
+       if (info_local->is_z1) {
+               analog->mq = SR_MQ_VOLTAGE;
+               analog->unit = SR_UNIT_VOLT;
+               analog->mqflags |= SR_MQFLAG_DIODE;
+       }
+}