X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fut372.c;h=ce21273b688a9f63a9f11a942bb5a545dd3e68da;hb=HEAD;hp=41d5a62b95f3f8602d58e4c56df1ea750faacdde;hpb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;p=libsigrok.git diff --git a/src/dmm/ut372.c b/src/dmm/ut372.c index 41d5a62b..ce21273b 100644 --- a/src/dmm/ut372.c +++ b/src/dmm/ut372.c @@ -14,8 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * along with this program; if not, see . */ /* @@ -90,8 +89,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 +116,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 +127,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; }