X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fm2110.c;h=fc09276561b6e60b134e2438b7c3a79f4605a40d;hb=9a512113ca0cfb34e8a12c678573e3687590ab41;hp=ea53fae5e738aee2d7a1dc32a0a546d2e08eeee0;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git diff --git a/src/dmm/m2110.c b/src/dmm/m2110.c index ea53fae5..fc092765 100644 --- a/src/dmm/m2110.c +++ b/src/dmm/m2110.c @@ -51,21 +51,29 @@ SR_PRIV gboolean sr_m2110_packet_valid(const uint8_t *buf) } SR_PRIV int sr_m2110_parse(const uint8_t *buf, float *floatval, - struct sr_datafeed_analog_old *analog, void *info) + struct sr_datafeed_analog *analog, void *info) { + int dot_pos, digits = 0; float val; (void)info; /* We don't know the unit, so that's the best we can do. */ - analog->mq = SR_MQ_GAIN; - analog->unit = SR_UNIT_UNITLESS; - analog->mqflags = 0; + analog->meaning->mq = SR_MQ_GAIN; + analog->meaning->unit = SR_UNIT_UNITLESS; + analog->meaning->mqflags = 0; if (!strncmp((const char *)buf, "OVERRNG", 7)) *floatval = INFINITY; - else if (sscanf((const char *)buf, "%f", &val) == 1) + else if (sscanf((const char *)buf, "%f", &val) == 1) { *floatval = val; + dot_pos = strcspn((const char *)buf, "."); + if (dot_pos < 7) + digits = 6 - dot_pos; + } + + analog->encoding->digits = digits; + analog->spec->spec_digits = digits; return SR_OK; }