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 e22ec341b2486c7bfd1e6eaa9e3395dccac794b6..ff5759623a4746d762203e20381f4b1d1b9ddc94 100644 (file)
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -333,6 +333,7 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
        struct sr_analog_meaning meaning;
        struct sr_analog_spec spec;
        uint64_t elapsed_us;
+       GSList *l;
 
        (void)fd;
 
@@ -348,14 +349,17 @@ 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;
                packet.payload = &analog;
-               analog.meaning->channels = sdi->channels;
                analog.num_samples = 1;
+               l = g_slist_copy(sdi->channels);
                if (devc->target == KAXXXXP_CURRENT) {
+                       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;
@@ -364,7 +368,9 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
                        analog.data = &devc->current;
                        sr_session_send(sdi, &packet);
                }
-               if (devc->target == KAXXXXP_VOLTAGE) {
+               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;
@@ -386,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;
        }