This will likely need to be adjusted based on shuffle table.
From f67f7d4492afcd2f2f63081729c483336b2e9d60 Mon Sep 17 00:00:00 2001
From: Richard <rsa...@rsaxvc.net>
Date: Mon, 3 Jul 2017 11:37:57 -0500
Subject: [PATCH 3/4] First pass at merging victor-dmm and serial-dmm
shuffle table may be incorrect.
---
src/hardware/victor-dmm/protocol.c | 250 ++++---------------------------------
1 file changed, 26 insertions(+), 224 deletions(-)
diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 975b9afe..8215cedc 100644
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -25,253 +25,55 @@
#include "libsigrok-internal.h"
#include "protocol.h"
-/* Reverse the high nibble into the low nibble */
-static uint8_t decode_digit(uint8_t in)
+static void log_dmm_packet(const uint8_t *buf)
{
- uint8_t out, i;
-
- out = 0;
- in >>= 4;
- for (i = 0x08; i; i >>= 1) {
- out >>= 1;
- if (in & i)
- out |= 0x08;
- }
-
- return out;
+ sr_dbg("DMM packet: %02x %02x %02x %02x %02x %02x %02x "
+ "%02x %02x %02x %02x %02x %02x %02x",
+ buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6],
+ buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13]);
}
-static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
+static void decode_buf(struct sr_dev_inst *sdi, const unsigned char *buf)
{
+ struct fs9922_info info;
struct sr_datafeed_packet packet;
struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
struct dev_context *devc;
- long factor, ivalue;
- uint8_t digits[4];
- gboolean is_duty, is_continuity, is_diode, is_ac, is_dc, is_auto;
- gboolean is_hold, is_max, is_min, is_relative, minus;
float fvalue;
+ log_dmm_packet(buf);
devc = sdi->priv;
+ /* Note: digits/spec_digits will be overridden by the DMM parsers. */
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
- digits[0] = decode_digit(data[12]);
- digits[1] = decode_digit(data[11]);
- digits[2] = decode_digit(data[10]);
- digits[3] = decode_digit(data[9]);
-
- if (digits[0] == 0x0f && digits[1] == 0x00 && digits[2] == 0x0a &&
- digits[3] == 0x0f)
- /* The "over limit" (OL) display comes through like this */
- ivalue = -1;
- else if (digits[0] > 9 || digits[1] > 9 || digits[2] > 9 || digits[3] > 9)
- /* An invalid digit in any position denotes no value. */
- ivalue = -2;
- else {
- ivalue = digits[0] * 1000;
- ivalue += digits[1] * 100;
- ivalue += digits[2] * 10;
- ivalue += digits[3];
- }
-
- /* Decimal point position */
- factor = 0;
- switch (data[7] >> 4) {
- case 0x00:
- factor = 0;
- break;
- case 0x02:
- factor = 1;
- break;
- case 0x04:
- factor = 2;
- break;
- case 0x08:
- factor = 3;
- break;
- default:
- sr_err("Unknown decimal point byte: 0x%.2x.", data[7]);
- break;
- }
-
- /* Minus flag */
- minus = data[2] & 0x01;
-
- /* Mode detail symbols on the right side of the digits */
- is_duty = is_continuity = is_diode = FALSE;
- switch (data[4]) {
- case 0x00:
- /* None. */
- break;
- case 0x01:
- /* Micro */
- factor += 6;
- break;
- case 0x02:
- /* Milli */
- factor += 3;
- break;
- case 0x04:
- /* Kilo */
- ivalue *= 1000;
- break;
- case 0x08:
- /* Mega */
- ivalue *= 1000000;
- break;
- case 0x10:
- /* Continuity shows up as Ohm + this bit */
- is_continuity = TRUE;
- break;
- case 0x20:
- /* Diode tester is Volt + this bit */
- is_diode = TRUE;
- break;
- case 0x40:
- is_duty = TRUE;
- break;
- case 0x80:
- /* Never seen */
- sr_dbg("Unknown mode right detail: 0x%.2x.", data[4]);
- break;
- default:
- sr_dbg("Unknown/invalid mode right detail: 0x%.2x.", data[4]);
- break;
- }
-
- /* Scale flags on the right, continued */
- is_max = is_min = FALSE;
- if (data[5] & 0x04)
- is_max = TRUE;
- if (data[5] & 0x08)
- is_min = TRUE;
- if (data[5] & 0x40)
- /* Nano */
- factor += 9;
-
- /* Mode detail symbols on the left side of the digits */
- is_auto = is_dc = is_ac = is_hold = is_relative = FALSE;
- if (data[6] & 0x04)
- is_auto = TRUE;
- if (data[6] & 0x08)
- is_dc = TRUE;
- if (data[6] & 0x10)
- is_ac = TRUE;
- if (data[6] & 0x20)
- is_relative = TRUE;
- if (data[6] & 0x40)
- is_hold = TRUE;
-
- fvalue = (float)ivalue / pow(10, factor);
- if (minus)
- fvalue = -fvalue;
+ analog.meaning->channels = sdi->channels;
+ analog.num_samples = 1;
+ analog.meaning->mq = 0;
- sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
+ sr_fs9922_parse(buf, &fvalue, &analog, &info);
- /* Measurement mode */
- meaning.channels = sdi->channels;
- meaning.mq = 0;
- switch (data[3]) {
- case 0x00:
- if (is_duty) {
- meaning.mq = SR_MQ_DUTY_CYCLE;
- meaning.unit = SR_UNIT_PERCENTAGE;
- } else
- sr_dbg("Unknown measurement mode: %.2x.", data[3]);
- break;
- case 0x01:
- if (is_diode) {
- meaning.mq = SR_MQ_VOLTAGE;
- meaning.unit = SR_UNIT_VOLT;
- meaning.mqflags |= SR_MQFLAG_DIODE;
- if (ivalue < 0)
- fvalue = NAN;
- } else {
- if (ivalue < 0)
- break;
- meaning.mq = SR_MQ_VOLTAGE;
- meaning.unit = SR_UNIT_VOLT;
- if (is_ac)
- meaning.mqflags |= SR_MQFLAG_AC;
- if (is_dc)
- meaning.mqflags |= SR_MQFLAG_DC;
- }
- break;
- case 0x02:
- meaning.mq = SR_MQ_CURRENT;
- meaning.unit = SR_UNIT_AMPERE;
- if (is_ac)
- meaning.mqflags |= SR_MQFLAG_AC;
- if (is_dc)
- meaning.mqflags |= SR_MQFLAG_DC;
- break;
- case 0x04:
- if (is_continuity) {
- meaning.mq = SR_MQ_CONTINUITY;
- meaning.unit = SR_UNIT_BOOLEAN;
- fvalue = ivalue < 0 ? 0.0 : 1.0;
- } else {
- meaning.mq = SR_MQ_RESISTANCE;
- meaning.unit = SR_UNIT_OHM;
- if (ivalue < 0)
- fvalue = INFINITY;
- }
- break;
- case 0x08:
- /* Never seen */
- sr_dbg("Unknown measurement mode: 0x%.2x.", data[3]);
- break;
- case 0x10:
- meaning.mq = SR_MQ_FREQUENCY;
- meaning.unit = SR_UNIT_HERTZ;
- break;
- case 0x20:
- meaning.mq = SR_MQ_CAPACITANCE;
- meaning.unit = SR_UNIT_FARAD;
- break;
- case 0x40:
- meaning.mq = SR_MQ_TEMPERATURE;
- meaning.unit = SR_UNIT_CELSIUS;
- break;
- case 0x80:
- meaning.mq = SR_MQ_TEMPERATURE;
- meaning.unit = SR_UNIT_FAHRENHEIT;
- break;
- default:
- sr_dbg("Unknown/invalid measurement mode: 0x%.2x.", data[3]);
- break;
+ if (analog.meaning->mq != 0) {
+ packet.type = SR_DF_ANALOG;
+ packet.payload = &analog;
+ sr_session_send(sdi, &packet);
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
- if (meaning.mq == 0)
- return;
-
- if (is_auto)
- meaning.mqflags |= SR_MQFLAG_AUTORANGE;
- if (is_hold)
- meaning.mqflags |= SR_MQFLAG_HOLD;
- if (is_max)
- meaning.mqflags |= SR_MQFLAG_MAX;
- if (is_min)
- meaning.mqflags |= SR_MQFLAG_MIN;
- if (is_relative)
- meaning.mqflags |= SR_MQFLAG_RELATIVE;
-
- analog.data = &fvalue;
- analog.num_samples = 1;
-
- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- sr_session_send(sdi, &packet);
+}
- sr_sw_limits_update_samples_read(&devc->limits, 1);
+static unsigned char reverse_bits(unsigned char b )
+{
+/* From https://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith64BitsDiv */
+return ((b * 0x80200802ULL) & 0x0884422110ULL) * 0x0101010101ULL >> 32;
}
SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
{
static const unsigned char obfuscation[DMM_DATA_SIZE] = "jodenxunickxia";
static const unsigned char shuffle[DMM_DATA_SIZE] = {
- 6, 13, 5, 11, 2, 7, 9, 8, 3, 10, 12, 0, 4, 1
+ 7, 0, 8, 2, 11, 6, 4, 5, 10, 3, 1, 13, 9, 13
};
GString *dbg;
@@ -287,7 +89,7 @@ SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf)
/* Deobfuscate and reorder data. */
for (i = 0; i < DMM_DATA_SIZE; i++)
- data[shuffle[i]] = (buf[i] - obfuscation[i]) & 0xff;
+ data[shuffle[i]] = reverse_bits( (buf[i] - obfuscation[i]) & 0xff );
if (sr_log_loglevel_get() >= SR_LOG_SPEW) {
dbg = g_string_sized_new(128);
--
2.11.0
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
