metex14: properly set encoding digits

[libsigrok.git] / src / dmm / ut372.c

diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c
index d9c7720fd16bce17323271ef0c25554c7caa4131..41d5a62b95f3f8602d58e4c56df1ea750faacdde 100644 (file)
--- a/src/dmm/ut372.c
+++ b/src/dmm/ut372.c
@@ -22,10 +22,11 @@
  * UNI-T UT372 protocol parser.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <stdint.h>
 #include <math.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "ut372"
@@ -98,27 +99,27 @@ SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval,
        flags2 = decode_pair(buf + 23);
 
        if (flags2 & FLAGS2_RPM_MASK) {
-               analog->mq = SR_MQ_FREQUENCY;
-               analog->unit = SR_UNIT_REVOLUTIONS_PER_MINUTE;
+               analog->meaning->mq = SR_MQ_FREQUENCY;
+               analog->meaning->unit = SR_UNIT_REVOLUTIONS_PER_MINUTE;
        } else if (flags2 & FLAGS2_COUNT_MASK) {
-               analog->mq = SR_MQ_COUNT;
-               analog->unit = SR_UNIT_UNITLESS;
+               analog->meaning->mq = SR_MQ_COUNT;
+               analog->meaning->unit = SR_UNIT_UNITLESS;
        }
 
        if (flags1 & FLAGS1_HOLD_MASK)
-               analog->mqflags |= SR_MQFLAG_HOLD;
+               analog->meaning->mqflags |= SR_MQFLAG_HOLD;
        if (flags2 & FLAGS2_MIN_MASK)
-               analog->mqflags |= SR_MQFLAG_MIN;
+               analog->meaning->mqflags |= SR_MQFLAG_MIN;
        if (flags2 & FLAGS2_MAX_MASK)
-               analog->mqflags |= SR_MQFLAG_MAX;
+               analog->meaning->mqflags |= SR_MQFLAG_MAX;
        if (flags2 & FLAGS2_AVG_MASK)
-               analog->mqflags |= SR_MQFLAG_AVG;
+               analog->meaning->mqflags |= SR_MQFLAG_AVG;
 
        value = 0;
        divisor = 1;
 
        for (i = 0; i < 5; i++) {
-               segments = decode_pair(buf + 1 + 2*i);
+               segments = decode_pair(buf + 1 + (2 * i));
                for (j = 0; j < ARRAY_SIZE(lookup); j++) {
                        if (lookup[j] == (segments & ~DECIMAL_POINT_MASK)) {
                                value += j * pow(10, i);