X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fut71x.c;h=6dbf23a47e1cbb5ca5f4881d24d4cc1c8fd9ba92;hb=64aa214a22fdbc4a083f3cd6bd06755e6784b96c;hp=0f0843e087ee2b7a577e738ac98124f37248bdc5;hpb=2b17aeb87453b956ff686c6393fa688adbc9e0b9;p=libsigrok.git

diff --git a/src/dmm/ut71x.c b/src/dmm/ut71x.c
index 0f0843e0..6dbf23a4 100644
--- a/src/dmm/ut71x.c
+++ b/src/dmm/ut71x.c
@@ -44,7 +44,7 @@ static const int exponents[16][8] = {
 	{  0,  -4,  -3,  -2, -1,  0,  0,  0 }, /* DC V */
 	{  0,  -4,  -3,  -2, -1,  0,  0,  0 }, /* AC V */
 	{ -5,   0,   0,   0,  0,  0,  0,  0 }, /* DC mV */
-	{  0,  -1,   0,   1,  2,  3,  4,  0 }, /* Resistance */
+	{  0,  -2,  -1,   0,  1,  2,  3,  0 }, /* Resistance */
 	{  0, -12, -11, -10, -9, -8, -7, -6 }, /* Capacitance */
 	{ -1,   0,   0,   0,  0,  0,  0,  0 }, /* Temp (C) */
 	{ -8,  -7,   0,   0,  0,  0,  0,  0 }, /* uA */
@@ -81,9 +81,21 @@ static int parse_value(const uint8_t *buf, struct ut71x_info *info, float *resul
 		       buf[0], buf[1], buf[2], buf[3], buf[4]);
 		return SR_ERR;
 	}
+
 	for (i = 0, intval = 0; i < num_digits; i++)
 		intval = 10 * intval + (buf[i] - '0');
 
+	/*
+	 * For measurements that only have 4000 instead of 40000 counts
+ 	 * (resistance, continuity) we have to use an additional factor of 10.
+ 	 *
+ 	 * This seems to vary between DMMs. E.g. the Voltcraft VC920 and VC940
+ 	 * have 4000 counts for resistance, whereas the Tenma 72-9380A,
+ 	 * 72-7730 and 72-7732 have 40000 counts for resistance.
+ 	 */
+	if (num_digits == 4)
+		intval *= 10;
+
 	/* Apply sign. */
 	intval *= info->is_sign ? -1 : 1;
 
@@ -272,7 +284,7 @@ static void handle_flags(struct sr_datafeed_analog *analog,
 	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;
 }
 
 static gboolean flags_valid(const struct ut71x_info *info)