Voltcraft VC-830: Fix diode mode handling.

[libsigrok.git] / hardware / uni-t-dmm / api.c

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index b5866531e6523bee4a51a9ed89cd365858a1e6d3..b23fc02cb3e5791fd22babafc83f67db2d5702c5 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -37,27 +37,36 @@ 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_ut60a_driver_info;
+SR_PRIV struct sr_dev_driver uni_t_ut60e_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_vc830_driver_info;
 SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 
 SR_PRIV struct dmm_info udmms[] = {
        {
-               "Tecpel", "DMM-8060", 2400,
+               "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", "UT60A", 2400,
                FS9721_PACKET_SIZE, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
                NULL,
-               &tecpel_dmm_8060_driver_info, receive_data_TECPEL_DMM_8060,
+               &uni_t_ut60a_driver_info, receive_data_UNI_T_UT60A,
        },
        {
-               "Tecpel", "DMM-8061", 2400,
+               "UNI-T", "UT60E", 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_ut60e_driver_info, receive_data_UNI_T_UT60E,
        },
        {
                "UNI-T", "UT61D", 2400,
@@ -67,7 +76,16 @@ SR_PRIV struct dmm_info udmms[] = {
                &uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
        },
        {
-               "UNI-T", "UT61E", 19230,
+               /*
+                * 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).
+                */
+               "UNI-T", "UT61E", 19200,
                ES51922_PACKET_SIZE, NULL,
                sr_es51922_packet_valid, sr_es51922_parse,
                NULL,
@@ -80,6 +98,18 @@ SR_PRIV struct dmm_info udmms[] = {
                NULL,
                &voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
        },
+       {
+               /*
+                * Note: The VC830 doesn't set the 'volt' and 'diode' bits of
+                * the FS9922 protocol. Instead, it only sets the user-defined
+                * bit "z1" to indicate "diode mode" and "voltage".
+                */
+               "Voltcraft", "VC-830", 2400,
+               FS9922_PACKET_SIZE, NULL,
+               sr_fs9922_packet_valid, sr_fs9922_parse,
+               &sr_fs9922_z1_diode,
+               &voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
+       },
        {
                "Voltcraft", "VC-840", 2400,
                FS9721_PACKET_SIZE, NULL,
@@ -89,7 +119,7 @@ SR_PRIV struct dmm_info udmms[] = {
        },
 };
 
-static int clear_instances(int dmm)
+static int dev_clear(int dmm)
 {
        return std_dev_clear(udmms[dmm].di, NULL);
 }
@@ -98,7 +128,7 @@ static int 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, LOG_PREFIX);
+       return std_init(sr_ctx, udmms[dmm].di, LOG_PREFIX);
 }
 
 static GSList *scan(GSList *options, int dmm)
@@ -124,7 +154,7 @@ static GSList *scan(GSList *options, int dmm)
                }
        }
        if (!conn)
-               conn = UNI_T_UT_D04_NEW;
+               return NULL;
 
        devices = NULL;
        if (!(usb_devices = sr_usb_find(drvc->sr_ctx->libusb_ctx, conn))) {
@@ -196,7 +226,7 @@ static int dev_close(struct sr_dev_inst *sdi)
 
 static int cleanup(int dmm)
 {
-       return clear_instances(dmm);
+       return dev_clear(dmm);
 }
 
 static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
@@ -299,8 +329,8 @@ static int cleanup_##X(void) { return cleanup(X); }
 static GSList *scan_##X(GSList *options) { return scan(options, X); }
 #define HW_DEV_LIST(X) \
 static GSList *dev_list_##X(void) { return dev_list(X); }
-#define CLEAR_INSTANCES(X) \
-static int clear_instances_##X(void) { return clear_instances(X); }
+#define HW_DEV_CLEAR(X) \
+static int dev_clear_##X(void) { return dev_clear(X); }
 #define HW_DEV_ACQUISITION_START(X) \
 static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
 void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
@@ -313,7 +343,7 @@ HW_INIT(ID_UPPER) \
 HW_CLEANUP(ID_UPPER) \
 HW_SCAN(ID_UPPER) \
 HW_DEV_LIST(ID_UPPER) \
-CLEAR_INSTANCES(ID_UPPER) \
+HW_DEV_CLEAR(ID_UPPER) \
 HW_DEV_ACQUISITION_START(ID_UPPER) \
 HW_DEV_OPEN(ID_UPPER) \
 SR_PRIV struct sr_dev_driver ID##_driver_info = { \
@@ -324,7 +354,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
        .cleanup = cleanup_##ID_UPPER, \
        .scan = scan_##ID_UPPER, \
        .dev_list = dev_list_##ID_UPPER, \
-       .dev_clear = clear_instances_##ID_UPPER, \
+       .dev_clear = dev_clear_##ID_UPPER, \
        .config_get = NULL, \
        .config_set = config_set, \
        .config_list = config_list, \
@@ -335,9 +365,11 @@ 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_ut60a, UNI_T_UT60A, "uni-t-ut60a", "UNI-T UT60A")
+DRV(uni_t_ut60e, UNI_T_UT60E, "uni-t-ut60e", "UNI-T UT60E")
 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_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830")
 DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")