X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=b6b57fb8d8792a5c728738bcedda113d2523bd7a;hb=700d6b64d578ce10e57f6a2289e37a5564eccf1c;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..b6b57fb8 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -17,14 +17,57 @@
  * 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 select_channel(const struct sr_dev_inst *sdi, struct sr_channel *ch)
+{
+	struct dev_context *devc;
+	struct pps_channel *cur_pch, *new_pch;
+	int ret;
+
+	if (g_slist_length(sdi->channels) == 1)
+		return SR_OK;
+
+	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;
+		}
+	}
+
+	if ((ret = scpi_cmd(sdi, devc->device->commands, SCPI_CMD_SELECT_CHANNEL,
+			new_pch->hwname)) >= 0)
+		devc->cur_channel = ch;
+
+	return ret;
+}
+
 SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 {
-	const struct sr_dev_inst *sdi;
 	struct dev_context *devc;
+	struct sr_datafeed_packet packet;
+	struct sr_datafeed_analog_old analog;
+	const struct sr_dev_inst *sdi;
+	struct sr_channel *next_channel;
+	struct sr_scpi_dev_inst *scpi;
+	struct pps_channel *pch;
+	float f;
+	int cmd;
 
 	(void)fd;
+	(void)revents;
 
 	if (!(sdi = cb_data))
 		return TRUE;
@@ -32,9 +75,48 @@ 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 */
+	scpi = sdi->conn;
+
+	/* Retrieve requested value for this state. */
+	if (sr_scpi_get_float(scpi, NULL, &f) == SR_OK) {
+		pch = devc->cur_channel->priv;
+		packet.type = SR_DF_ANALOG_OLD;
+		packet.payload = &analog;
+		analog.channels = g_slist_append(NULL, devc->cur_channel);
+		analog.num_samples = 1;
+		analog.mq = pch->mq;
+		if (pch->mq == SR_MQ_VOLTAGE)
+			analog.unit = SR_UNIT_VOLT;
+		else if (pch->mq == SR_MQ_CURRENT)
+			analog.unit = SR_UNIT_AMPERE;
+		else if (pch->mq == SR_MQ_POWER)
+			analog.unit = SR_UNIT_WATT;
+		analog.mqflags = SR_MQFLAG_DC;
+		analog.data = &f;
+		sr_session_send(sdi, &packet);
+		g_slist_free(analog.channels);
+	}
+
+	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;
 }