X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fserial-dmm%2Fapi.c;h=944972d96c0f50bc03ae4a05119b979ef8dc621d;hb=1987b8d63e748f0813dc6a4630e99686e4fe1728;hp=0067e8c5fe44b82da11b27d8f88a9e73f15828b7;hpb=16b7b79005aaf0ab67d207ca11989f62d983ce62;p=libsigrok.git

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 0067e8c5..944972d9 100644
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -38,15 +38,11 @@ static const int hwopts[] = {
 static const int hwcaps[] = {
 	SR_HWCAP_MULTIMETER,
 	SR_HWCAP_LIMIT_SAMPLES,
+	SR_HWCAP_LIMIT_MSEC,
 	SR_HWCAP_CONTINUOUS,
 	0,
 };
 
-static const char *probe_names[] = {
-	"Probe",
-	NULL,
-};
-
 SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
 SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
 SR_PRIV struct sr_dev_driver metex_me31_driver_info;
@@ -58,6 +54,9 @@ SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
 SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
 SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
 SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
 
 SR_PRIV struct dmm_info dmms[] = {
 	{
@@ -137,6 +136,29 @@ SR_PRIV struct dmm_info dmms[] = {
 		NULL,
 		&radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812,
 	},
+	{
+		"Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+		2400, FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		NULL,
+		&voltcraft_vc820_ser_driver_info,
+		receive_data_VOLTCRAFT_VC820_SER,
+	},
+	{
+		"Voltcraft", "VC-840 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+		2400, FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		NULL,
+		&voltcraft_vc840_ser_driver_info,
+		receive_data_VOLTCRAFT_VC840_SER,
+	},
+	{
+		/* Note: ES51922 baudrate is actually 19230! */
+		"UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1",
+		19200, ES51922_PACKET_SIZE, NULL,
+		sr_es51922_packet_valid, sr_es51922_parse, NULL,
+		&uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER,
+	},
 };
 
 /* Properly close and free all devices. */
@@ -271,19 +293,19 @@ scan_cleanup:
 
 static GSList *hw_scan(GSList *options, int dmm)
 {
-	struct sr_hwopt *opt;
+	struct sr_config *src;
 	GSList *l, *devices;
 	const char *conn, *serialcomm;
 
 	conn = serialcomm = NULL;
 	for (l = options; l; l = l->next) {
-		opt = l->data;
-		switch (opt->hwopt) {
+		src = l->data;
+		switch (src->key) {
 		case SR_HWOPT_CONN:
-			conn = opt->value;
+			conn = src->value;
 			break;
 		case SR_HWOPT_SERIALCOMM:
-			serialcomm = opt->value;
+			serialcomm = src->value;
 			break;
 		}
 	}
@@ -363,12 +385,6 @@ static int hw_info_get(int info_id, const void **data,
 	case SR_DI_HWCAPS:
 		*data = hwcaps;
 		break;
-	case SR_DI_NUM_PROBES:
-		*data = GINT_TO_POINTER(1);
-		break;
-	case SR_DI_PROBE_NAMES:
-		*data = probe_names;
-		break;
 	default:
 		return SR_ERR_ARG;
 	}
@@ -395,6 +411,11 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
 		sr_dbg("Setting sample limit to %" PRIu64 ".",
 		       devc->limit_samples);
 		break;
+	case SR_HWCAP_LIMIT_MSEC:
+		devc->limit_msec = *(const uint64_t *)value;
+		sr_dbg("Setting time limit to %" PRIu64 "ms.",
+		       devc->limit_msec);
+		break;
 	default:
 		sr_err("Unknown capability: %d.", hwcap);
 		return SR_ERR;
@@ -409,7 +430,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 {
 	struct sr_datafeed_packet packet;
 	struct sr_datafeed_header header;
-	struct sr_datafeed_meta_analog meta;
 	struct dev_context *devc;
 
 	if (!(devc = sdi->priv)) {
@@ -427,6 +447,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	 * quit without acquiring any new samples.
 	 */
 	devc->num_samples = 0;
+	devc->starttime = g_get_monotonic_time();
 
 	/* Send header packet to the session bus. */
 	sr_dbg("Sending SR_DF_HEADER.");
@@ -436,13 +457,6 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 	gettimeofday(&header.starttime, NULL);
 	sr_session_send(devc->cb_data, &packet);
 
-	/* Send metadata about the SR_DF_ANALOG packets to come. */
-	sr_dbg("Sending SR_DF_META_ANALOG.");
-	packet.type = SR_DF_META_ANALOG;
-	packet.payload = &meta;
-	meta.num_probes = 1;
-	sr_session_send(devc->cb_data, &packet);
-
 	/* Poll every 50ms, or whenever some data comes in. */
 	sr_source_add(devc->serial->fd, G_IO_IN, 50,
 		      dmms[dmm].receive_data, (void *)sdi);
@@ -528,3 +542,6 @@ DRV(peaktech_4370, PEAKTECH_4370, "peaktech-4370", "PeakTech 4370")
 DRV(pce_pce_dm32, PCE_PCE_DM32, "pce-pce-dm32", "PCE PCE-DM32")
 DRV(radioshack_22_168, RADIOSHACK_22_168, "radioshack-22-168", "RadioShack 22-168")
 DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812")
+DRV(voltcraft_vc820_ser, VOLTCRAFT_VC820_SER, "voltcraft-vc820-ser", "Voltcraft VC-820 (UT-D02 cable)")
+DRV(voltcraft_vc840_ser, VOLTCRAFT_VC840_SER, "voltcraft-vc840-ser", "Voltcraft VC-840 (UT-D02 cable)")
+DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)")