X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkorad-kaxxxxp%2Fprotocol.c;h=ff5759623a4746d762203e20381f4b1d1b9ddc94;hb=23165d7bb2cc2ff0538eecc1c5f78b3edd85ea14;hp=709805a93cc2588eb65673e750aed4d006c192f6;hpb=695dc859c15ba4190f5c1aa2e1a6e2dc6a6e5845;p=libsigrok.git

diff --git a/src/hardware/korad-kaxxxxp/protocol.c b/src/hardware/korad-kaxxxxp/protocol.c
index 709805a9..ff575962 100644
--- a/src/hardware/korad-kaxxxxp/protocol.c
+++ b/src/hardware/korad-kaxxxxp/protocol.c
@@ -328,8 +328,12 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
 	struct dev_context *devc;
 	struct sr_serial_dev_inst *serial;
 	struct sr_datafeed_packet packet;
-	struct sr_datafeed_analog_old analog;
-	int64_t t, elapsed_us;
+	struct sr_datafeed_analog analog;
+	struct sr_analog_encoding encoding;
+	struct sr_analog_meaning meaning;
+	struct sr_analog_spec spec;
+	uint64_t elapsed_us;
+	GSList *l;
 
 	(void)fd;
 
@@ -345,25 +349,36 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
 		/* Get the value. */
 		korad_kaxxxxp_get_reply(serial, devc);
 
+		/* Note: digits/spec_digits will be overridden later. */
+		sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
+
 		/* Send the value forward. */
-		packet.type = SR_DF_ANALOG_OLD;
+		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		analog.channels = sdi->channels;
 		analog.num_samples = 1;
+		l = g_slist_copy(sdi->channels);
 		if (devc->target == KAXXXXP_CURRENT) {
-			analog.mq = SR_MQ_CURRENT;
-			analog.unit = SR_UNIT_AMPERE;
-			analog.mqflags = 0;
+			l = g_slist_remove_link(l, g_slist_nth(l, 0));
+			analog.meaning->channels = l;
+			analog.meaning->mq = SR_MQ_CURRENT;
+			analog.meaning->unit = SR_UNIT_AMPERE;
+			analog.meaning->mqflags = 0;
+			analog.encoding->digits = 3;
+			analog.spec->spec_digits = 3;
 			analog.data = &devc->current;
 			sr_session_send(sdi, &packet);
 		}
-		if (devc->target == KAXXXXP_VOLTAGE) {
-			analog.mq = SR_MQ_VOLTAGE;
-			analog.unit = SR_UNIT_VOLT;
-			analog.mqflags = SR_MQFLAG_DC;
+		else if (devc->target == KAXXXXP_VOLTAGE) {
+			l = g_slist_remove_link(l, g_slist_nth(l, 1));
+			analog.meaning->channels = l;
+			analog.meaning->mq = SR_MQ_VOLTAGE;
+			analog.meaning->unit = SR_UNIT_VOLT;
+			analog.meaning->mqflags = SR_MQFLAG_DC;
+			analog.encoding->digits = 2;
+			analog.spec->spec_digits = 2;
 			analog.data = &devc->voltage;
 			sr_session_send(sdi, &packet);
-			devc->num_samples++;
+			sr_sw_limits_update_samples_read(&devc->limits, 1);
 		}
 		next_measurement(devc);
 	} else {
@@ -376,21 +391,11 @@ SR_PRIV int korad_kaxxxxp_receive_data(int fd, int revents, void *cb_data)
 		}
 	}
 
-	if (devc->limit_samples && (devc->num_samples >= devc->limit_samples)) {
-		sr_info("Requested number of samples reached.");
-		sdi->driver->dev_acquisition_stop(sdi);
+	if (sr_sw_limits_check(&devc->limits)) {
+		sr_dev_acquisition_stop(sdi);
 		return TRUE;
 	}
 
-	if (devc->limit_msec) {
-		t = (g_get_monotonic_time() - devc->starttime) / 1000;
-		if (t > (int64_t)devc->limit_msec) {
-			sr_info("Requested time limit reached.");
-			sdi->driver->dev_acquisition_stop(sdi);
-			return TRUE;
-		}
-	}
-
 	/* Request next packet, if required. */
 	if (sdi->status == SR_ST_ACTIVE) {
 		if (devc->reply_pending) {