X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgwinstek-gds-800%2Fprotocol.c;h=723b421231342ad853f8f7bb9b904379f0551252;hb=6c1c13cdcdee4e5566bc0c2ef0ba9a1f59d2c846;hp=09ce9ee50861cd0a6e2adcad0eb53cab9632f47a;hpb=bee2b0168c087676c1b365861d8c2d4714afa9b9;p=libsigrok.git

diff --git a/src/hardware/gwinstek-gds-800/protocol.c b/src/hardware/gwinstek-gds-800/protocol.c
index 09ce9ee5..723b4212 100644
--- a/src/hardware/gwinstek-gds-800/protocol.c
+++ b/src/hardware/gwinstek-gds-800/protocol.c
@@ -18,6 +18,7 @@
  */
 
 #include "protocol.h"
+#include <math.h>
 #include <string.h>
 
 #define ANALOG_CHANNELS 2
@@ -66,7 +67,10 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 	struct sr_scpi_dev_inst *scpi;
 	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;
 	char command[32];
 	char *response;
 	float volts_per_division;
@@ -232,21 +236,26 @@ SR_PRIV int gwinstek_gds_800_receive_data(int fd, int revents, void *cb_data)
 			sr_spew("Received %d number of samples from channel "
 				"%d.", num_samples, devc->cur_acq_channel + 1);
 
+			float vbit = volts_per_division * VERTICAL_DIVISIONS / 256.0;
+			float vbitlog = log10f(vbit);
+			int digits = -(int)vbitlog + (vbitlog < 0.0);
+
 			/* Convert data. */
 			for (i = 0; i < num_samples; i++)
-				samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) / 256. * VERTICAL_DIVISIONS * volts_per_division;
+				samples[i] = ((float) ((int16_t) (RB16(&devc->rcv_buffer[i*2])))) * vbit;
 
 			/* Fill frame. */
-			analog.channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel));
+			sr_analog_init(&analog, &encoding, &meaning, &spec, digits);
+			analog.meaning->channels = g_slist_append(NULL, g_slist_nth_data(sdi->channels, devc->cur_acq_channel));
 			analog.num_samples = num_samples;
 			analog.data = samples;
-			analog.mq = SR_MQ_VOLTAGE;
-			analog.unit = SR_UNIT_VOLT;
-			analog.mqflags = 0;
-			packet.type = SR_DF_ANALOG_OLD;
+			analog.meaning->mq = SR_MQ_VOLTAGE;
+			analog.meaning->unit = SR_UNIT_VOLT;
+			analog.meaning->mqflags = 0;
+			packet.type = SR_DF_ANALOG;
 			packet.payload = &analog;
 			sr_session_send(sdi, &packet);
-			g_slist_free(analog.channels);
+			g_slist_free(analog.meaning->channels);
 
 			/* All channels acquired. */
 			if (devc->cur_acq_channel == ANALOG_CHANNELS - 1) {