From 47166326eff917ced8563b976f85413fab2b3a06 Mon Sep 17 00:00:00 2001 From: Aurelien Jacobs Date: Wed, 17 Aug 2016 01:35:17 +0200 Subject: [PATCH] ut372: properly set encoding digits --- src/dmm/ut372.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c index 41d5a62b..ef0677bc 100644 --- a/src/dmm/ut372.c +++ b/src/dmm/ut372.c @@ -90,8 +90,9 @@ SR_PRIV gboolean sr_ut372_packet_valid(const uint8_t *buf) SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval, struct sr_datafeed_analog *analog, void *info) { - unsigned int i, j, value, divisor; + unsigned int i, j, value; uint8_t segments, flags1, flags2; + int exponent; (void) info; @@ -116,7 +117,7 @@ SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval, analog->meaning->mqflags |= SR_MQFLAG_AVG; value = 0; - divisor = 1; + exponent = 0; for (i = 0; i < 5; i++) { segments = decode_pair(buf + 1 + (2 * i)); @@ -127,10 +128,13 @@ SR_PRIV int sr_ut372_parse(const uint8_t *buf, float *floatval, } } if (segments & DECIMAL_POINT_MASK) - divisor = pow(10, i); + exponent = -i; } - *floatval = (float) value / divisor; + *floatval = (float) value * powf(10, exponent); + + analog->encoding->digits = -exponent; + analog->spec->spec_digits = -exponent; return SR_OK; }