X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkern-scale%2Fprotocol.c;h=354f1e8429fd3398afd75ad505e50210fdd00178;hb=7ade12b470366a03f7bf84e4989c9d3593dc333b;hp=182a9d80b03da39f4e30dfe095b6288b6af0cdc4;hpb=6ec6c43b4738dbc7091f4a49a4ec80ea6102cb52;p=libsigrok.git

diff --git a/src/hardware/kern-scale/protocol.c b/src/hardware/kern-scale/protocol.c
index 182a9d80..354f1e84 100644
--- a/src/hardware/kern-scale/protocol.c
+++ b/src/hardware/kern-scale/protocol.c
@@ -34,27 +34,31 @@ 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;
 
 	scale = (struct scale_info *)sdi->driver;
 
 	devc = sdi->priv;
 
-	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
+	/* Note: digits/spec_digits will be overridden later. */
+	sr_analog_init(&analog, &encoding, &meaning, &spec, 0);
 
-	analog.channels = sdi->channels;
+	analog.meaning->channels = sdi->channels;
 	analog.num_samples = 1;
-	analog.mq = -1;
+	analog.meaning->mq = 0;
 
 	scale->packet_parse(buf, &floatval, &analog, info);
 	analog.data = &floatval;
 
-	if (analog.mq != -1) {
+	if (analog.meaning->mq != 0) {
 		/* Got a measurement. */
 		packet.type = SR_DF_ANALOG;
 		packet.payload = &analog;
-		sr_session_send(devc->cb_data, &packet);
-		devc->num_samples++;
+		sr_session_send(sdi, &packet);
+		sr_sw_limits_update_samples_read(&devc->limits, 1);
 	}
 }
 
@@ -102,7 +106,6 @@ SR_PRIV int kern_scale_receive_data(int fd, int revents, void *cb_data)
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
 	struct scale_info *scale;
-	int64_t time;
 	void *info;
 
 	(void)fd;
@@ -122,20 +125,8 @@ SR_PRIV int kern_scale_receive_data(int fd, int revents, void *cb_data)
 		g_free(info);
 	}
 
-	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))
+		sdi->driver->dev_acquisition_stop(sdi);
 
 	return TRUE;
 }