Add support for the Tenma 72-7750 (UNI-T UT60G rebadge).

[libsigrok.git] / hardware / uni-t-dmm / protocol.c

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index aa8e078015c1aed18a2985d4b33a959d8fb7ed68..5843d5e7535b6f66043e532132286e5b62d55e4b 100644 (file)
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -24,6 +24,8 @@
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
+extern struct dmm_info udmms[];
+
 /*
  * Driver for various UNI-T multimeters (and rebranded ones).
  *
@@ -220,10 +222,24 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
 
        devc->bufoffset = 0;
 
-       /* Append the 1-7 data bytes of this chunk to pbuf. */
+       /*
+        * Append the 1-7 data bytes of this chunk to pbuf.
+        *
+        * Special case:
+        * DMMs with Cyrustek ES51922 chip need serial settings of
+        * 19230/7o1. The WCH CH9325 UART to USB/HID chip used in (some
+        * versions of) the UNI-T UT-D04 cable however, will also send
+        * the parity bit to the host in the 8-byte data chunks. This bit
+        * is encoded in bit 7 of each of the 1-7 data bytes and must thus
+        * be removed in order for the actual ES51922 protocol parser to
+        * work properly.
+        */
        num_databytes_in_chunk = buf[0] & 0x0f;
-       for (i = 0; i < num_databytes_in_chunk; i++)
-               pbuf[devc->buflen++] = buf[1 + i];
+       for (i = 0; i < num_databytes_in_chunk; i++, devc->buflen++) {
+               pbuf[devc->buflen] = buf[1 + i];
+               if (udmms[dmm].packet_parse == sr_es519xx_19200_14b_parse)
+                       pbuf[devc->buflen] &= ~(1 << 7);
+       }
 
        /* Now look for packets in that data. */
        while ((devc->buflen - devc->bufoffset) >= udmms[dmm].packet_size) {
@@ -287,8 +303,13 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
 RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
 RECEIVE_DATA(UNI_T_UT60A, fs9721)
 RECEIVE_DATA(UNI_T_UT60E, fs9721)
+RECEIVE_DATA(UNI_T_UT60G, es519xx)
+RECEIVE_DATA(UNI_T_UT61B, fs9922)
+RECEIVE_DATA(UNI_T_UT61C, fs9922)
 RECEIVE_DATA(UNI_T_UT61D, fs9922)
-RECEIVE_DATA(UNI_T_UT61E, es51922)
+RECEIVE_DATA(UNI_T_UT61E, es519xx)
 RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
 RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)
+RECEIVE_DATA(TENMA_72_7745, es519xx)
+RECEIVE_DATA(TENMA_72_7750, es519xx)