X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=0c6d9efe414605ab8c7ca06e3f37cb5fe97abcb4;hb=0c30b35fce5777592ff781ec9660b7e46f0af9c6;hp=d24b12c1d5c39f556e89e075724c037bf6441a8f;hpb=b6bad47c91a7cbc19571cbe49918a0612ad2babe;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index d24b12c1..0c6d9efe 100644
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -49,24 +49,6 @@
  *  f0 00 00 00 00 00 00 00 (no data bytes)
  *  f2 55 77 00 00 00 00 00 (2 data bytes, 0x55 and 0x77)
  *  f1 d1 00 00 00 00 00 00 (1 data byte, 0xd1)
- *
- * Chips and serial settings used in UNI-T DMMs (and rebranded ones):
- *  - Tecpel DMM-8060: ? (very likely Fortune Semiconductor FS9721_LP3)
- *  - Tecpel DMM-8061: ? (very likely Fortune Semiconductor FS9721_LP3)
- *  - UNI-T UT108: ?
- *  - UNI-T UT109: ?
- *  - UNI-T UT30A: ?
- *  - UNI-T UT30E: ?
- *  - UNI-T UT60E: Fortune Semiconductor FS9721_LP3
- *  - UNI-T UT60G: ?
- *  - UNI-T UT61B: ?
- *  - UNI-T UT61C: ?
- *  - UNI-T UT61D: Fortune Semiconductor FS9922-DMM4
- *  - UNI-T UT61E: Cyrustek ES51922
- *  - UNI-T UT70B: ?
- *  - Voltcraft VC-820: Fortune Semiconductor FS9721_LP3
- *  - Voltcraft VC-840: Fortune Semiconductor FS9721_LP3
- *  - ...
  */
 
 static void decode_packet(struct sr_dev_inst *sdi, int dmm, const uint8_t *buf,
@@ -238,10 +220,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_es51922_parse)
+			pbuf[devc->buflen] &= ~(1 << 7);
+	}
 
 	/* Now look for packets in that data. */
 	while ((devc->buflen - devc->bufoffset) >= udmms[dmm].packet_size) {
@@ -267,6 +263,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 	int ret;
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
+	int64_t time_ms;
 
 	(void)fd;
 	(void)revents;
@@ -283,6 +280,15 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 		sdi->driver->dev_acquisition_stop(sdi, cb_data);
 	}
 
+	if (devc->limit_msec) {
+		time_ms = (g_get_monotonic_time() - devc->starttime) / 1000;
+		if (time_ms > (int64_t)devc->limit_msec) {
+			sr_info("Requested time limit reached.");
+			sdi->driver->dev_acquisition_stop(sdi, cb_data);
+			return TRUE;
+		}
+	}
+
 	return TRUE;
 }
 
@@ -293,7 +299,10 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
 
 /* Driver-specific receive_data() wrappers */
 RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
+RECEIVE_DATA(UNI_T_UT60A, fs9721)
+RECEIVE_DATA(UNI_T_UT60E, fs9721)
 RECEIVE_DATA(UNI_T_UT61D, fs9922)
 RECEIVE_DATA(UNI_T_UT61E, es51922)
 RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)