X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fhardware%2Fvictor-dmm%2Fprotocol.c;h=18b0cd1f73ecb33087b5701ce1febef9678c91d2;hb=0f8bee7162f41095ca1975fec9a87975ce5a554a;hp=1eaffda3e6eb72b2ba770a145a814b8431b63832;hpb=a84a26d98ace158fa9e0b0e6d385928ceb91221a;p=libsigrok.git
diff --git a/src/hardware/victor-dmm/protocol.c b/src/hardware/victor-dmm/protocol.c
index 1eaffda3..18b0cd1f 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;
@@ -167,10 +168,7 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
if (minus)
fvalue = -fvalue;
- memset(&analog, 0, sizeof(struct sr_datafeed_analog2));
- memset(&encoding, 0, sizeof(struct sr_analog_encoding));
- memset(&meaning, 0, sizeof(struct sr_analog_meaning));
- memset(&spec, 0, sizeof(struct sr_analog_spec));
+ sr_analog_init(&analog, &encoding, &meaning, &spec, 4);
/* Measurement mode */
meaning.channels = sdi->channels;
@@ -259,44 +257,25 @@ static void decode_buf(struct sr_dev_inst *sdi, unsigned char *data)
if (is_relative)
meaning.mqflags |= SR_MQFLAG_RELATIVE;
- encoding.unitsize = sizeof(float);
- encoding.is_float = TRUE;
-#ifdef WORDS_BIGENDIAN
- encoding.is_bigendian = TRUE;
-#else
- encoding.is_bigendian = FALSE;
-#endif
- encoding.digits = 4; /* Values are always 4-digit numbers. */
- encoding.is_digits_decimal = TRUE;
- encoding.scale.p = 1;
- encoding.scale.q = 1;
- encoding.offset.p = 0;
- encoding.offset.q = 1;
-
- spec.spec_digits = encoding.digits;
-
analog.data = &fvalue;
analog.num_samples = 1;
- analog.encoding = &encoding;
- analog.meaning = &meaning;
- analog.spec = &spec;
- 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) {