center-3xx: properly set encoding digits

[libsigrok.git] / src / hardware / maynuo-m97 / protocol.c

diff --git a/src/hardware/maynuo-m97/protocol.c b/src/hardware/maynuo-m97/protocol.c
index 7782d48f794b280c1c9bfc0957bb8089b2c521ee..05c3ae68116e00f5aa47f29fdc1d525de61d6022 100644 (file)
--- a/src/hardware/maynuo-m97/protocol.c
+++ b/src/hardware/maynuo-m97/protocol.c
@@ -125,22 +125,26 @@ SR_PRIV const char *maynuo_m97_mode_to_str(enum maynuo_m97_mode mode)
 }
 
 
-static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, float value, enum sr_mq mq, enum sr_unit unit)
+static void maynuo_m97_session_send_value(const struct sr_dev_inst *sdi, struct sr_channel *ch, float value, enum sr_mq mq, enum sr_unit unit, int digits)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog_old analog;
+       struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
 
-       analog.channels = g_slist_append(NULL, ch);
+       sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+       analog.meaning->channels = g_slist_append(NULL, ch);
        analog.num_samples = 1;
        analog.data = &value;
-       analog.mq = mq;
-       analog.unit = unit;
-       analog.mqflags = SR_MQFLAG_DC;
+       analog.meaning->mq = mq;
+       analog.meaning->unit = unit;
+       analog.meaning->mqflags = SR_MQFLAG_DC;
 
-       packet.type = SR_DF_ANALOG_OLD;
+       packet.type = SR_DF_ANALOG;
        packet.payload = &analog;
        sr_session_send(sdi, &packet);
-       g_slist_free(analog.channels);
+       g_slist_free(analog.meaning->channels);
 }
 
 SR_PRIV int maynuo_m97_capture_start(const struct sr_dev_inst *sdi)
@@ -181,10 +185,10 @@ SR_PRIV int maynuo_m97_receive_data(int fd, int revents, void *cb_data)
 
                maynuo_m97_session_send_value(sdi, sdi->channels->data,
                                              RBFL(registers + 0),
-                                             SR_MQ_VOLTAGE, SR_UNIT_VOLT);
+                                             SR_MQ_VOLTAGE, SR_UNIT_VOLT, 3);
                maynuo_m97_session_send_value(sdi, sdi->channels->next->data,
                                              RBFL(registers + 2),
-                                             SR_MQ_CURRENT, SR_UNIT_AMPERE);
+                                             SR_MQ_CURRENT, SR_UNIT_AMPERE, 4);
 
                packet.type = SR_DF_FRAME_END;
                sr_session_send(sdi, &packet);