serial: introduce more general "have serial comm" feature flag

[libsigrok.git] / src / dmm / metex14.c

diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c
index f7d05b638b5dccf911c29a56c9268ce03db6b9ed..d363c550921e4fe55773aef2b4779f8b7b8a608f 100644 (file)
--- a/src/dmm/metex14.c
+++ b/src/dmm/metex14.c
@@ -173,8 +173,10 @@ static void parse_flags(const char *buf, struct metex14_info *info)
                ((!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);
@@ -327,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';