X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=71fc1a4635c480f646859f8ed62a2f63f0b66eca;hp=84b12cf0e003e0731624ca230b0688a0ece10db2;hb=abcb13855f5dfdd34bdae5da0586b37c7d2d8731;hpb=8d5228015d0f07ce6626aa52ffb80bc4129f7dbe

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 84b12cf0..71fc1a46 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -18,23 +18,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <glib.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 #include "protocol.h"
 
-static void log_dmm_packet(const uint8_t *buf)
+static void log_dmm_packet(const uint8_t *buf, size_t len)
 {
-	sr_dbg("DMM packet: %02x %02x %02x %02x %02x %02x %02x "
-	       "%02x %02x %02x %02x %02x %02x %02x %02x %02x "
-	       "%02x %02x %02x %02x %02x %02x %02x",
-	       buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6],
-	       buf[7], buf[8], buf[9], buf[10], buf[11], buf[12], buf[13],
-	       buf[14], buf[15], buf[16], buf[17], buf[18], buf[19], buf[20],
-	       buf[21], buf[22]);
+	GString *text;
+
+	if (sr_log_loglevel_get() < SR_LOG_DBG)
+		return;
+
+	text = sr_hexdump_new(buf, len);
+	sr_dbg("DMM packet: %s", text->str);
+	sr_hexdump_free(text);
 }
 
 static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
@@ -44,32 +46,48 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	float floatval;
 	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;
 	struct dev_context *devc;
+	gboolean sent_sample;
+	struct sr_channel *channel;
+	size_t ch_idx;
 
 	dmm = (struct dmm_info *)sdi->driver;
 
-	log_dmm_packet(buf);
+	log_dmm_packet(buf, dmm->packet_size);
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
-
-	analog.channels = sdi->channels;
-	analog.num_samples = 1;
-	analog.mq = -1;
-
-	dmm->packet_parse(buf, &floatval, &analog, info);
-	analog.data = &floatval;
-
-	/* If this DMM needs additional handling, call the resp. function. */
-	if (dmm->dmm_details)
-		dmm->dmm_details(&analog, info);
+	sent_sample = FALSE;
+	memset(info, 0, dmm->info_size);
+	for (ch_idx = 0; ch_idx < dmm->channel_count; ch_idx++) {
+		/* Note: digits/spec_digits will be overridden by the DMM parsers. */
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
+		channel = g_slist_nth_data(sdi->channels, ch_idx);
+		analog.meaning->channels = g_slist_append(NULL, channel);
+		analog.num_samples = 1;
+		analog.meaning->mq = 0;
+
+		dmm->packet_parse(buf, &floatval, &analog, info);
+		analog.data = &floatval;
+
+		/* If this DMM needs additional handling, call the resp. function. */
+		if (dmm->dmm_details)
+			dmm->dmm_details(&analog, info);
+
+		if (analog.meaning->mq != 0 && channel->enabled) {
+			/* Got a measurement. */
+			packet.type = SR_DF_ANALOG;
+			packet.payload = &analog;
+			sr_session_send(sdi, &packet);
+			sent_sample = TRUE;
+		}
+	}
 
-	if (analog.mq != -1) {
-		/* Got a measurement. */
-		packet.type = SR_DF_ANALOG;
-		packet.payload = &analog;
-		sr_session_send(devc->cb_data, &packet);
-		devc->num_samples++;
+	if (sent_sample) {
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
 	}
 }
 
@@ -111,7 +129,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, void *info)
 {
 	struct dmm_info *dmm;
 	struct dev_context *devc;
-	int len, i, offset = 0;
+	int len, offset;
 	struct sr_serial_dev_inst *serial;
 
 	dmm = (struct dmm_info *)sdi->driver;
@@ -131,6 +149,7 @@ static void handle_new_data(struct sr_dev_inst *sdi, void *info)
 	devc->buflen += len;
 
 	/* Now look for packets in that data. */
+	offset = 0;
 	while ((devc->buflen - offset) >= dmm->packet_size) {
 		if (dmm->packet_valid(devc->buf + offset)) {
 			handle_packet(devc->buf + offset, sdi, info);
@@ -149,8 +168,8 @@ static void handle_new_data(struct sr_dev_inst *sdi, void *info)
 	}
 
 	/* If we have any data left, move it to the beginning of our buffer. */
-	for (i = 0; i < devc->buflen - offset; i++)
-		devc->buf[i] = devc->buf[offset + i];
+	if (devc->buflen > offset)
+		memmove(devc->buf, devc->buf + offset, devc->buflen - offset);
 	devc->buflen -= offset;
 }
 
@@ -159,7 +178,6 @@ int receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct dmm_info *dmm;
-	int64_t time;
 	void *info;
 
 	(void)fd;
@@ -183,20 +201,8 @@ int receive_data(int fd, int revents, void *cb_data)
 			return FALSE;
 	}
 
-	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi, cb_data);
-		return TRUE;
-	}
-
-	if (devc->limit_msec) {
-		time = (g_get_monotonic_time() - devc->starttime) / 1000;
-		if (time > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi, cb_data);
-			return TRUE;
-		}
-	}
+	if (sr_sw_limits_check(&devc->limits))
+		sr_dev_acquisition_stop(sdi);
 
 	return TRUE;
 }