s/DRIVER_LOG_DOMAIN/LOG_PREFIX/.

[libsigrok.git] / hardware / serial-dmm / api.c

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 89ea0dc82d95f5b120000551c1a28ffc160ee02a..efb863d7b35a0b556eb67610d9240caf2fcbda39 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -53,6 +53,8 @@ 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_805_driver_info;
 SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
+SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info;
+SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_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_ut61d_ser_driver_info;
@@ -63,14 +65,14 @@ SR_PRIV struct dmm_info dmms[] = {
                "Digitek", "DT4000ZC", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               dmm_details_dt4000zc,
+               sr_fs9721_10_temp_c,
                &digitek_dt4000zc_driver_info, receive_data_DIGITEK_DT4000ZC,
        },
        {
                "TekPower", "TP4000ZC", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               dmm_details_tp4000zc,
+               sr_fs9721_10_temp_c,
                &tekpower_tp4000zc_driver_info, receive_data_TEKPOWER_TP4000ZC,
        },
        {
@@ -98,7 +100,7 @@ SR_PRIV struct dmm_info dmms[] = {
                "V&A", "VA18B", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               dmm_details_va18b,
+               sr_fs9721_01_temp_c,
                &va_va18b_driver_info, receive_data_VA_VA18B,
        },
        {
@@ -119,7 +121,7 @@ SR_PRIV struct dmm_info dmms[] = {
                "PCE", "PCE-DM32", "2400/8n1", 2400,
                FS9721_PACKET_SIZE, NULL,
                sr_fs9721_packet_valid, sr_fs9721_parse,
-               dmm_details_pce_dm32,
+               sr_fs9721_01_10_temp_f_c,
                &pce_pce_dm32_driver_info, receive_data_PCE_PCE_DM32,
        },
        {
@@ -143,6 +145,22 @@ SR_PRIV struct dmm_info dmms[] = {
                NULL,
                &radioshack_22_812_driver_info, receive_data_RADIOSHACK_22_812,
        },
+       {
+               "Tecpel", "DMM-8060 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9721_PACKET_SIZE, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               NULL,
+               &tecpel_dmm_8060_ser_driver_info,
+               receive_data_TECPEL_DMM_8060_SER,
+       },
+       {
+               "Tecpel", "DMM-8061 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
+               2400, FS9721_PACKET_SIZE, NULL,
+               sr_fs9721_packet_valid, sr_fs9721_parse,
+               sr_fs9721_00_temp_c,
+               &tecpel_dmm_8061_ser_driver_info,
+               receive_data_TECPEL_DMM_8061_SER,
+       },
        {
                "Voltcraft", "VC-820 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
                2400, FS9721_PACKET_SIZE, NULL,
@@ -155,7 +173,7 @@ SR_PRIV struct dmm_info dmms[] = {
                "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,
+               sr_fs9721_00_temp_c,
                &voltcraft_vc840_ser_driver_info,
                receive_data_VOLTCRAFT_VC840_SER,
        },
@@ -209,7 +227,7 @@ static int hw_init(struct sr_context *sr_ctx, int dmm)
 {
        sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
 
-       return std_hw_init(sr_ctx, dmms[dmm].di, DRIVER_LOG_DOMAIN);
+       return std_hw_init(sr_ctx, dmms[dmm].di, LOG_PREFIX);
 }
 
 static GSList *scan(const char *conn, const char *serialcomm, int dmm)
@@ -443,7 +461,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
        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);
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
@@ -456,7 +474,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
 static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
 {
        return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
-                                                 sdi->conn, DRIVER_LOG_DOMAIN);
+                                                 sdi->conn, LOG_PREFIX);
 }
 
 /* Driver-specific API function wrappers */
@@ -513,6 +531,8 @@ 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_805, RADIOSHACK_22_805, "radioshack-22-805", "RadioShack 22-805")
 DRV(radioshack_22_812, RADIOSHACK_22_812, "radioshack-22-812", "RadioShack 22-812")
+DRV(tecpel_dmm_8060_ser, TECPEL_DMM_8060_SER, "tecpel-dmm-8060-ser", "Tecpel DMM-8060 (UT-D02 cable)")
+DRV(tecpel_dmm_8061_ser, TECPEL_DMM_8061_SER, "tecpel-dmm-8061-ser", "Tecpel DMM-8061 (UT-D02 cable)")
 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_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)")