X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fdmm%2Fmetex14.c;h=c5127252b34bd2d2b5ae34093e5010cc5edaeb1d;hb=ad00a54da6a17c881881d2ed7a3f3fe41170fa26;hp=9364dcb0d0f87dddc0a218f9b2afe3a0306d984d;hpb=e82d7dbc202794dc30abdb4e50cfb4507f49025e;p=libsigrok.git

diff --git a/hardware/common/dmm/metex14.c b/hardware/common/dmm/metex14.c
index 9364dcb0..c5127252 100644
--- a/hardware/common/dmm/metex14.c
+++ b/hardware/common/dmm/metex14.c
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Uwe Hermann <uwe@hermann-uwe.de>
  *
@@ -61,10 +61,10 @@ static int parse_value(const uint8_t *buf, float *result)
 
 	/* Bytes 5-7: Over limit (various forms) */
 	is_ol = 0;
-	is_ol += !strncmp((char *)&buf[5], ".OL", 3);
-	is_ol += !strncmp((char *)&buf[5], "O.L", 3);
-	is_ol += !strncmp((char *)&buf[5], "OL.", 3);
-	is_ol += !strncmp((char *)&buf[5], " OL", 3);
+	is_ol += (!strncmp((char *)&buf[5], ".OL", 3)) ? 1 : 0;
+	is_ol += (!strncmp((char *)&buf[5], "O.L", 3)) ? 1 : 0;
+	is_ol += (!strncmp((char *)&buf[5], "OL.", 3)) ? 1 : 0;
+	is_ol += (!strncmp((char *)&buf[5], " OL", 3)) ? 1 : 0;
 	if (is_ol != 0) {
 		sr_spew("Over limit.");
 		*result = INFINITY;
@@ -126,6 +126,13 @@ static void parse_flags(const char *buf, struct metex14_info *info)
 	info->is_temperature = !strncmp(buf, "TE", 2);
 	info->is_diode       = !strncmp(buf, "DI", 2);
 	info->is_frequency   = !strncmp(buf, "FR", 2);
+	info->is_gain        = !strncmp(buf, "DB", 2);
+	info->is_hfe         = !strncmp(buf, "HF", 2);
+
+	/*
+	 * Note: "DB" shows the logarithmic ratio of input voltage to a
+	 * pre-stored (user-changeable) value in the DMM.
+	 */
 
 	if (info->is_dc || info->is_ac)
 		info->is_volt = TRUE;
@@ -135,28 +142,34 @@ static void parse_flags(const char *buf, struct metex14_info *info)
 	/* Bytes 3-8: See parse_value(). */
 
 	/* Bytes 9-12: Unit */
-	if (!strcmp(buf + 9, "   A"))
+	if (!strncmp(buf + 9, "   A", 4))
 		info->is_ampere = TRUE;
-	else if (!strcmp(buf + 9, "  mA"))
+	else if (!strncmp(buf + 9, "  mA", 4))
 		info->is_milli = info->is_ampere = TRUE;
-	else if (!strcmp(buf + 9, "   V"))
+	else if (!strncmp(buf + 9, "  uA", 4))
+		info->is_micro = info->is_ampere = TRUE;
+	else if (!strncmp(buf + 9, "   V", 4))
 		info->is_volt = TRUE;
-	else if (!strcmp(buf + 9, "  mV"))
+	else if (!strncmp(buf + 9, "  mV", 4))
 		info->is_milli = info->is_volt = TRUE;
-	else if (!strcmp(buf + 9, " Ohm"))
+	else if (!strncmp(buf + 9, " Ohm", 4))
 		info->is_ohm = TRUE;
-	else if (!strcmp(buf + 9, "KOhm"))
+	else if (!strncmp(buf + 9, "KOhm", 4))
 		info->is_kilo = info->is_ohm = TRUE;
-	else if (!strcmp(buf + 9, "MOhm"))
+	else if (!strncmp(buf + 9, "MOhm", 4))
 		info->is_mega = info->is_ohm = TRUE;
-	else if (!strcmp(buf + 9, "  nF"))
+	else if (!strncmp(buf + 9, "  nF", 4))
 		info->is_nano = info->is_farad = TRUE;
-	else if (!strcmp(buf + 9, "  uF"))
+	else if (!strncmp(buf + 9, "  uF", 4))
 		info->is_micro = info->is_farad = TRUE;
-	else if (!strcmp(buf + 9, " KHz"))
+	else if (!strncmp(buf + 9, " KHz", 4))
 		info->is_kilo = info->is_hertz = TRUE;
-	else if (!strcmp(buf + 9, "   C"))
+	else if (!strncmp(buf + 9, "   C", 4))
 		info->is_celsius = TRUE;
+	else if (!strncmp(buf + 9, "  DB", 4))
+		info->is_decibel = TRUE;
+	else if (!strncmp(buf + 9, "    ", 4))
+		info->is_unitless = TRUE;
 
 	/* Byte 13: Always '\r' (carriage return, 0x0d, 13) */
 }
@@ -205,6 +218,14 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
 		analog->mq = SR_MQ_VOLTAGE;
 		analog->unit = SR_UNIT_VOLT;
 	}
+	if (info->is_gain) {
+		analog->mq = SR_MQ_GAIN;
+		analog->unit = SR_UNIT_DECIBEL_VOLT;
+	}
+	if (info->is_hfe) {
+		analog->mq = SR_MQ_GAIN;
+		analog->unit = SR_UNIT_UNITLESS;
+	}
 
 	/* Measurement related flags */
 	if (info->is_ac)
@@ -252,6 +273,15 @@ static gboolean flags_valid(const struct metex14_info *info)
 	return TRUE;
 }
 
+SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial)
+{
+	const uint8_t wbuf = 'D';
+
+	sr_spew("Requesting DMM packet.");
+
+	return (serial_write(serial, &wbuf, 1) == 1) ? SR_OK : SR_ERR;
+}
+
 SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf)
 {
 	struct metex14_info info;