BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

uni-t-dmm: Add Tecpel DMM-8060 support. 

This is _very_ likely to be a rebadged Voltcraft VC-820, treating as such.
This commit is contained in:
Uwe Hermann 2013-05-01 03:04:46 +02:00
parent b6bad47c91
commit 4554314c4f
4 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hardware/uni-t-dmm/api.c
View File

@ -37,6 +37,7 @@ static const int32_t hwcaps[] = {
SR_CONF_CONTINUOUS, 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 tecpel_dmm_8061_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut61d_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 uni_t_ut61e_driver_info;
@ -44,6 +45,13 @@ SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = { 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, "Tecpel", "DMM-8061", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE, NULL,
@ -332,6 +340,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.priv = NULL, \ .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(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_ut61d, UNI_T_UT61D, "uni-t-ut61d", "UNI-T UT61D")
DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E") DRV(uni_t_ut61e, UNI_T_UT61E, "uni-t-ut61e", "UNI-T UT61E")

1
hardware/uni-t-dmm/protocol.c
View File

@ -292,6 +292,7 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
return receive_data(fd, revents, ID_UPPER, &info, cb_data); } return receive_data(fd, revents, ID_UPPER, &info, cb_data); }
/* Driver-specific receive_data() wrappers */ /* Driver-specific receive_data() wrappers */
RECEIVE_DATA(TECPEL_DMM_8060, fs9721)
RECEIVE_DATA(TECPEL_DMM_8061, fs9721) RECEIVE_DATA(TECPEL_DMM_8061, fs9721)
RECEIVE_DATA(UNI_T_UT61D, fs9922) RECEIVE_DATA(UNI_T_UT61D, fs9922)
RECEIVE_DATA(UNI_T_UT61E, es51922) RECEIVE_DATA(UNI_T_UT61E, es51922)

4
hardware/uni-t-dmm/protocol.h
View File

@ -38,6 +38,7 @@
/* Note: When adding entries here, don't forget to update DMM_COUNT. */ /* Note: When adding entries here, don't forget to update DMM_COUNT. */
enum { enum {
TECPEL_DMM_8060,
TECPEL_DMM_8061, TECPEL_DMM_8061,
UNI_T_UT61D, UNI_T_UT61D,
UNI_T_UT61E, UNI_T_UT61E,
@ -45,7 +46,7 @@ enum {
VOLTCRAFT_VC840, VOLTCRAFT_VC840,
}; };
#define DMM_COUNT 5 #define DMM_COUNT 6
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -88,6 +89,7 @@ struct dev_context {
uint8_t buflen; uint8_t buflen;
}; };
SR_PRIV int receive_data_TECPEL_DMM_8060(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data); SR_PRIV int receive_data_TECPEL_DMM_8061(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT61D(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT61E(int fd, int revents, void *cb_data);

2
hwdriver.c
View File

@ -164,6 +164,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_driver_info;
extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info; extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info; extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
@ -250,6 +251,7 @@ static struct sr_dev_driver *drivers_list[] = {
&uni_t_ut61e_ser_driver_info, &uni_t_ut61e_ser_driver_info,
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM
&tecpel_dmm_8060_driver_info,
&tecpel_dmm_8061_driver_info, &tecpel_dmm_8061_driver_info,
&uni_t_ut61d_driver_info, &uni_t_ut61d_driver_info,
&uni_t_ut61e_driver_info, &uni_t_ut61e_driver_info,