X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fbaylibre-acme%2Fprotocol.c;h=a6ff339b77f3819b6e450eaf591fd36d0aac0ffb;hb=91057d2fc24c0ca058aa08c8ea6ada4eadf05ffd;hp=ea25d95b00fcb3add71053454df369fd33363c32;hpb=d54a7c42ac6540d90e99e5138c945d789e3dac6f;p=libsigrok.git

diff --git a/src/hardware/baylibre-acme/protocol.c b/src/hardware/baylibre-acme/protocol.c
index ea25d95b..a6ff339b 100644
--- a/src/hardware/baylibre-acme/protocol.c
+++ b/src/hardware/baylibre-acme/protocol.c
@@ -18,6 +18,7 @@
  */
 
 #include <config.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -50,6 +51,7 @@ struct channel_group_priv {
 struct channel_priv {
 	int ch_type;
 	int fd;
+	int digits;
 	float val;
 	struct channel_group_priv *probe;
 };
@@ -164,8 +166,10 @@ SR_PRIV gboolean bl_acme_detect_probe(unsigned int addr,
 	probe_name_path(addr, path);
 	status = g_file_get_contents(path->str, &buf, &size, &err);
 	if (!status) {
-		sr_dbg("Name for probe %d can't be read: %s",
-		       prb_num, err->message);
+		/* Don't log "No such file or directory" messages. */
+		if (err->code != G_FILE_ERROR_NOENT)
+			sr_dbg("Name for probe %d can't be read (%d): %s",
+			       prb_num, err->code, err->message);
 		g_string_free(path, TRUE);
 		g_error_free(err);
 		return ret;
@@ -613,18 +617,18 @@ static int channel_to_unit(struct sr_channel *ch)
 }
 
 /* We need to scale measurements down from the units used by the drivers. */
-static float adjust_data(int val, int type)
+static int type_digits(int type)
 {
 	switch (type) {
 	case ENRG_PWR:
-		return ((float)val) / 1000000.0;
+		return 6;
 	case ENRG_CURR: /* Fallthrough */
 	case ENRG_VOL: /* Fallthrough */
 	case TEMP_IN: /* Fallthrough */
 	case TEMP_OUT:
-		return ((float)val) / 1000.0;
+		return 3;
 	default:
-		return 0.0;
+		return 0;
 	}
 }
 
@@ -648,7 +652,8 @@ static float read_sample(struct sr_channel *ch)
 		return -1.0;
 	}
 
-	return adjust_data(strtol(buf, NULL, 10), chp->ch_type);
+	chp->digits = type_digits(chp->ch_type);
+	return strtol(buf, NULL, 10) * powf(10, -chp->digits);
 }
 
 SR_PRIV int bl_acme_open_channel(struct sr_channel *ch)
@@ -699,7 +704,10 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 {
 	uint64_t nrexpiration;
 	struct sr_datafeed_packet packet, framep;
-	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;
 	struct sr_dev_inst *sdi;
 	struct sr_channel *ch;
 	struct channel_priv *chp;
@@ -718,9 +726,9 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 	if (!devc)
 		return TRUE;
 
-	packet.type = SR_DF_ANALOG_OLD;
+	packet.type = SR_DF_ANALOG;
 	packet.payload = &analog;
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog_old));
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
 
 	if (read(devc->timer_fd, &nrexpiration, sizeof(nrexpiration)) < 0) {
 		sr_warn("Failed to read timer information");
@@ -766,14 +774,16 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 				continue;
 			chonly.next = NULL;
 			chonly.data = ch;
-			analog.channels = &chonly;
 			analog.num_samples = 1;
-			analog.mq = channel_to_mq(chl->data);
-			analog.unit = channel_to_unit(ch);
+			analog.meaning->channels = &chonly;
+			analog.meaning->mq = channel_to_mq(chl->data);
+			analog.meaning->unit = channel_to_unit(ch);
 
 			if (i < 1)
 				chp->val = read_sample(ch);
 
+			analog.encoding->digits  = chp->digits;
+			analog.spec->spec_digits = chp->digits;
 			analog.data = &chp->val;
 			sr_session_send(sdi, &packet);
 		}
@@ -785,10 +795,9 @@ SR_PRIV int bl_acme_receive_data(int fd, int revents, void *cb_data)
 	sr_sw_limits_update_samples_read(&devc->limits, 1);
 
 	if (sr_sw_limits_check(&devc->limits)) {
-		sdi->driver->dev_acquisition_stop(sdi);
+		sr_dev_acquisition_stop(sdi);
 		return TRUE;
 	}
 
-	devc->last_sample_fin = g_get_monotonic_time();
 	return TRUE;
 }