X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fmetex14.c;h=0d7234f36748da95e378a977b165aae93087c199;hb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;hp=8151aa9ded319006f485bf669a089af8039714e7;hpb=155b680da482cea2381becb73c51cfb838bff31e;p=libsigrok.git

diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c
index 8151aa9d..0d7234f3 100644
--- a/src/dmm/metex14.c
+++ b/src/dmm/metex14.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 <http://www.gnu.org/licenses/>.
  */
 
 /**
@@ -30,20 +29,22 @@
  * It does _not_ work for all Metex DMMs, some use a quite different protocol.
  */
 
+#include <config.h>
 #include <string.h>
+#include <strings.h>
 #include <ctype.h>
 #include <math.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "metex14"
 
 /** Parse value from buf, byte 2-8. */
 static int parse_value(const uint8_t *buf, struct metex14_info *info,
-			float *result)
+			float *result, int *exponent)
 {
-	int i, is_ol, cnt;
+	int i, is_ol, cnt, dot_pos;
 	char valstr[7 + 1];
 
 	/* Strip all spaces from bytes 2-8. */
@@ -55,14 +56,14 @@ static int parse_value(const uint8_t *buf, struct metex14_info *info,
 
 	/* Bytes 5-7: Over limit (various forms) */
 	is_ol = 0;
-	is_ol += (!strcasecmp((const char *)&valstr, ".OL")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "O.L")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "OL.")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "OL")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "-.OL")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "-O.L")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "-OL.")) ? 1 : 0;
-	is_ol += (!strcasecmp((const char *)&valstr, "-OL")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, ".OL")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "O.L")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "OL.")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "OL")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-.OL")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-O.L")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-OL.")) ? 1 : 0;
+	is_ol += (!g_ascii_strcasecmp((const char *)&valstr, "-OL")) ? 1 : 0;
 	if (is_ol != 0) {
 		sr_spew("Over limit.");
 		*result = INFINITY;
@@ -87,6 +88,12 @@ static int parse_value(const uint8_t *buf, struct metex14_info *info,
 	/* Bytes 2-8: Sign, value (up to 5 digits) and decimal point */
 	sscanf((const char *)&valstr, "%f", result);
 
+	dot_pos = strcspn(valstr, ".");
+	if (dot_pos < cnt)
+		*exponent = -(cnt - dot_pos - 1);
+	else
+		*exponent = 0;
+
 	sr_spew("The display value is %f.", *result);
 
 	return SR_OK;
@@ -113,49 +120,49 @@ static void parse_flags(const char *buf, struct metex14_info *info)
 
 	/* Bytes 9-12: Unit */
 	u = (const char *)&unit;
-	if (!strcasecmp(u, "A"))
+	if (!g_ascii_strcasecmp(u, "A"))
 		info->is_ampere = TRUE;
-	else if (!strcasecmp(u, "mA"))
+	else if (!g_ascii_strcasecmp(u, "mA"))
 		info->is_milli = info->is_ampere = TRUE;
-	else if (!strcasecmp(u, "uA"))
+	else if (!g_ascii_strcasecmp(u, "uA"))
 		info->is_micro = info->is_ampere = TRUE;
-	else if (!strcasecmp(u, "V"))
+	else if (!g_ascii_strcasecmp(u, "V"))
 		info->is_volt = TRUE;
-	else if (!strcasecmp(u, "mV"))
+	else if (!g_ascii_strcasecmp(u, "mV"))
 		info->is_milli = info->is_volt = TRUE;
-	else if (!strcasecmp(u, "Ohm"))
+	else if (!g_ascii_strcasecmp(u, "Ohm"))
 		info->is_ohm = TRUE;
-	else if (!strcasecmp(u, "KOhm"))
+	else if (!g_ascii_strcasecmp(u, "KOhm"))
 		info->is_kilo = info->is_ohm = TRUE;
-	else if (!strcasecmp(u, "MOhm"))
+	else if (!g_ascii_strcasecmp(u, "MOhm"))
 		info->is_mega = info->is_ohm = TRUE;
-	else if (!strcasecmp(u, "pF"))
+	else if (!g_ascii_strcasecmp(u, "pF"))
 		info->is_pico = info->is_farad = TRUE;
-	else if (!strcasecmp(u, "nF"))
+	else if (!g_ascii_strcasecmp(u, "nF"))
 		info->is_nano = info->is_farad = TRUE;
-	else if (!strcasecmp(u, "uF"))
+	else if (!g_ascii_strcasecmp(u, "uF"))
 		info->is_micro = info->is_farad = TRUE;
-	else if (!strcasecmp(u, "KHz"))
+	else if (!g_ascii_strcasecmp(u, "KHz"))
 		info->is_kilo = info->is_hertz = TRUE;
-	else if (!strcasecmp(u, "C"))
+	else if (!g_ascii_strcasecmp(u, "C"))
 		info->is_celsius = TRUE;
-	else if (!strcasecmp(u, "DB"))
+	else if (!g_ascii_strcasecmp(u, "DB"))
 		info->is_decibel = TRUE;
-	else if (!strcasecmp(u, ""))
+	else if (!g_ascii_strcasecmp(u, ""))
 		info->is_unitless = TRUE;
 
 	/* Bytes 0-1: Measurement mode, except AC/DC */
-	info->is_resistance  = !strncmp(buf, "OH", 2) ||
+	info->is_resistance = !strncmp(buf, "OH", 2) ||
 		(!strncmp(buf, "  ", 2) && info->is_ohm);
-	info->is_capacity    = !strncmp(buf, "CA", 2) ||
+	info->is_capacity = !strncmp(buf, "CA", 2) ||
 		(!strncmp(buf, "  ", 2) && info->is_farad);
 	info->is_temperature = !strncmp(buf, "TE", 2);
-	info->is_diode       = !strncmp(buf, "DI", 2) ||
+	info->is_diode = !strncmp(buf, "DI", 2) ||
 		(!strncmp(buf, "  ", 2) && info->is_volt && info->is_milli);
-	info->is_frequency   = !strncmp(buf, "FR", 2) ||
+	info->is_frequency = !strncmp(buf, "FR", 2) ||
 		(!strncmp(buf, "  ", 2) && info->is_hertz);
-	info->is_gain        = !strncmp(buf, "DB", 2);
-	info->is_hfe         = !strncmp(buf, "HF", 2) ||
+	info->is_gain = !strncmp(buf, "DB", 2);
+	info->is_hfe = !strncmp(buf, "HF", 2) ||
 		(!strncmp(buf, "  ", 2) && !info->is_volt && !info->is_ohm &&
 		 !info->is_logic && !info->is_farad && !info->is_hertz);
 	/*
@@ -169,71 +176,74 @@ static void parse_flags(const char *buf, struct metex14_info *info)
 }
 
 static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
-			 const struct metex14_info *info)
+			 int *exponent, const struct metex14_info *info)
 {
+	int factor = 0;
 	/* Factors */
 	if (info->is_pico)
-		*floatval /= 1000000000000ULL;
+		factor -= 12;
 	if (info->is_nano)
-		*floatval /= 1000000000;
+		factor -= 9;
 	if (info->is_micro)
-		*floatval /= 1000000;
+		factor -= 6;
 	if (info->is_milli)
-		*floatval /= 1000;
+		factor -= 3;
 	if (info->is_kilo)
-		*floatval *= 1000;
+		factor += 3;
 	if (info->is_mega)
-		*floatval *= 1000000;
+		factor += 6;
+	*floatval *= powf(10, factor);
+	*exponent += factor;
 
 	/* Measurement modes */
 	if (info->is_volt) {
-		analog->mq = SR_MQ_VOLTAGE;
-		analog->unit = SR_UNIT_VOLT;
+		analog->meaning->mq = SR_MQ_VOLTAGE;
+		analog->meaning->unit = SR_UNIT_VOLT;
 	}
 	if (info->is_ampere) {
-		analog->mq = SR_MQ_CURRENT;
-		analog->unit = SR_UNIT_AMPERE;
+		analog->meaning->mq = SR_MQ_CURRENT;
+		analog->meaning->unit = SR_UNIT_AMPERE;
 	}
 	if (info->is_ohm) {
-		analog->mq = SR_MQ_RESISTANCE;
-		analog->unit = SR_UNIT_OHM;
+		analog->meaning->mq = SR_MQ_RESISTANCE;
+		analog->meaning->unit = SR_UNIT_OHM;
 	}
 	if (info->is_hertz) {
-		analog->mq = SR_MQ_FREQUENCY;
-		analog->unit = SR_UNIT_HERTZ;
+		analog->meaning->mq = SR_MQ_FREQUENCY;
+		analog->meaning->unit = SR_UNIT_HERTZ;
 	}
 	if (info->is_farad) {
-		analog->mq = SR_MQ_CAPACITANCE;
-		analog->unit = SR_UNIT_FARAD;
+		analog->meaning->mq = SR_MQ_CAPACITANCE;
+		analog->meaning->unit = SR_UNIT_FARAD;
 	}
 	if (info->is_celsius) {
-		analog->mq = SR_MQ_TEMPERATURE;
-		analog->unit = SR_UNIT_CELSIUS;
+		analog->meaning->mq = SR_MQ_TEMPERATURE;
+		analog->meaning->unit = SR_UNIT_CELSIUS;
 	}
 	if (info->is_diode) {
-		analog->mq = SR_MQ_VOLTAGE;
-		analog->unit = SR_UNIT_VOLT;
+		analog->meaning->mq = SR_MQ_VOLTAGE;
+		analog->meaning->unit = SR_UNIT_VOLT;
 	}
 	if (info->is_gain) {
-		analog->mq = SR_MQ_GAIN;
-		analog->unit = SR_UNIT_DECIBEL_VOLT;
+		analog->meaning->mq = SR_MQ_GAIN;
+		analog->meaning->unit = SR_UNIT_DECIBEL_VOLT;
 	}
 	if (info->is_hfe) {
-		analog->mq = SR_MQ_GAIN;
-		analog->unit = SR_UNIT_UNITLESS;
+		analog->meaning->mq = SR_MQ_GAIN;
+		analog->meaning->unit = SR_UNIT_UNITLESS;
 	}
 	if (info->is_logic) {
-		analog->mq = SR_MQ_GAIN;
-		analog->unit = SR_UNIT_UNITLESS;
+		analog->meaning->mq = SR_MQ_GAIN;
+		analog->meaning->unit = SR_UNIT_UNITLESS;
 	}
 
 	/* Measurement related flags */
 	if (info->is_ac)
-		analog->mqflags |= SR_MQFLAG_AC;
+		analog->meaning->mqflags |= SR_MQFLAG_AC;
 	if (info->is_dc)
-		analog->mqflags |= SR_MQFLAG_DC;
+		analog->meaning->mqflags |= SR_MQFLAG_DC;
 	if (info->is_diode)
-		analog->mqflags |= SR_MQFLAG_DIODE;
+		analog->meaning->mqflags |= SR_MQFLAG_DIODE;
 }
 
 static gboolean flags_valid(const struct metex14_info *info)
@@ -283,7 +293,7 @@ SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial)
 
 	sr_spew("Requesting DMM packet.");
 
-	return (serial_write(serial, &wbuf, 1) == 1) ? SR_OK : SR_ERR;
+	return (serial_write_nonblocking(serial, &wbuf, 1) == 1) ? SR_OK : SR_ERR;
 }
 #endif
 
@@ -321,7 +331,7 @@ SR_PRIV gboolean sr_metex14_packet_valid(const uint8_t *buf)
 SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 			     struct sr_datafeed_analog *analog, void *info)
 {
-	int ret;
+	int ret, exponent = 0;
 	struct metex14_info *info_local;
 
 	info_local = (struct metex14_info *)info;
@@ -331,13 +341,16 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 
 	memset(info_local, 0x00, sizeof(struct metex14_info));
 
-	if ((ret = parse_value(buf, info_local, floatval)) != SR_OK) {
+	if ((ret = parse_value(buf, info_local, floatval, &exponent)) != SR_OK) {
 		sr_dbg("Error parsing value: %d.", ret);
 		return ret;
 	}
 
 	parse_flags((const char *)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;
 }