X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fdmm%2Ffs9721.c;h=d4a857d367d75b7c59d63967175a06c93b6aee3f;hb=8882e7e6cf121edec20db5651eababacd9b6503c;hp=eaf5b477518de3f0fc10dd02623620556f639f25;hpb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;p=libsigrok.git

diff --git a/src/dmm/fs9721.c b/src/dmm/fs9721.c
index eaf5b477..d4a857d3 100644
--- a/src/dmm/fs9721.c
+++ b/src/dmm/fs9721.c
@@ -130,7 +130,7 @@ static gboolean flags_valid(const struct fs9721_info *info)
 	return TRUE;
 }
 
-static int parse_value(const uint8_t *buf, float *result)
+static int parse_value(const uint8_t *buf, float *result, int *exponent)
 {
 	int i, sign, intval = 0, digits[4];
 	uint8_t digit_bytes[4];
@@ -179,15 +179,16 @@ static int parse_value(const uint8_t *buf, float *result)
 
 	/* Decimal point position. */
 	if ((buf[3] & (1 << 3)) != 0) {
-		floatval /= 1000;
+		*exponent = -3;
 		sr_spew("Decimal point after first digit.");
 	} else if ((buf[5] & (1 << 3)) != 0) {
-		floatval /= 100;
+		*exponent = -2;
 		sr_spew("Decimal point after second digit.");
 	} else if ((buf[7] & (1 << 3)) != 0) {
-		floatval /= 10;
+		*exponent = -1;
 		sr_spew("Decimal point after third digit.");
 	} else {
+		*exponent = 0;
 		sr_spew("No decimal point in the number.");
 	}
 
@@ -244,19 +245,20 @@ static void parse_flags(const uint8_t *buf, struct fs9721_info *info)
 }
 
 static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
-			 const struct fs9721_info *info)
+			 int *exponent, const struct fs9721_info *info)
 {
 	/* Factors */
 	if (info->is_nano)
-		*floatval /= 1000000000;
+		*exponent -= 9;
 	if (info->is_micro)
-		*floatval /= 1000000;
+		*exponent -= 6;
 	if (info->is_milli)
-		*floatval /= 1000;
+		*exponent -= 3;
 	if (info->is_kilo)
-		*floatval *= 1000;
+		*exponent += 3;
 	if (info->is_mega)
-		*floatval *= 1000000;
+		*exponent += 6;
+	*floatval *= powf(10, *exponent);
 
 	/* Measurement modes */
 	if (info->is_volt) {
@@ -349,18 +351,21 @@ SR_PRIV gboolean sr_fs9721_packet_valid(const uint8_t *buf)
 SR_PRIV int sr_fs9721_parse(const uint8_t *buf, float *floatval,
 			    struct sr_datafeed_analog *analog, void *info)
 {
-	int ret;
+	int ret, exponent = 0;
 	struct fs9721_info *info_local;
 
 	info_local = (struct fs9721_info *)info;
 
-	if ((ret = parse_value(buf, floatval)) != SR_OK) {
+	if ((ret = parse_value(buf, floatval, &exponent)) != SR_OK) {
 		sr_dbg("Error parsing value: %d.", ret);
 		return ret;
 	}
 
 	parse_flags(buf, info_local);
-	handle_flags(analog, floatval, info_local);
+	handle_flags(analog, floatval, &exponent, info_local);
+
+	analog->encoding->digits  = -exponent;
+	analog->spec->spec_digits = -exponent;
 
 	return SR_OK;
 }