X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.c;h=0b2472fbb70401096073d0b24399fc07e0b633d7;hb=ad9dbc1cdb4818954ee2954787feefc896b4c5c4;hp=06e0acd026d9b5609ed5dfc5dcd40d75fba9746a;hpb=825da8b20f8eb879cd6b3e7911b4aa7b35a5b9ed;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 06e0acd0..0b2472fb 100644
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -48,7 +48,7 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 
 	memset(&analog, 0, sizeof(struct sr_datafeed_analog));
 
-	analog.probes = sdi->probes;
+	analog.channels = sdi->channels;
 	analog.num_samples = 1;
 	analog.mq = -1;
 
@@ -68,6 +68,37 @@ static void handle_packet(const uint8_t *buf, struct sr_dev_inst *sdi,
 	}
 }
 
+/** Request packet, if required. */
+SR_PRIV int req_packet(struct sr_dev_inst *sdi, int dmm)
+{
+	struct dev_context *devc;
+	struct sr_serial_dev_inst *serial;
+	int ret;
+
+	if (!dmms[dmm].packet_request)
+		return SR_OK;
+
+	devc = sdi->priv;
+	serial = sdi->conn;
+
+	if (devc->req_next_at && (devc->req_next_at > g_get_monotonic_time())) {
+		sr_spew("Not requesting new packet yet, %" PRIi64 " ms left.",
+			((devc->req_next_at - g_get_monotonic_time()) / 1000));
+		return SR_OK;
+	}
+
+	ret = dmms[dmm].packet_request(serial);
+	if (ret < 0) {
+		sr_err("Failed to request packet: %d.", ret);
+		return ret;
+	}
+
+	if (dmms[dmm].req_timeout_ms)
+		devc->req_next_at = g_get_monotonic_time() + (dmms[dmm].req_timeout_ms * 1000);
+
+	return SR_OK;
+}
+
 static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
 {
 	struct dev_context *devc;
@@ -93,6 +124,14 @@ static void handle_new_data(struct sr_dev_inst *sdi, int dmm, void *info)
 		if (dmms[dmm].packet_valid(devc->buf + offset)) {
 			handle_packet(devc->buf + offset, sdi, dmm, info);
 			offset += dmms[dmm].packet_size;
+
+			/* Request next packet, if required. */
+			if (!dmms[dmm].packet_request)
+				break;
+			if (dmms[dmm].req_timeout_ms || dmms[dmm].req_delay_ms)
+				devc->req_next_at = g_get_monotonic_time() +
+					dmms[dmm].req_delay_ms * 1000;
+			req_packet(sdi, dmm);
 		} else {
 			offset++;
 		}
@@ -108,9 +147,7 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 {
 	struct sr_dev_inst *sdi;
 	struct dev_context *devc;
-	struct sr_serial_dev_inst *serial;
 	int64_t time;
-	int ret;
 
 	(void)fd;
 
@@ -120,20 +157,13 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 	if (!(devc = sdi->priv))
 		return TRUE;
 
-	serial = sdi->conn;
-
 	if (revents == G_IO_IN) {
 		/* Serial data arrived. */
 		handle_new_data(sdi, dmm, info);
 	} else {
-		/* Timeout, send another packet request (if DMM needs it). */
-		if (dmms[dmm].packet_request) {
-			ret = dmms[dmm].packet_request(serial);
-			if (ret < 0) {
-				sr_err("Failed to request packet: %d.", ret);
-				return FALSE;
-			}
-		}
+		/* Timeout; send another packet request if DMM needs it. */
+		if (dmms[dmm].packet_request && (req_packet(sdi, dmm) < 0))
+			return FALSE;
 	}
 
 	if (devc->limit_samples && devc->num_samples >= devc->limit_samples) {
@@ -167,6 +197,7 @@ RECEIVE_DATA(METEX_ME31, metex14)
 RECEIVE_DATA(PEAKTECH_3410, metex14)
 RECEIVE_DATA(MASTECH_MAS345, metex14)
 RECEIVE_DATA(VA_VA18B, fs9721)
+RECEIVE_DATA(VA_VA40B, fs9721)
 RECEIVE_DATA(METEX_M3640D, metex14)
 RECEIVE_DATA(METEX_M4650CR, metex14)
 RECEIVE_DATA(PEAKTECH_4370, metex14)
@@ -175,13 +206,20 @@ RECEIVE_DATA(RADIOSHACK_22_168, metex14)
 RECEIVE_DATA(RADIOSHACK_22_805, metex14)
 RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
 RECEIVE_DATA(TECPEL_DMM_8061_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_M3650CR, metex14)
 RECEIVE_DATA(VOLTCRAFT_M3650D, metex14)
 RECEIVE_DATA(VOLTCRAFT_M4650CR, metex14)
+RECEIVE_DATA(VOLTCRAFT_ME42, metex14)
 RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
 RECEIVE_DATA(VOLTCRAFT_VC830_SER, fs9922)
 RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT60A_SER, fs9721)
 RECEIVE_DATA(UNI_T_UT60E_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT60G_SER, es519xx)
+RECEIVE_DATA(UNI_T_UT61B_SER, fs9922)
+RECEIVE_DATA(UNI_T_UT61C_SER, fs9922)
 RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
-RECEIVE_DATA(UNI_T_UT61E_SER, es51922)
+RECEIVE_DATA(UNI_T_UT61E_SER, es519xx)
 RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)
+RECEIVE_DATA(TENMA_72_7745_SER, fs9721)
+RECEIVE_DATA(TENMA_72_7750_SER, es519xx)