X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.c;h=15ddc74db641d6ec5fffde0fd70b294d7660b1c1;hb=4c0e310ca305ba776aa70d8062f467ac246c910b;hp=156f88dd1a38b1cb24170a0e330613bc58702c60;hpb=dccfe015868b5f1a5a5996983164d135ec561596;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index 156f88dd..15ddc74d 100644
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -18,11 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
 #include <errno.h>
+#include <glib.h>
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 #include "protocol.h"
@@ -105,6 +105,7 @@ static void handle_packet(const uint8_t *buf, struct dev_context *devc,
 	dmms[dmm].packet_parse(buf, &floatval, analog, info);
 	analog->data = &floatval;
 
+	/* If this DMM needs additional handling, call the resp. function. */
 	if (dmms[dmm].dmm_details)
 		dmms[dmm].dmm_details(analog, info);
 
@@ -152,6 +153,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;
+	int64_t time;
 	int ret;
 
 	(void)fd;
@@ -176,29 +178,41 @@ static int receive_data(int fd, int revents, int dmm, void *info, void *cb_data)
 		}
 	}
 
-	if (devc->num_samples >= devc->limit_samples) {
-		sr_info("Requested number of samples reached, stopping.");
+	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;
+		}
+	}
+
 	return TRUE;
 }
 
-#define RECV_DATA(ID_UPPER, DMM_DRIVER) \
+#define RECEIVE_DATA(ID_UPPER, DMM_DRIVER) \
 SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
 	struct DMM_DRIVER##_info info; \
 	return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
 
 /* Driver-specific receive_data() wrappers */
-RECV_DATA(DIGITEK_DT4000ZC, fs9721)
-RECV_DATA(TEKPOWER_TP4000ZC, fs9721)
-RECV_DATA(METEX_ME31, metex14)
-RECV_DATA(PEAKTECH_3410, metex14)
-RECV_DATA(MASTECH_MAS345, metex14)
-RECV_DATA(VA_VA18B, fs9721)
-RECV_DATA(METEX_M3640D, metex14)
-RECV_DATA(PEAKTECH_4370, metex14)
-RECV_DATA(PCE_PCE_DM32, fs9721)
-RECV_DATA(RADIOSHACK_22_168, metex14)
-RECV_DATA(RADIOSHACK_22_812, metex14)
+RECEIVE_DATA(DIGITEK_DT4000ZC, fs9721)
+RECEIVE_DATA(TEKPOWER_TP4000ZC, fs9721)
+RECEIVE_DATA(METEX_ME31, metex14)
+RECEIVE_DATA(PEAKTECH_3410, metex14)
+RECEIVE_DATA(MASTECH_MAS345, metex14)
+RECEIVE_DATA(VA_VA18B, fs9721)
+RECEIVE_DATA(METEX_M3640D, metex14)
+RECEIVE_DATA(PEAKTECH_4370, metex14)
+RECEIVE_DATA(PCE_PCE_DM32, fs9721)
+RECEIVE_DATA(RADIOSHACK_22_168, metex14)
+RECEIVE_DATA(RADIOSHACK_22_812, rs9lcd)
+RECEIVE_DATA(VOLTCRAFT_VC820_SER, fs9721)
+RECEIVE_DATA(VOLTCRAFT_VC840_SER, fs9721)
+RECEIVE_DATA(UNI_T_UT61E_SER, es51922)