X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Funi-t-ut32x%2Fprotocol.c;h=7d69091eab77eba1cc2ce839b91952aa0b7f744b;hp=a5d6f62b3351336d6d106059631a40bac50614e1;hb=a0ba75bda2d1a8d3502f365a2a2a7461a68149fc;hpb=1db537c3eb3892cd4fc7c2735d2952db4adf72ad

diff --git a/src/hardware/uni-t-ut32x/protocol.c b/src/hardware/uni-t-ut32x/protocol.c
index a5d6f62b..7d69091e 100644
--- a/src/hardware/uni-t-ut32x/protocol.c
+++ b/src/hardware/uni-t-ut32x/protocol.c
@@ -22,6 +22,14 @@
 #include <math.h>
 #include "protocol.h"
 
+#define SEP	"\r\n"
+#define BLANK	':'
+#define NEG	';'
+
+/*
+ * Get a temperature value from a four-character buffer. The value is
+ * encoded in ASCII and the unit is deci-degrees (tenths of degrees).
+ */
 static float parse_temperature(unsigned char *buf)
 {
 	float temp;
@@ -31,23 +39,22 @@ static float parse_temperature(unsigned char *buf)
 	negative = FALSE;
 	temp = 0.0;
 	for (i = 0; i < 4; i++) {
-		if (buf[i] == 0x3a)
+		if (buf[i] == BLANK)
 			continue;
-		if (buf[i] == 0x3b) {
+		if (buf[i] == NEG) {
 			if (negative) {
 				sr_dbg("Double negative sign!");
 				return NAN;
-			} else {
-				negative = TRUE;
-				continue;
 			}
+			negative = TRUE;
+			continue;
 		}
-		if (buf[i] < 0x30 || buf[i] > 0x39) {
+		if (buf[i] < '0' || buf[i] > '9') {
 			sr_dbg("Invalid digit '%.2x'!", buf[i]);
 			return NAN;
 		}
 		temp *= 10;
-		temp += (buf[i] - 0x30);
+		temp += buf[i] - '0';
 	}
 	temp /= 10;
 	if (negative)
@@ -56,7 +63,7 @@ static float parse_temperature(unsigned char *buf)
 	return temp;
 }
 
-static void process_packet(struct sr_dev_inst *sdi)
+static void process_packet(struct sr_dev_inst *sdi, uint8_t *pkt, size_t len)
 {
 	struct dev_context *devc;
 	struct sr_datafeed_packet packet;
@@ -66,34 +73,36 @@ static void process_packet(struct sr_dev_inst *sdi)
 	struct sr_analog_spec spec;
 	GString *spew;
 	float temp;
-	int i;
 	gboolean is_valid;
 
-	devc = sdi->priv;
-	sr_dbg("Received full 19-byte packet.");
 	if (sr_log_loglevel_get() >= SR_LOG_SPEW) {
-		spew = g_string_sized_new(60);
-		for (i = 0; i < devc->packet_len; i++)
-			g_string_append_printf(spew, "%.2x ", devc->packet[i]);
-		sr_spew("%s", spew->str);
-		g_string_free(spew, TRUE);
+		spew = sr_hexdump_new(pkt, len);
+		sr_spew("Got a packet, len %zu, bytes%s", len, spew->str);
+		sr_hexdump_free(spew);
 	}
+	if (len != PACKET_SIZE)
+		return;
+	if (pkt[17] != SEP[0] || pkt[18] != SEP[1])
+		return;
+	if (pkt[8] != '0' || pkt[16] != '1')
+		return;
+	sr_dbg("Processing 19-byte packet.");
 
 	is_valid = TRUE;
-	if (devc->packet[1] == 0x3b && devc->packet[2] == 0x3b
-			&& devc->packet[3] == 0x3b && devc->packet[4] == 0x3b)
+	if (pkt[1] == NEG && pkt[2] == NEG && pkt[3] == NEG && pkt[4] == NEG)
 		/* No measurement: missing channel, empty storage location, ... */
 		is_valid = FALSE;
 
-	temp = parse_temperature(devc->packet + 1);
+	temp = parse_temperature(&pkt[1]);
 	if (isnan(temp))
 		is_valid = FALSE;
 
 	if (is_valid) {
+		memset(&packet, 0, sizeof(packet));
 		sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
 		analog.meaning->mq = SR_MQ_TEMPERATURE;
 		analog.meaning->mqflags = 0;
-		switch (devc->packet[5] - 0x30) {
+		switch (pkt[5] - '0') {
 		case 1:
 			analog.meaning->unit = SR_UNIT_CELSIUS;
 			break;
@@ -105,9 +114,9 @@ static void process_packet(struct sr_dev_inst *sdi)
 			break;
 		default:
 			/* We can still pass on the measurement, whatever it is. */
-			sr_dbg("Unknown unit 0x%.2x.", devc->packet[5]);
+			sr_dbg("Unknown unit 0x%.2x.", pkt[5]);
 		}
-		switch (devc->packet[13] - 0x30) {
+		switch (pkt[13] - '0') {
 		case 0:
 			/* Channel T1. */
 			analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, 0));
@@ -123,7 +132,7 @@ static void process_packet(struct sr_dev_inst *sdi)
 			analog.meaning->mqflags |= SR_MQFLAG_RELATIVE;
 			break;
 		default:
-			sr_err("Unknown channel 0x%.2x.", devc->packet[13]);
+			sr_err("Unknown channel 0x%.2x.", pkt[13]);
 			is_valid = FALSE;
 		}
 		if (is_valid) {
@@ -136,14 +145,15 @@ static void process_packet(struct sr_dev_inst *sdi)
 		}
 	}
 
-	/* We count packets even if the temperature was invalid. This way
-	 * a sample limit on "Memory" data source still works: unused
-	 * memory slots come through as "----" measurements. */
-	devc->num_samples++;
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sdi->driver->dev_acquisition_stop(sdi);
-	}
-
+	/*
+	 * We count packets even if the measurement was invalid. This way
+	 * a sample limit on "Memory" data source still works: Unused
+	 * memory slots come through as "----" measurements.
+	 */
+	devc = sdi->priv;
+	sr_sw_limits_update_samples_read(&devc->limits, 1);
+	if (sr_sw_limits_check(&devc->limits))
+		sr_dev_acquisition_stop(sdi);
 }
 
 SR_PRIV void LIBUSB_CALL uni_t_ut32x_receive_transfer(struct libusb_transfer *transfer)
@@ -162,17 +172,16 @@ SR_PRIV void LIBUSB_CALL uni_t_ut32x_receive_transfer(struct libusb_transfer *tr
 				hid_payload_len);
 		devc->packet_len += hid_payload_len;
 		if (devc->packet_len >= 2
-				&& devc->packet[devc->packet_len - 2] == 0x0d
-				&& devc->packet[devc->packet_len - 1] == 0x0a) {
-			/* Got end of packet, but do we have a complete packet? */
-			if (devc->packet_len == 19)
-				process_packet(sdi);
-			/* Either way, done with it. */
+				&& devc->packet[devc->packet_len - 2] == SEP[0]
+				&& devc->packet[devc->packet_len - 1] == SEP[1]) {
+			/* Got end of packet. */
+			process_packet(sdi, devc->packet, devc->packet_len);
 			devc->packet_len = 0;
-		} else if (devc->packet_len > 19) {
+		} else if (devc->packet_len > PACKET_SIZE) {
 			/* Guard against garbage from the device overrunning
 			 * our packet buffer. */
 			sr_dbg("Buffer overrun!");
+			process_packet(sdi, devc->packet, devc->packet_len);
 			devc->packet_len = 0;
 		}
 	}