serial-dmm: Add PeakTech 4370 support.

[libsigrok.git] / hardware / serial-dmm / protocol.c

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index a3f25d0eea5b3941ae57eeabc5fd94a7345706cc..3258369da2b71886f600a32827660584fe162dfc 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -49,7 +49,19 @@ SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info)
        /* User-defined FS9721_LP3 flag 'c2c1_10' means temperature. */
        if (info_local->is_c2c1_10) {
                analog->mq = SR_MQ_TEMPERATURE;
-               /* No Kelvin or Fahrenheit from the device, just Celsius. */
+               analog->unit = SR_UNIT_CELSIUS;
+       }
+}
+
+SR_PRIV void dmm_details_va18b(struct sr_datafeed_analog *analog, void *info)
+{
+       struct fs9721_info *info_local;
+
+       info_local = (struct fs9721_info *)info;
+
+       /* User-defined FS9721_LP3 flag 'c2c1_01' means temperature. */
+       if (info_local->is_c2c1_01) {
+               analog->mq = SR_MQ_TEMPERATURE;
                analog->unit = SR_UNIT_CELSIUS;
        }
 }
@@ -74,7 +86,8 @@ static void handle_packet(const uint8_t *buf, struct dev_context *devc,
        dmms[dmm].packet_parse(buf, &floatval, analog, info);
        analog->data = &floatval;
 
-       dmms[dmm].dmm_details(analog, info);
+       if (dmms[dmm].dmm_details)
+               dmms[dmm].dmm_details(analog, info);
 
        if (analog->mq != -1) {
                /* Got a measurement. */
@@ -120,6 +133,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 {
        struct sr_dev_inst *sdi;
        struct dev_context *devc;
+       int ret;
 
        (void)fd;
 
@@ -132,6 +146,15 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
        if (revents == G_IO_IN) {
                /* Serial data arrived. */
                handle_new_data(devc, dmm, info);
+       } else {
+               /* Timeout, send another packet request (if DMM needs it). */
+               if (dmms[dmm].packet_request) {
+                       ret = dmms[dmm].packet_request(devc->serial);
+                       if (ret < 0) {
+                               sr_err("Failed to request packet: %d.", ret);
+                               return FALSE;
+                       }
+               }
        }
 
        if (devc->num_samples >= devc->limit_samples) {
@@ -146,13 +169,47 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 SR_PRIV int digitek_dt4000zc_receive_data(int fd, int revents, void *cb_data)
 {
        struct fs9721_info info;
-
        return receive_data(fd, revents, DIGITEK_DT4000ZC, &info, cb_data);
 }
 
 SR_PRIV int tekpower_tp4000zc_receive_data(int fd, int revents, void *cb_data)
 {
        struct fs9721_info info;
-
        return receive_data(fd, revents, TEKPOWER_TP4000ZC, &info, cb_data);
 }
+
+SR_PRIV int metex_me31_receive_data(int fd, int revents, void *cb_data)
+{
+       struct metex14_info info;
+       return receive_data(fd, revents, METEX_ME31, &info, cb_data);
+}
+
+SR_PRIV int peaktech_3410_receive_data(int fd, int revents, void *cb_data)
+{
+       struct metex14_info info;
+       return receive_data(fd, revents, PEAKTECH_3410, &info, cb_data);
+}
+
+SR_PRIV int mastech_mas345_receive_data(int fd, int revents, void *cb_data)
+{
+       struct metex14_info info;
+       return receive_data(fd, revents, MASTECH_MAS345, &info, cb_data);
+}
+
+SR_PRIV int va_va18b_receive_data(int fd, int revents, void *cb_data)
+{
+       struct fs9721_info info;
+       return receive_data(fd, revents, VA_VA18B, &info, cb_data);
+}
+
+SR_PRIV int metex_m3640d_receive_data(int fd, int revents, void *cb_data)
+{
+       struct metex14_info info;
+       return receive_data(fd, revents, METEX_M3640D, &info, cb_data);
+}
+
+SR_PRIV int peaktech_4370_receive_data(int fd, int revents, void *cb_data)
+{
+       struct metex14_info info;
+       return receive_data(fd, revents, PEAKTECH_4370, &info, cb_data);
+}