X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fvictor-dmm%2Fprotocol.c;h=23dfe7ab4e711c02756144bfa36411fa07233a92;hb=eca9772971873206364e5cf9882c238766ac5dbb;hp=1d2910fbfb4ddff77c8772ea850077a3b47745d6;hpb=28b424349363a9002e7af7300a7f2941a8469004;p=libsigrok.git
diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 1d2910fb..23dfe7ab 100644
--- a/src/hardware/victor-dmm/protocol.c
+++ b/src/hardware/victor-dmm/protocol.c
@@ -17,10 +17,11 @@
* along with this program. If not, see .
*/
+#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#include "protocol.h"
@@ -43,7 +44,7 @@ static uint8_t decode_digit(uint8_t in)
static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
{
struct sr_datafeed_packet packet;
- struct sr_datafeed_analog2 analog;
+ struct sr_datafeed_analog analog;
struct sr_analog_encoding encoding;
struct sr_analog_meaning meaning;
struct sr_analog_spec spec;
@@ -168,7 +169,6 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
fvalue = -fvalue;
sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
- spec.spec_digits = 3;
/* Measurement mode */
meaning.channels = sdi->channels;
@@ -185,7 +185,7 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
if (is_diode) {
meaning.mq = SR_MQ_VOLTAGE;
meaning.unit = SR_UNIT_VOLT;
- meaning.mqflags |= SR_MQFLAG_DIODE;
+ meaning.mqflags |= SR_MQFLAG_DIODE | SR_MQFLAG_DC;
if (ivalue < 0)
fvalue = NAN;
} else {
@@ -260,22 +260,22 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
analog.data = &fvalue;
analog.num_samples = 1;
- packet.type = SR_DF_ANALOG2;
+ packet.type = SR_DF_ANALOG;
packet.payload = &analog;
- sr_session_send(devc->cb_data, &packet);
+ sr_session_send(sdi, &packet);
- devc->num_samples++;
+ sr_sw_limits_update_samples_read(&devc->limits, 1);
}
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
+ };
GString *dbg;
int i;
unsigned char data[DMM_DATA_SIZE];
- unsigned char obfuscation[DMM_DATA_SIZE] = "jodenxunickxia";
- unsigned char shuffle[DMM_DATA_SIZE] = {
- 6, 13, 5, 11, 2, 7, 9, 8, 3, 10, 12, 0, 4, 1
- };
for (i = 0; i < DMM_DATA_SIZE && buf[i] == 0; i++);
if (i == DMM_DATA_SIZE) {