X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fprotocol.h;h=e24c8ab4dcc62d9cd4ef44793e06f825517d26e4;hb=825da8b20f8eb879cd6b3e7911b4aa7b35a5b9ed;hp=e419b34d75f504bce0c4a181fae03b19f8bd79c1;hpb=40830061eb3a1327c1a8c76758e84b252e1950a8;p=libsigrok.git

diff --git a/hardware/serial-dmm/protocol.h b/hardware/serial-dmm/protocol.h
index e419b34d..e24c8ab4 100644
--- a/hardware/serial-dmm/protocol.h
+++ b/hardware/serial-dmm/protocol.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
  *
@@ -20,17 +20,18 @@
 #ifndef LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 #define LIBSIGROK_HARDWARE_SERIAL_DMM_PROTOCOL_H
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "serial-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "serial-dmm: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
 
 /* Note: When adding entries here, don't forget to update DMM_COUNT. */
 enum {
+	BBCGM_M2110,
 	DIGITEK_DT4000ZC,
 	TEKPOWER_TP4000ZC,
 	METEX_ME31,
@@ -38,27 +39,50 @@ enum {
 	MASTECH_MAS345,
 	VA_VA18B,
 	METEX_M3640D,
+	METEX_M4650CR,
 	PEAKTECH_4370,
 	PCE_PCE_DM32,
 	RADIOSHACK_22_168,
+	RADIOSHACK_22_805,
 	RADIOSHACK_22_812,
-	VOLTCRAFT_VC820,
+	TECPEL_DMM_8061_SER,
+	VOLTCRAFT_M3650D,
+	VOLTCRAFT_M4650CR,
+	VOLTCRAFT_VC820_SER,
+	VOLTCRAFT_VC830_SER,
+	VOLTCRAFT_VC840_SER,
+	UNI_T_UT60A_SER,
+	UNI_T_UT60E_SER,
+	UNI_T_UT61D_SER,
+	UNI_T_UT61E_SER,
+	ISO_TECH_IDM103N,
 };
 
-#define DMM_COUNT 12
+#define DMM_COUNT 25
 
 struct dmm_info {
+	/** Manufacturer/brand */
 	char *vendor;
+	/** Model */
 	char *device;
+	/** serialconn string */
 	char *conn;
+	/** Baud rate */
 	uint32_t baudrate;
+	/** Packet size [bytes]. */
 	int packet_size;
+	/** Packet request function. */
 	int (*packet_request)(struct sr_serial_dev_inst *);
+	/** Packet validation function. */
 	gboolean (*packet_valid)(const uint8_t *);
+	/** Packet parsing function. */
 	int (*packet_parse)(const uint8_t *, float *,
 			    struct sr_datafeed_analog *, void *);
+	/** */
 	void (*dmm_details)(struct sr_datafeed_analog *, void *);
+	/** libsigrok driver info struct. */
 	struct sr_dev_driver *di;
+	/** Data reception function. */
 	int (*receive_data)(int, int, void *);
 };
 
@@ -71,19 +95,23 @@ struct dev_context {
 	/** The current sampling limit (in number of samples). */
 	uint64_t limit_samples;
 
+	/** The time limit (in milliseconds). */
+	uint64_t limit_msec;
+
 	/** Opaque pointer passed in by the frontend. */
 	void *cb_data;
 
 	/** The current number of already received samples. */
 	uint64_t num_samples;
 
-	struct sr_serial_dev_inst *serial;
+	int64_t starttime;
 
 	uint8_t buf[DMM_BUFSIZE];
 	int bufoffset;
 	int buflen;
 };
 
+SR_PRIV int receive_data_BBCGM_M2110(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_DIGITEK_DT4000ZC(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_TEKPOWER_TP4000ZC(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_METEX_ME31(int fd, int revents, void *cb_data);
@@ -91,11 +119,23 @@ SR_PRIV int receive_data_PEAKTECH_3410(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_MASTECH_MAS345(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_VA_VA18B(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_METEX_M3640D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_METEX_M4650CR(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_PEAKTECH_4370(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_PCE_PCE_DM32(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_RADIOSHACK_22_168(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_RADIOSHACK_22_805(int fd, int revents, void *cb_data);
 SR_PRIV int receive_data_RADIOSHACK_22_812(int fd, int revents, void *cb_data);
-SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_TECPEL_DMM_8061_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_M3650D(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_M4650CR(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC820_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC830_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_VOLTCRAFT_VC840_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60A_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT60E_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);
+SR_PRIV int receive_data_ISO_TECH_IDM103N(int fd, int revents, void *cb_data);
 
 SR_PRIV void dmm_details_tp4000zc(struct sr_datafeed_analog *analog, void *info);
 SR_PRIV void dmm_details_dt4000zc(struct sr_datafeed_analog *analog, void *info);