X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdmm%2Fmetex14.c;h=d363c550921e4fe55773aef2b4779f8b7b8a608f;hb=aa29b255f8f507e6d842ab0c54f23d8adcd65bc1;hp=2f76672f761c1709965c89cec888f782a5e9a0c8;hpb=7fb4ff023750840c7a5ab42c06d3d3f55c97ce2e;p=libsigrok.git

diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c
index 2f76672f..d363c550 100644
--- a/src/dmm/metex14.c
+++ b/src/dmm/metex14.c
@@ -171,9 +171,12 @@ static void parse_flags(const char *buf, struct metex14_info *info)
 	info->is_gain = !strncmp(buf, "DB", 2) && info->is_decibel;
 	info->is_power = (!strncmp(buf, "dB", 2) && info->is_decibel_mw) ||
 		((!strncmp(buf, "WT", 2) && info->is_watt));
+	info->is_power_factor = !strncmp(buf, "CO", 2) && info->is_unitless;
 	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);
+		(!strncmp(buf, "  ", 2) && !info->is_ampere &&!info->is_volt &&
+		!info->is_resistance && !info->is_capacity && !info->is_frequency &&
+		!info->is_temperature && !info->is_power && !info->is_power_factor &&
+		!info->is_gain && !info->is_logic && !info->is_diode);
 	info->is_min = !strncmp(buf, "MN", 2);
 	info->is_max = !strncmp(buf, "MX", 2);
 	info->is_avg = !strncmp(buf, "AG", 2);
@@ -254,6 +257,10 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
 		else
 			analog->meaning->unit = SR_UNIT_UNITLESS;
 	}
+	if (info->is_power_factor) {
+		analog->meaning->mq = SR_MQ_POWER_FACTOR;
+		analog->meaning->unit = SR_UNIT_UNITLESS;
+	}
 	if (info->is_gain) {
 		analog->meaning->mq = SR_MQ_GAIN;
 		analog->meaning->unit = SR_UNIT_DECIBEL_VOLT;
@@ -322,7 +329,7 @@ static gboolean flags_valid(const struct metex14_info *info)
 	return TRUE;
 }
 
-#ifdef HAVE_LIBSERIALPORT
+#ifdef HAVE_SERIAL_COMM
 SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial)
 {
 	const uint8_t wbuf = 'D';
@@ -389,7 +396,7 @@ SR_PRIV int sr_metex14_parse(const uint8_t *buf, float *floatval,
 	int ret, exponent = 0;
 	struct metex14_info *info_local;
 
-	info_local = (struct metex14_info *)info;
+	info_local = info;
 
 	/* Don't print byte 13. That one contains the carriage return. */
 	sr_dbg("DMM packet: \"%.13s\"", buf);