X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fprotocol.c;h=e63e6357f0cc3a130ec49feaa38706fffb23911c;hb=803db07a1af036a5da65581ddbac23b7f84a4388;hp=3de55cf4ace7d1f79590b9ff994288eb5529b005;hpb=5a1afc0907abfee5848484f944789213d6be9752;p=libsigrok.git

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 3de55cf4..e63e6357 100644
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -25,6 +25,7 @@
  * @internal
  */
 
+#include <config.h>
 #include "scpi.h"
 #include "protocol.h"
 
@@ -371,7 +372,8 @@ static int array_option_get(char *value, const char *(*array)[],
 static int array_float_get(gchar *value, const uint64_t array[][2],
 		int array_len, int *result)
 {
-	int i;
+	int i, e;
+	size_t pos;
 	uint64_t f;
 	float s;
 	unsigned int s_int;
@@ -380,28 +382,38 @@ static int array_float_get(gchar *value, const uint64_t array[][2],
 	memset(ss, 0, sizeof(ss));
 	memset(es, 0, sizeof(es));
 
-	strncpy(ss, value, 5);
-	strncpy(es, &(value[6]), 3);
+	/* Get index of the separating 'E' character and break up the string. */
+	pos = strcspn(value, "E");
+
+	strncpy(ss, value, pos);
+	strncpy(es, &(value[pos+1]), 3);
 
 	if (sr_atof_ascii(ss, &s) != SR_OK)
 		return SR_ERR;
-	if (sr_atoi(es, &i) != SR_OK)
+	if (sr_atoi(es, &e) != SR_OK)
 		return SR_ERR;
 
 	/* Transform e.g. 10^-03 to 1000 as the array stores the inverse. */
-	f = pow(10, abs(i));
+	f = pow(10, abs(e));
 
 	/*
 	 * Adjust the significand/factor pair to make sure
 	 * that f is a multiple of 1000.
 	 */
-	while ((int)fmod(log10(f), 3) > 0) { s *= 10; f *= 10; }
+	while ((int)fmod(log10(f), 3) > 0) {
+		s *= 10;
+
+		if (e < 0)
+			f *= 10;
+		else
+			f /= 10;
+	}
 
 	/* Truncate s to circumvent rounding errors. */
 	s_int = (unsigned int)s;
 
 	for (i = 0; i < array_len; i++) {
-		if ( (s_int == array[i][0]) && (f == array[i][1]) ) {
+		if ((s_int == array[i][0]) && (f == array[i][1])) {
 			*result = i;
 			return SR_OK;
 		}
@@ -952,7 +964,7 @@ static int dlm_analog_samples_send(GArray *data,
 	struct dev_context *devc;
 	struct scope_state *model_state;
 	struct sr_channel *ch;
-	struct sr_datafeed_analog analog;
+	struct sr_datafeed_analog_old analog;
 	struct sr_datafeed_packet packet;
 
 	devc = sdi->priv;
@@ -986,7 +998,7 @@ static int dlm_analog_samples_send(GArray *data,
 	analog.mq = SR_MQ_VOLTAGE;
 	analog.unit = SR_UNIT_VOLT;
 	analog.mqflags = 0;
-	packet.type = SR_DF_ANALOG;
+	packet.type = SR_DF_ANALOG_OLD;
 	packet.payload = &analog;
 	sr_session_send(sdi, &packet);
 	g_slist_free(analog.channels);