X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=5ffc6594d872e93be827438911c568a121549c88;hb=refs%2Ftags%2Fdsupstream;hp=08a9e74725f4b4824987264231068443f04cf142;hpb=50c604f50bf33e68ac67caa8ebad20b87b3aacc1;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 08a9e747..5ffc6594 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -37,17 +37,42 @@ static const int32_t hwcaps[] = {
 	SR_CONF_CONTINUOUS,
 };
 
+SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
+SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
 SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 
 SR_PRIV struct dmm_info udmms[] = {
 	{
-		"UNI-T", "UT61D", 19230,
+		"Tecpel", "DMM-8060", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		NULL,
+		&tecpel_dmm_8060_driver_info, receive_data_TECPEL_DMM_8060,
+	},
+	{
+		"Tecpel", "DMM-8061", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		sr_fs9721_00_temp_c,
+		&tecpel_dmm_8061_driver_info, receive_data_TECPEL_DMM_8061,
+	},
+	{
+		"UNI-T", "UT61D", 2400,
 		FS9922_PACKET_SIZE, NULL,
 		sr_fs9922_packet_valid, sr_fs9922_parse,
 		NULL,
 		&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
 	},
+	{
+		"UNI-T", "UT61E", 19230,
+		ES51922_PACKET_SIZE, NULL,
+		sr_es51922_packet_valid, sr_es51922_parse,
+		NULL,
+		&uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
+	},
 	{
 		"Voltcraft", "VC-820", 2400,
 		FS9721_PACKET_SIZE, NULL,
@@ -55,6 +80,13 @@ SR_PRIV struct dmm_info udmms[] = {
 		NULL,
 		&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
 	},
+	{
+		"Voltcraft", "VC-840", 2400,
+		FS9721_PACKET_SIZE, NULL,
+		sr_fs9721_packet_valid, sr_fs9721_parse,
+		sr_fs9721_00_temp_c,
+		&voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
+	},
 };
 
 static int clear_instances(int dmm)
@@ -70,7 +102,7 @@ static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
 	sr_dbg("Selected '%s' subdriver.", udmms[dmm].di->name);
 
-	return std_hw_init(sr_ctx, udmms[dmm].di, DRIVER_LOG_DOMAIN);
+	return std_hw_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
 }
 
 static GSList *hw_scan(GSList *options, int dmm)
@@ -125,7 +157,8 @@ static GSList *hw_scan(GSList *options, int dmm)
 			return NULL;
 		sdi->probes = g_slist_append(sdi->probes, probe);
 
-		devc->usb = usb;
+		sdi->inst_type = SR_INST_USB;
+		sdi->conn = usb;
 
 		drvc->instances = g_slist_append(drvc->instances, sdi);
 		devices = g_slist_append(devices, sdi);
@@ -142,13 +175,13 @@ static GSList *hw_dev_list(int dmm)
 static int hw_dev_open(struct sr_dev_inst *sdi, int dmm)
 {
 	struct drv_context *drvc;
-	struct dev_context *devc;
+	struct sr_usb_dev_inst *usb;
 	int ret;
 
 	drvc = udmms[dmm].di->priv;
-	devc = sdi->priv;
+	usb = sdi->conn;
 
-	if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, devc->usb)) == SR_OK)
+	if ((ret = sr_usb_open(drvc->sr_ctx->libusb_ctx, usb)) == SR_OK)
 		sdi->status = SR_ST_ACTIVE;
 
 	return ret;
@@ -180,7 +213,6 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
 
 	switch (id) {
 	case SR_CONF_LIMIT_MSEC:
-		/* TODO: Not yet implemented. */
 		if (g_variant_get_uint64(data) == 0) {
 			sr_err("Time limit cannot be 0.");
 			return SR_ERR;
@@ -234,8 +266,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 
 	devc->cb_data = cb_data;
 
+	devc->starttime = g_get_monotonic_time();
+
 	/* Send header packet to the session bus. */
-	std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN);
+	std_session_send_df_header(cb_data, LOG_PREFIX);
 
 	sr_source_add(0, 0, 10 /* poll_timeout */,
 		      udmms[dmm].receive_data, (void *)sdi);
@@ -307,5 +341,9 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
 	.priv = NULL, \
 };
 
+DRV(tecpel_dmm_8060, TECPEL_DMM_8060, "tecpel-dmm-8060", "Tecpel DMM-8060")
+DRV(tecpel_dmm_8061, TECPEL_DMM_8061, "tecpel-dmm-8061", "Tecpel DMM-8061")
 DRV(uni_t_ut61d, UNI_T_UT61D, "uni-t-ut61d", "UNI-T UT61D")
+DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E")
 DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
+DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")