X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fscpi-pps%2Fprotocol.c;h=1cd157598e2461331515685d394bf55266d22a87;hb=6ed709fecd14e6f122ee1ea18fc15abb4b3c8580;hp=b6b57fb8d8792a5c728738bcedda113d2523bd7a;hpb=5faebab2903dc91949edc31f0a4b118d86090a30;p=libsigrok.git

diff --git a/src/hardware/scpi-pps/protocol.c b/src/hardware/scpi-pps/protocol.c
index b6b57fb8..1cd15759 100644
--- a/src/hardware/scpi-pps/protocol.c
+++ b/src/hardware/scpi-pps/protocol.c
@@ -58,11 +58,15 @@ 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_old analog;
+	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;
 	struct pps_channel *pch;
+	const struct channel_spec *ch_spec;
 	float f;
 	int cmd;
 
@@ -80,21 +84,30 @@ SR_PRIV int scpi_pps_receive_data(int fd, int revents, void *cb_data)
 	/* 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;
+		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;
-		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.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.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 (g_slist_length(sdi->channels) > 1) {