scpi-pps: Implement init_acquisition() and update_status() for HP 66xxB power supplies.

[libsigrok.git] / src / hardware / scpi-pps / protocol.c

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 37c327c41bab10e12c806da01b546909b4182a23..762fcae1ec8ed434a3095ad4cb410f617bcecd04 100644 (file)
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -2,6 +2,7 @@
  * This file is part of the libsigrok project.
  *
  * Copyright (C) 2014 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2019 Frank Stettner <frank-stettner@gmx.net>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,6 +28,7 @@
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 {
        struct dev_context *devc;
+       const struct scpi_pps *device;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
        struct sr_analog_encoding encoding;
@@ -34,7 +36,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        struct sr_analog_spec spec;
        struct sr_dev_inst *sdi;
        int channel_group_cmd;
-       char *channel_group_name;
+       const char *channel_group_name;
        struct pps_channel *pch;
        const struct channel_spec *ch_spec;
        int ret;
@@ -52,14 +54,27 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
+       if (!(device = devc->device))
+               return TRUE;
+
+       pch = devc->cur_acquisition_channel->priv;
+
        channel_group_cmd = 0;
        channel_group_name = NULL;
        if (g_slist_length(sdi->channel_groups) > 1) {
                channel_group_cmd = SCPI_CMD_SELECT_CHANNEL;
-               channel_group_name = g_strdup(devc->cur_acquisition_channel->name);
+               channel_group_name = pch->hwname;
+       }
+
+       /*
+        * When the current channel is the first in the array, perform the device
+        * specific status update first.
+        */
+       if (devc->cur_acquisition_channel == sr_next_enabled_channel(sdi, NULL) &&
+               device->update_status) {
+               device->update_status(sdi);
        }
 
-       pch = devc->cur_acquisition_channel->priv;
        if (pch->mq == SR_MQ_VOLTAGE) {
                gvtype = G_VARIANT_TYPE_DOUBLE;
                cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
@@ -78,7 +93,6 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 
        ret = sr_scpi_cmd_resp(sdi, devc->device->commands,
                channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd);
-       g_free(channel_group_name);
 
        if (ret != SR_OK)
                return ret;
@@ -106,6 +120,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        }
        analog.meaning->mqflags = SR_MQFLAG_DC;
        f = (float)g_variant_get_double(gvdata);
+       g_variant_unref(gvdata);
        analog.data = &f;
        sr_session_send(sdi, &packet);
        g_slist_free(analog.meaning->channels);