X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Funi-t-dmm%2Fapi.c;h=4a331dccc071cad2f48c374f6601b7d99919a44b;hb=29a27196a13de2ffd9b671185e4b464b9db9b549;hp=4e8fe349fdaf9238231e96707d7e7288fcc5a406;hpb=2451a20ff5137d178ed4a02ee04076c6eae97235;p=libsigrok.git diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c index 4e8fe349..4a331dcc 100644 --- a/hardware/uni-t-dmm/api.c +++ b/hardware/uni-t-dmm/api.c @@ -37,12 +37,28 @@ 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[] = { + { + "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, @@ -86,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) @@ -252,7 +268,7 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, devc->cb_data = cb_data; /* 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); @@ -324,6 +340,8 @@ 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")