X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=4c7a649cda1f2aec73c8756b69b6af82123c3d10;hb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;hp=bdb4fe401d979d07768dbb875b094ac23edd3b08;hpb=478c8d923e026fe2dda707f67336326da635b2eb;p=libsigrok.git
diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index bdb4fe40..4c7a649c 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,85 +17,39 @@
* along with this program. If not, see .
*/
+#include
#include
+#include
#include
+#include "scpi.h"
#include "protocol.h"
-SR_PRIV char *scpi_cmd_get(const struct sr_dev_inst *sdi, int command)
+SR_PRIV int select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
{
struct dev_context *devc;
- unsigned int i;
- char *cmd;
-
- 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;
- }
- }
-
- return cmd;
-}
-
-SR_PRIV int scpi_cmd(const struct sr_dev_inst *sdi, int command, ...)
-{
- struct sr_scpi_dev_inst *scpi;
- va_list args;
+ struct pps_channel *cur_pch, *new_pch;
int ret;
- char *cmd;
- if (!(cmd = scpi_cmd_get(sdi, command))) {
- /* Device does not implement this command, that's OK. */
- return SR_OK_CONTINUE;
- }
+ if (g_slist_length(sdi->channels) == 1)
+ return SR_OK;
- scpi = sdi->conn;
- va_start(args, command);
- ret = sr_scpi_send_variadic(scpi, cmd, args);
- va_end(args);
-
- return ret;
-}
-
-SR_PRIV int scpi_cmd_resp(const struct sr_dev_inst *sdi, GVariant **gvar,
- const GVariantType *gvtype, int command, ...)
-{
- struct sr_scpi_dev_inst *scpi;
- va_list args;
- double d;
- int ret;
- char *cmd, *s;
-
- if (!(cmd = scpi_cmd_get(sdi, command))) {
- /* Device does not implement this command, that's OK. */
- return SR_OK_CONTINUE;
+ devc = sdi->priv;
+ 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;
+ }
}
- scpi = sdi->conn;
- va_start(args, command);
- ret = sr_scpi_send_variadic(scpi, cmd, args);
- va_end(args);
- if (ret != SR_OK)
- return ret;
-
- if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_BOOLEAN)) {
- if ((ret = sr_scpi_get_string(scpi, NULL, &s)) != SR_OK)
- return ret;
- if (!strcasecmp(s, "ON") || !strcasecmp(s, "1") || !strcasecmp(s, "YES"))
- *gvar = g_variant_new_boolean(TRUE);
- else if (!strcasecmp(s, "OFF") || !strcasecmp(s, "0") || !strcasecmp(s, "NO"))
- *gvar = g_variant_new_boolean(FALSE);
- else
- ret = SR_ERR;
- } if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_DOUBLE)) {
- if ((ret = sr_scpi_get_double(scpi, NULL, &d)) == SR_OK)
- *gvar = g_variant_new_double(d);
- } if (g_variant_type_equal(gvtype, G_VARIANT_TYPE_STRING)) {
- if ((ret = sr_scpi_get_string(scpi, NULL, &s)) == SR_OK)
- *gvar = g_variant_new_string(s);
- }
+ if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+ new_pch->hwname)) >= 0)
+ devc->cur_channel = ch;
return ret;
}
@@ -105,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;
@@ -119,51 +79,58 @@ 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);
+ /* Note: digits/spec_digits will be overridden later. */
+ 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;
}