BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uni-t-ut32x: use ASCII literals in packet parser, symbols for magic numbers 

Slightly unobfuscate the UT32x packet parser. The protocol is mostly
ASCII based, checks for hex numbers may be unexpected. Use symbolic
identifiers for the packet length and some special characters.
This commit is contained in:
Gerhard Sittig 2017-10-06 00:09:44 +02:00 committed by Uwe Hermann
parent 2631d9320d
commit 4b3197828d
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/hardware/uni-t-ut32x/protocol.c
View File

@ -22,6 +22,14 @@
#include <math.h> #include <math.h>
#include "protocol.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) static float parse_temperature(unsigned char *buf)
{ {
float temp; float temp;
@ -31,23 +39,22 @@ static float parse_temperature(unsigned char *buf)
negative = FALSE; negative = FALSE;
temp = 0.0; temp = 0.0;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (buf[i] == 0x3a) if (buf[i] == BLANK)
continue; continue;
if (buf[i] == 0x3b) { if (buf[i] == NEG) {
if (negative) { if (negative) {
sr_dbg("Double negative sign!"); sr_dbg("Double negative sign!");
return NAN; return NAN;
} else { }
negative = TRUE; negative = TRUE;
continue; continue;
} }
} if (buf[i] < '0' || buf[i] > '9') {
if (buf[i] < 0x30 || buf[i] > 0x39) {
sr_dbg("Invalid digit '%.2x'!", buf[i]); sr_dbg("Invalid digit '%.2x'!", buf[i]);
return NAN; return NAN;
} }
temp *= 10; temp *= 10;
temp += (buf[i] - 0x30); temp += buf[i] - '0';
} }
temp /= 10; temp /= 10;
if (negative) if (negative)
@ -80,8 +87,8 @@ static void process_packet(struct sr_dev_inst *sdi)
} }
is_valid = TRUE; is_valid = TRUE;
if (devc->packet[1] == 0x3b && devc->packet[2] == 0x3b if (devc->packet[1] == NEG && devc->packet[2] == NEG
&& devc->packet[3] == 0x3b && devc->packet[4] == 0x3b) && devc->packet[3] == NEG && devc->packet[4] == NEG)
/* No measurement: missing channel, empty storage location, ... */ /* No measurement: missing channel, empty storage location, ... */
is_valid = FALSE; is_valid = FALSE;
@ -93,7 +100,7 @@ static void process_packet(struct sr_dev_inst *sdi)
sr_analog_init(&analog, &encoding, &meaning, &spec, 1); sr_analog_init(&analog, &encoding, &meaning, &spec, 1);
analog.meaning->mq = SR_MQ_TEMPERATURE; analog.meaning->mq = SR_MQ_TEMPERATURE;
analog.meaning->mqflags = 0; analog.meaning->mqflags = 0;
switch (devc->packet[5] - 0x30) { switch (devc->packet[5] - '0') {
case 1: case 1:
analog.meaning->unit = SR_UNIT_CELSIUS; analog.meaning->unit = SR_UNIT_CELSIUS;
break; break;
@ -107,7 +114,7 @@ static void process_packet(struct sr_dev_inst *sdi)
/* We can still pass on the measurement, whatever it is. */ /* 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.", devc->packet[5]);
} }
switch (devc->packet[13] - 0x30) { switch (devc->packet[13] - '0') {
case 0: case 0:
/* Channel T1. */ /* Channel T1. */
analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, 0)); analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, 0));
@ -162,14 +169,14 @@ SR_PRIV void LIBUSB_CALL uni_t_ut32x_receive_transfer(struct libusb_transfer *tr
hid_payload_len); hid_payload_len);
devc->packet_len += hid_payload_len; devc->packet_len += hid_payload_len;
if (devc->packet_len >= 2 if (devc->packet_len >= 2
&& devc->packet[devc->packet_len - 2] == 0x0d && devc->packet[devc->packet_len - 2] == SEP[0]
&& devc->packet[devc->packet_len - 1] == 0x0a) { && devc->packet[devc->packet_len - 1] == SEP[1]) {
/* Got end of packet, but do we have a complete packet? */ /* Got end of packet, but do we have a complete packet? */
if (devc->packet_len == 19) if (devc->packet_len == PACKET_SIZE)
process_packet(sdi); process_packet(sdi);
/* Either way, done with it. */ /* Either way, done with it. */
devc->packet_len = 0; devc->packet_len = 0;
} else if (devc->packet_len > 19) { } else if (devc->packet_len > PACKET_SIZE) {
/* Guard against garbage from the device overrunning /* Guard against garbage from the device overrunning
* our packet buffer. */ * our packet buffer. */
sr_dbg("Buffer overrun!"); sr_dbg("Buffer overrun!");

2
src/hardware/uni-t-ut32x/protocol.h
View File

@ -35,6 +35,8 @@
#define EP_IN (0x80 | 2) #define EP_IN (0x80 | 2)
#define EP_OUT 2 #define EP_OUT 2
#define PACKET_SIZE 19
enum ut32x_data_source { enum ut32x_data_source {
DATA_SOURCE_LIVE, DATA_SOURCE_LIVE,
DATA_SOURCE_MEMORY, DATA_SOURCE_MEMORY,