metex14: Add support for pF (picofarad).

This is used on some Metex DMMs.

diff --git a/hardware/common/dmm/metex14.c b/hardware/common/dmm/metex14.c
index e529727b87e17aa68e06137c53e9c8b136e5bafa..7f4b890510c133fb6bffc7985bf2c5c946483c44 100644 (file)
--- a/hardware/common/dmm/metex14.c
+++ b/hardware/common/dmm/metex14.c
@@ -128,6 +128,8 @@ static void parse_flags(const char *buf, struct metex14_info *info)
                info->is_kilo = info->is_ohm = TRUE;
        else if (!strcasecmp(u, "MOhm"))
                info->is_mega = info->is_ohm = TRUE;
+       else if (!strcasecmp(u, "pF"))
+               info->is_pico = info->is_farad = TRUE;
        else if (!strcasecmp(u, "nF"))
                info->is_nano = info->is_farad = TRUE;
        else if (!strcasecmp(u, "uF"))
@@ -148,6 +150,8 @@ static void handle_flags(struct sr_datafeed_analog *analog, float *floatval,
                         const struct metex14_info *info)
 {
        /* Factors */
+       if (info->is_pico)
+               *floatval /= 1000000000000ULL;
        if (info->is_nano)
                *floatval /= 1000000000;
        if (info->is_micro)
@@ -212,6 +216,7 @@ static gboolean flags_valid(const struct metex14_info *info)
 
        /* Does the packet have more than one multiplier? */
        count = 0;
+       count += (info->is_pico) ? 1 : 0;
        count += (info->is_nano) ? 1 : 0;
        count += (info->is_micro) ? 1 : 0;
        count += (info->is_milli) ? 1 : 0;

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index 4b557bbc11e04c99cd6ef6e546c182c39d160345..a2d9a5a19dbf7c6d7db688b01ad030e25a4e31f2 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -284,8 +284,9 @@ SR_PRIV void sr_fs9721_01_10_temp_f_c(struct sr_datafeed_analog *analog, void *i
 struct metex14_info {
        gboolean is_ac, is_dc, is_resistance, is_capacity, is_temperature;
        gboolean is_diode, is_frequency, is_ampere, is_volt, is_farad;
-       gboolean is_hertz, is_ohm, is_celsius, is_nano, is_micro, is_milli;
-       gboolean is_kilo, is_mega, is_gain, is_decibel, is_hfe, is_unitless;
+       gboolean is_hertz, is_ohm, is_celsius, is_pico, is_nano, is_micro;
+       gboolean is_milli, is_kilo, is_mega, is_gain, is_decibel, is_hfe;
+       gboolean is_unitless;
 };
 
 SR_PRIV int sr_metex14_packet_request(struct sr_serial_dev_inst *serial);