X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fdtm0660.c;h=42012399e22195a2b3ee10e1f5dcfe4f7cfc642f;hb=HEAD;hp=be3afe23b2852476b0d97802c22f020718746df1;hpb=b02bb45f4cf6378520e5a5b82ff39013cfa270b6;p=libsigrok.git

diff --git a/src/dmm/dtm0660.c b/src/dmm/dtm0660.c
index be3afe23..42012399 100644
--- a/src/dmm/dtm0660.c
+++ b/src/dmm/dtm0660.c
@@ -16,8 +16,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 <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -129,7 +128,7 @@ static gboolean flags_valid(const struct dtm0660_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,14 +178,18 @@ static int parse_value(const uint8_t *buf, float *result)
 	/* Decimal point position. */
 	if ((buf[3] & 0x01) != 0) {
 		floatval /= 1000;
+		*exponent = -3;
 		sr_spew("Decimal point after first digit.");
 	} else if ((buf[5] & 0x01) != 0) {
 		floatval /= 100;
+		*exponent = -2;
 		sr_spew("Decimal point after second digit.");
 	} else if ((buf[7] & 0x01) != 0) {
 		floatval /= 10;
+		*exponent = -1;
 		sr_spew("Decimal point after third digit.");
 	} else {
+		*exponent = 0;
 		sr_spew("No decimal point in the number.");
 	}
 
@@ -249,19 +252,22 @@ static void parse_flags(const uint8_t *buf, struct dtm0660_info *info)
 }
 
 static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
-			 const struct dtm0660_info *info)
+			 int *exponent, const struct dtm0660_info *info)
 {
+	int initial_exponent = *exponent;
+
 	/* 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 - initial_exponent));
 
 	/* Measurement modes */
 	if (info->is_volt) {
@@ -314,7 +320,7 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
 	if (info->is_auto)
 		analog->meaning->mqflags |= SR_MQFLAG_AUTORANGE;
 	if (info->is_diode)
-		analog->meaning->mqflags |= SR_MQFLAG_DIODE;
+		analog->meaning->mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
 	if (info->is_hold)
 		analog->meaning->mqflags |= SR_MQFLAG_HOLD;
 	if (info->is_rel)
@@ -366,18 +372,21 @@ SR_PRIV gboolean sr_dtm0660_packet_valid(const uint8_t *buf)
 SR_PRIV int sr_dtm0660_parse(const uint8_t *buf, float *floatval,
 			     struct sr_datafeed_analog *analog, void *info)
 {
-	int ret;
+	int ret, exponent = 0;
 	struct dtm0660_info *info_local;
 
-	info_local = (struct dtm0660_info *)info;
+	info_local = 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;
 }