korad-kaxxxxp: Add two channels "V" and "I", remove channel "CH1"

[libsigrok.git] / src / hardware / korad-kaxxxxp / protocol.c

diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 5151e1fa251b6b1a1b27e6b7f92eee03084f1a02..ff5759623a4746d762203e20381f4b1d1b9ddc94 100644 (file)
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -328,8 +328,12 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
        struct dev_context *devc;
        struct sr_serial_dev_inst *serial;
        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;
        uint64_t elapsed_us;
+       GSList *l;
 
        (void)fd;
 
@@ -345,22 +349,33 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
                /* Get the value. */
                korad_kaxxxxp_get_reply(serial, devc);
 
+               /* Note: digits/spec_digits will be overridden later. */
+               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
                /* Send the value forward. */
-               packet.type = SR_DF_ANALOG_OLD;
+               packet.type = SR_DF_ANALOG;
                packet.payload = &analog;
-               analog.channels = sdi->channels;
                analog.num_samples = 1;
+               l = g_slist_copy(sdi->channels);
                if (devc->target == KAXXXXP_CURRENT) {
-                       analog.mq = SR_MQ_CURRENT;
-                       analog.unit = SR_UNIT_AMPERE;
-                       analog.mqflags = 0;
+                       l = g_slist_remove_link(l, g_slist_nth(l, 0));
+                       analog.meaning->channels = l;
+                       analog.meaning->mq = SR_MQ_CURRENT;
+                       analog.meaning->unit = SR_UNIT_AMPERE;
+                       analog.meaning->mqflags = 0;
+                       analog.encoding->digits = 3;
+                       analog.spec->spec_digits = 3;
                        analog.data = &devc->current;
                        sr_session_send(sdi, &packet);
                }
-               if (devc->target == KAXXXXP_VOLTAGE) {
-                       analog.mq = SR_MQ_VOLTAGE;
-                       analog.unit = SR_UNIT_VOLT;
-                       analog.mqflags = SR_MQFLAG_DC;
+               else if (devc->target == KAXXXXP_VOLTAGE) {
+                       l = g_slist_remove_link(l, g_slist_nth(l, 1));
+                       analog.meaning->channels = l;
+                       analog.meaning->mq = SR_MQ_VOLTAGE;
+                       analog.meaning->unit = SR_UNIT_VOLT;
+                       analog.meaning->mqflags = SR_MQFLAG_DC;
+                       analog.encoding->digits = 2;
+                       analog.spec->spec_digits = 2;
                        analog.data = &devc->voltage;
                        sr_session_send(sdi, &packet);
                        sr_sw_limits_update_samples_read(&devc->limits, 1);
@@ -377,7 +392,7 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
        }
 
        if (sr_sw_limits_check(&devc->limits)) {
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        }