scpi-pps: properly set encoding digits

[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 b6049dc3f75c925e141db3e46c2e1924b3244c6d..1cd157598e2461331515685d394bf55266d22a87 100644 (file)
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,36 +17,39 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <string.h>
+#include <strings.h>
 #include <stdarg.h>
+#include "scpi.h"
 #include "protocol.h"
 
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
+SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
 {
-       va_list args;
        struct dev_context *devc;
-       struct sr_scpi_dev_inst *scpi;
-       unsigned int i;
+       struct pps_channel *cur_pch, *new_pch;
        int ret;
-       char *cmd;
+
+       if (g_slist_length(sdi->channels) == 1)
+               return SR_OK;
 
        devc = sdi->priv;
-       cmd = NULL;
-       for (i = 0; i < devc->device->num_commands; i++) {
-               if (devc->device->commands[i].command == command) {
-                       cmd = devc->device->commands[i].string;
-                       break;
+       if (ch == devc->cur_channel)
+               return SR_OK;
+
+       new_pch = ch->priv;
+       if (devc->cur_channel) {
+               cur_pch = devc->cur_channel->priv;
+               if (cur_pch->hw_output_idx == new_pch->hw_output_idx) {
+                       /* Same underlying output channel. */
+                       devc->cur_channel = ch;
+                       return SR_OK;
                }
        }
-       if (!cmd) {
-               /* Device does not implement this command, that's OK. */
-               return SR_OK_CONTINUE;
-       }
 
-       scpi = sdi->conn;
-       va_start(args, command);
-       ret = sr_scpi_send_variadic(scpi, cmd, args);
-       va_end(args);
+       if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+                       new_pch->hwname)) >= 0)
+               devc->cur_channel = ch;
 
        return ret;
 }
@@ -56,10 +59,16 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        struct dev_context *devc;
        struct sr_datafeed_packet packet;
        struct sr_datafeed_analog analog;
+       struct sr_analog_encoding encoding;
+       struct sr_analog_meaning meaning;
+       struct sr_analog_spec spec;
        const struct sr_dev_inst *sdi;
+       struct sr_channel *next_channel;
        struct sr_scpi_dev_inst *scpi;
-       GSList *l;
+       struct pps_channel *pch;
+       const struct channel_spec *ch_spec;
        float f;
+       int cmd;
 
        (void)fd;
        (void)revents;
@@ -70,51 +79,57 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
        if (!(devc = sdi->priv))
                return TRUE;
 
-       if (devc->state == STATE_STOP)
-               return TRUE;
-
        scpi = sdi->conn;
 
        /* Retrieve requested value for this state. */
        if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
+               pch = devc->cur_channel->priv;
+               ch_spec = &devc->device->channels[pch->hw_output_idx];
                packet.type = SR_DF_ANALOG;
                packet.payload = &analog;
-               analog.channels = g_slist_append(NULL, devc->cur_channel);
+               sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+               analog.meaning->channels = g_slist_append(NULL, devc->cur_channel);
                analog.num_samples = 1;
-               if (devc->state == STATE_VOLTAGE) {
-                       analog.mq = SR_MQ_VOLTAGE;
-                       analog.unit = SR_UNIT_VOLT;
-               } else {
-                       analog.mq = SR_MQ_CURRENT;
-                       analog.unit = SR_UNIT_AMPERE;
+               analog.meaning->mq = pch->mq;
+               if (pch->mq == SR_MQ_VOLTAGE) {
+                       analog.meaning->unit = SR_UNIT_VOLT;
+                       analog.encoding->digits = ch_spec->voltage[4];
+                       analog.spec->spec_digits = ch_spec->voltage[3];
+               } else if (pch->mq == SR_MQ_CURRENT) {
+                       analog.meaning->unit = SR_UNIT_AMPERE;
+                       analog.encoding->digits = ch_spec->current[4];
+                       analog.spec->spec_digits = ch_spec->current[3];
+               } else if (pch->mq == SR_MQ_POWER) {
+                       analog.meaning->unit = SR_UNIT_WATT;
+                       analog.encoding->digits = ch_spec->power[4];
+                       analog.spec->spec_digits = ch_spec->power[3];
                }
-               analog.mqflags = SR_MQFLAG_DC;
+               analog.meaning->mqflags = SR_MQFLAG_DC;
                analog.data = &f;
                sr_session_send(sdi, &packet);
-               g_slist_free(analog.channels);
+               g_slist_free(analog.meaning->channels);
        }
 
-       if (devc->state == STATE_VOLTAGE) {
-               /* Just got voltage, request current for this channel. */
-               devc->state = STATE_CURRENT;
-               scpi_cmd(sdi, SCPI_CMD_GET_MEAS_CURRENT, devc->cur_channel->name);
-       } else if (devc->state == STATE_CURRENT) {
-               /*
-                * Done with voltage and current for this channel, switch to
-                * the next enabled channel.
-                */
-               do {
-                       l = g_slist_find(sdi->channels, devc->cur_channel);
-                       if (l->next)
-                               devc->cur_channel = l->next->data;
-                       else
-                               devc->cur_channel = sdi->channels->data;
-               } while (!devc->cur_channel->enabled);
-
-               /* Request voltage. */
-               devc->state = STATE_VOLTAGE;
-               scpi_cmd(sdi, SCPI_CMD_GET_MEAS_VOLTAGE, devc->cur_channel->name);
+       if (g_slist_length(sdi->channels) > 1) {
+               next_channel = sr_next_enabled_channel(sdi, devc->cur_channel);
+               if (select_channel(sdi, next_channel) != SR_OK) {
+                       sr_err("Failed to select channel %s", next_channel->name);
+                       return FALSE;
+               }
        }
 
+       pch = devc->cur_channel->priv;
+       if (pch->mq == SR_MQ_VOLTAGE)
+               cmd = SCPI_CMD_GET_MEAS_VOLTAGE;
+       else if (pch->mq == SR_MQ_FREQUENCY)
+               cmd = SCPI_CMD_GET_MEAS_FREQUENCY;
+       else if (pch->mq == SR_MQ_CURRENT)
+               cmd = SCPI_CMD_GET_MEAS_CURRENT;
+       else if (pch->mq == SR_MQ_POWER)
+               cmd = SCPI_CMD_GET_MEAS_POWER;
+       else
+               return SR_ERR;
+       scpi_cmd(sdi, devc->device->commands, cmd);
+
        return TRUE;
 }