X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fserial-dmm%2Fprotocol.c;h=e5f50ff7a1de7bf3587d755a68bc770d9480f0f5;hp=9d3bc916271cb6e9fc0bc0cd09328f56ecde8862;hb=556a926d432dd21a1d911daec13c6a6bbc49cdbb;hpb=51e1f5661c7ff12fa902643d5c3f0fd0f7e43d52

diff --git a/src/hardware/serial-dmm/protocol.c b/src/hardware/serial-dmm/protocol.c
index 9d3bc916..e5f50ff7 100644
--- a/src/hardware/serial-dmm/protocol.c
+++ b/src/hardware/serial-dmm/protocol.c
@@ -49,31 +49,42 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	struct sr_analog_meaning meaning;
 	struct sr_analog_spec spec;
 	struct dev_context *devc;
+	gboolean sent_sample;
+	size_t ch_idx;
 
 	dmm = (struct dmm_info *)sdi->driver;
 
 	log_dmm_packet(buf);
 	devc = sdi->priv;
 
-	/* Note: digits/spec_digits will be overridden by the DMM parsers. */
-	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
-
-	analog.meaning->channels = sdi->channels;
-	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);
+	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);
+
+		analog.meaning->channels =
+			g_slist_append(NULL, g_slist_nth_data(sdi->channels, ch_idx));
+		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) {
+			/* Got a measurement. */
+			packet.type = SR_DF_ANALOG;
+			packet.payload = &analog;
+			sr_session_send(sdi, &packet);
+			sent_sample = TRUE;
+		}
+	}
 
-	if (analog.meaning->mq != 0) {
-		/* Got a measurement. */
-		packet.type = SR_DF_ANALOG;
-		packet.payload = &analog;
-		sr_session_send(sdi, &packet);
+	if (sent_sample) {
 		sr_sw_limits_update_samples_read(&devc->limits, 1);
 	}
 }