X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fprotocol.c;h=96d26a65085e302f2751ed30b874d5b4e71f47a5;hb=8be8746951e5538147370d9871a4c1ed0268db52;hp=4e163080b73b80e27f9f70501040fa48a4fbb12d;hpb=015f1508ad57e1ace60965952389a0b83c271178;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index 4e163080..96d26a65 100644
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -66,18 +66,22 @@
  *  - ...
  */
 
-static void decode_packet(struct dev_context *devc, const uint8_t *buf)
+static void decode_packet(struct dev_context *devc, int dmm, const uint8_t *buf)
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_analog analog;
+	struct fs9721_info info;
 	float floatval;
 	int ret;
 
 	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
 
 	/* Parse the protocol packet. */
-	if ((ret = sr_dmm_parse_fs9922(buf, &floatval, &analog)) != SR_OK) {
-	// if ((ret = sr_dmm_parse_fs9721(buf, &floatval, &analog)) != SR_OK) {
+	if (dmm == UNI_T_UT61D)
+		ret = sr_dmm_parse_fs9922(buf, &floatval, &analog);
+	else if (dmm == VOLTCRAFT_VC820)
+		ret = sr_fs9721_parse(buf, &floatval, &analog, &info);
+	if (ret != SR_OK) {
 		sr_err("Invalid DMM packet, ignoring.");
 		return;
 	}
@@ -171,7 +175,7 @@ static void log_dmm_packet(const uint8_t *buf)
 	       buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]);
 }
 
-SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
+static int uni_t_dmm_receive_data(int fd, int revents, int dmm, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
@@ -227,10 +231,15 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
 	if (buf[0] != 0xf0) {
 		/* First time: Synchronize to the start of a packet. */
 		if (!synced_on_first_packet) {
-			/* Valid packets start with '+' or '-'. */
-			if ((buf[1] != '+') && buf[1] != '-')
-			// if ((buf[1] & 0xf0) != 0x10)
-				return TRUE;
+			if (dmm == UNI_T_UT61D) {
+				/* Valid packets start with '+' or '-'. */
+				if ((buf[1] != '+') && buf[1] != '-')
+					return TRUE;
+			} else if (dmm == VOLTCRAFT_VC820) {
+				/* Valid packets have 0x1 as high nibble. */
+				if (!sr_fs9721_is_packet_start(buf[1]))
+					return TRUE;
+			}
 			synced_on_first_packet = TRUE;
 			sr_spew("Successfully synchronized on first packet.");
 		}
@@ -243,7 +252,11 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
 		if (data_byte_counter == NUM_DATA_BYTES) {
 			log_dmm_packet(pbuf);
 			data_byte_counter = 0;
-			decode_packet(devc, pbuf);
+			if (!sr_fs9721_packet_valid(pbuf)) {
+				sr_err("Invalid packet.");
+				return TRUE;
+			}
+			decode_packet(devc, dmm, pbuf);
 			memset(pbuf, 0x00, NUM_DATA_BYTES);
 		}
 	}
@@ -256,3 +269,13 @@ SR_PRIV int uni_t_dmm_receive_data(int fd, int revents, void *cb_data)
 
 	return TRUE;
 }
+
+SR_PRIV int uni_t_ut61d_receive_data(int fd, int revents, void *cb_data)
+{
+	return uni_t_dmm_receive_data(fd, revents, UNI_T_UT61D, cb_data);
+}
+
+SR_PRIV int voltcraft_vc820_receive_data(int fd, int revents, void *cb_data)
+{
+	return uni_t_dmm_receive_data(fd, revents, VOLTCRAFT_VC820, cb_data);
+}