X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fdmm%2Fmetex14.c;h=5c4ed0858c2816c8278ac0bfaad2d74c584422a1;hb=3b93d3c24bb21d1619d7098d7a87706a0bcf474a;hp=f7d05b638b5dccf911c29a56c9268ce03db6b9ed;hpb=fd8dc1db01ba1d0ec6a993cf6db6a2a83ec59e33;p=libsigrok.git diff --git a/src/dmm/metex14.c b/src/dmm/metex14.c index f7d05b63..5c4ed085 100644 --- a/src/dmm/metex14.c +++ b/src/dmm/metex14.c @@ -22,7 +22,6 @@ * * Metex 14-bytes ASCII protocol parser. * - * @internal * This should work for various multimeters which use this kind of protocol, * even though there is some variation in which modes each DMM supports. * @@ -173,8 +172,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 +328,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';