X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=9609936a23ae0604df899b9ddc23482c12111715;hb=5433907ed99c40e948b8350f55845dd88a5cbbe6;hp=1572a3eadd06e9ce3fe9f709c421007c5b7f6334;hpb=ca1a7cb56fbfeeb1c5b27ea87eb8603ca3ca888b;p=libsigrok.git diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c index 1572a3ea..9609936a 100644 --- 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 + * Copyright (C) 2019 Frank Stettner * * 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 @@ -17,14 +18,35 @@ * along with this program. If not, see . */ +#include +#include +#include +#include +#include "scpi.h" #include "protocol.h" SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data) { - const struct sr_dev_inst *sdi; struct dev_context *devc; + const struct scpi_pps *device; + 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; + struct sr_dev_inst *sdi; + int channel_group_cmd; + const char *channel_group_name; + struct pps_channel *pch; + const struct channel_spec *ch_spec; + int ret; + float f; + GVariant *gvdata; + const GVariantType *gvtype; + int cmd; (void)fd; + (void)revents; if (!(sdi = cb_data)) return TRUE; @@ -32,9 +54,94 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data) if (!(devc = sdi->priv)) return TRUE; - if (revents == G_IO_IN) { - /* TODO */ + 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 = 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); + } + + if (pch->mq == SR_MQ_VOLTAGE) { + gvtype = G_VARIANT_TYPE_DOUBLE; + cmd = SCPI_CMD_GET_MEAS_VOLTAGE; + } else if (pch->mq == SR_MQ_FREQUENCY) { + gvtype = G_VARIANT_TYPE_DOUBLE; + cmd = SCPI_CMD_GET_MEAS_FREQUENCY; + } else if (pch->mq == SR_MQ_CURRENT) { + gvtype = G_VARIANT_TYPE_DOUBLE; + cmd = SCPI_CMD_GET_MEAS_CURRENT; + } else if (pch->mq == SR_MQ_POWER) { + gvtype = G_VARIANT_TYPE_DOUBLE; + cmd = SCPI_CMD_GET_MEAS_POWER; + } else { + return SR_ERR; } + ret = sr_scpi_cmd_resp(sdi, devc->device->commands, + channel_group_cmd, channel_group_name, &gvdata, gvtype, cmd); + + if (ret != SR_OK) + return ret; + + ch_spec = &devc->device->channels[pch->hw_output_idx]; + packet.type = SR_DF_ANALOG; + packet.payload = &analog; + /* 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_acquisition_channel); + analog.num_samples = 1; + analog.meaning->mq = pch->mq; + analog.meaning->mqflags = pch->mqflags; + 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]; + } else if (pch->mq == SR_MQ_FREQUENCY) { + analog.meaning->unit = SR_UNIT_HERTZ; + analog.encoding->digits = ch_spec->frequency[4]; + analog.spec->spec_digits = ch_spec->frequency[3]; + } + 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); + + /* Next channel. */ + if (g_slist_length(sdi->channels) > 1) { + devc->cur_acquisition_channel = + sr_next_enabled_channel(sdi, devc->cur_acquisition_channel); + } + + if (devc->cur_acquisition_channel == sr_next_enabled_channel(sdi, NULL)) + /* First enabled channel, so each channel has been sampled */ + sr_sw_limits_update_samples_read(&devc->limits, 1); + + /* Stop if limits have been hit. */ + if (sr_sw_limits_check(&devc->limits)) + sr_dev_acquisition_stop(sdi); + return TRUE; }