X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Funi-t-dmm%2Fapi.c;h=ef31de040b0df57d019446b902b919121b906d91;hb=a4e435eb49c1fa30c31d5851b404001324cafe33;hp=99c026a9059bcc3c89a5c0648b85b62dfb3d9801;hpb=4104ef810e56cd68ccfd66919a24e9e8c572ef58;p=libsigrok.git

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 99c026a9..ef31de04 100644
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -49,6 +49,7 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
+SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info;
 
 SR_PRIV struct dmm_info udmms[] = {
 	{
@@ -73,15 +74,7 @@ SR_PRIV struct dmm_info udmms[] = {
 		&uni_t_ut60e_driver_info, receive_data_UNI_T_UT60E,
 	},
 	{
-		/*
-		 * Important: The actual baudrate of the Cyrustek ES51986 chip
-		 * used in this DMM is 19230. However, the WCH CH9325 chip
-		 * (UART to USB/HID) used in (some versions of) the UNI-T
-		 * UT-D04 cable doesn't support 19230 baud. It only supports
-		 * 19200, and setting an unsupported baudrate will result in
-		 * the default of 2400 being used (which will not work with
-		 * this DMM, of course).
-		 */
+		/* The baudrate is actually 19230, see "Note 1" below. */
 		"UNI-T", "UT60G", 19200,
 		ES519XX_11B_PACKET_SIZE,
 		sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
@@ -110,15 +103,7 @@ SR_PRIV struct dmm_info udmms[] = {
 		&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
 	},
 	{
-		/*
-		 * Important: The actual baudrate of the Cyrustek ES51922 chip
-		 * used in this DMM is 19230. However, the WCH CH9325 chip
-		 * (UART to USB/HID) used in (some versions of) the UNI-T
-		 * UT-D04 cable doesn't support 19230 baud. It only supports
-		 * 19200, and setting an unsupported baudrate will result in
-		 * the default of 2400 being used (which will not work with
-		 * this DMM, of course).
-		 */
+		/* The baudrate is actually 19230, see "Note 1" below. */
 		"UNI-T", "UT61E", 19200,
 		ES519XX_14B_PACKET_SIZE,
 		sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
@@ -156,12 +141,26 @@ SR_PRIV struct dmm_info udmms[] = {
 		FS9721_PACKET_SIZE,
 		sr_fs9721_packet_valid, sr_fs9721_parse,
 		sr_fs9721_00_temp_c,
-		&tenma_72_7745_driver_info,
-		/* This is a basic rebadge of the UT60E. */
-		receive_data_UNI_T_UT60E,
+		&tenma_72_7745_driver_info, receive_data_TENMA_72_7745,
+	},
+	{
+		/* The baudrate is actually 19230, see "Note 1" below. */
+		"Tenma", "72-7750", 19200,
+		ES519XX_11B_PACKET_SIZE,
+		sr_es519xx_19200_11b_packet_valid, sr_es519xx_19200_11b_parse,
+		NULL,
+		&tenma_72_7750_driver_info, receive_data_TENMA_72_7750,
 	},
 };
 
+/*
+ * Note 1: The actual baudrate of the Cyrustek ES519xx chip used in this DMM
+ * is 19230. However, the WCH CH9325 chip (UART to USB/HID) used in (some
+ * versions of) the UNI-T UT-D04 cable doesn't support 19230 baud. It only
+ * supports 19200, and setting an unsupported baudrate will result in the
+ * default of 2400 being used (which will not work with this DMM, of course).
+ */
+
 static int dev_clear(int dmm)
 {
 	return std_dev_clear(udmms[dmm].di, NULL);
@@ -182,7 +181,7 @@ static GSList *scan(GSList *options, int dmm)
 	struct drv_context *drvc;
 	struct sr_usb_dev_inst *usb;
 	struct sr_config *src;
-	struct sr_probe *probe;
+	struct sr_channel *ch;
 	const char *conn;
 
 	drvc = udmms[dmm].di->priv;
@@ -222,9 +221,9 @@ static GSList *scan(GSList *options, int dmm)
 		}
 		sdi->priv = devc;
 		sdi->driver = udmms[dmm].di;
-		if (!(probe = sr_probe_new(0, SR_PROBE_ANALOG, TRUE, "P1")))
+		if (!(ch = sr_channel_new(0, SR_CHANNEL_ANALOG, TRUE, "P1")))
 			return NULL;
-		sdi->probes = g_slist_append(sdi->probes, probe);
+		sdi->channels = g_slist_append(sdi->channels, ch);
 
 		sdi->inst_type = SR_INST_USB;
 		sdi->conn = usb;
@@ -258,8 +257,6 @@ static int dev_open(struct sr_dev_inst *sdi, int dmm)
 
 static int dev_close(struct sr_dev_inst *sdi)
 {
-	(void)sdi;
-
 	/* TODO */
 
 	sdi->status = SR_ST_INACTIVE;
@@ -273,11 +270,11 @@ static int cleanup(int dmm)
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	struct dev_context *devc;
 
-	(void)probe_group;
+	(void)cg;
 
 	devc = sdi->priv;
 
@@ -308,10 +305,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi,
 }
 
 static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi,
-		const struct sr_probe_group *probe_group)
+		const struct sr_channel_group *cg)
 {
 	(void)sdi;
-	(void)probe_group;
+	(void)cg;
 
 	switch (key) {
 	case SR_CONF_SCAN_OPTIONS:
@@ -425,3 +422,4 @@ DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
 DRV(voltcraft_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830")
 DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")
 DRV(tenma_72_7745, TENMA_72_7745, "tenma-72-7745", "Tenma 72-7745")
+DRV(tenma_72_7750, TENMA_72_7750, "tenma-72-7750", "Tenma 72-7750")