X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=9609936a23ae0604df899b9ddc23482c12111715;hb=969671a542f3af8d918e57205e80670a11e8c1fa;hp=8dd669722d776e6a47c8588cafc48979ed3884a0;hpb=17a82e83ff4c2a7dc1bcc4f5ab6197c16a3b72de;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index 8dd66972..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 <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,14 +28,15 @@
 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;
 	struct sr_analog_meaning meaning;
 	struct sr_analog_spec spec;
-	const struct sr_dev_inst *sdi;
+	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;
@@ -91,6 +105,7 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	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];
@@ -103,9 +118,13 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 		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];
 	}
-	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);
@@ -116,5 +135,13 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 			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;
 }