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

uni-t-dmm: Add support for the UNI-T UT61E. 

This DMM is already supported via the serial-dmm driver when using the
RS232 cable. The uni-t-dmm support makes it usable with the USB/HID
cable too.
This commit is contained in:
Uwe Hermann 2013-04-29 20:23:21 +02:00
parent ae3a59de62
commit bbef5e326d
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

@ -38,6 +38,7 @@ static const int32_t hwcaps[] = {
}; };
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 voltcraft_vc820_driver_info; SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
SR_PRIV struct dmm_info udmms[] = { SR_PRIV struct dmm_info udmms[] = {
@ -48,6 +49,13 @@ SR_PRIV struct dmm_info udmms[] = {
NULL, NULL,
&uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D, &uni_t_ut61d_driver_info, receive_data_UNI_T_UT61D,
}, },
{
"UNI-T", "UT61E", 19230,
ES51922_PACKET_SIZE, NULL,
sr_es51922_packet_valid, sr_es51922_parse,
NULL,
&uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
},
{ {
"Voltcraft", "VC-820", 2400, "Voltcraft", "VC-820", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE, NULL,
@ -309,4 +317,5 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
}; };
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(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820") DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")

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

@ -291,4 +291,5 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
/* Driver-specific receive_data() wrappers */ /* Driver-specific receive_data() wrappers */
RECEIVE_DATA(UNI_T_UT61D, fs9922) RECEIVE_DATA(UNI_T_UT61D, fs9922)
RECEIVE_DATA(UNI_T_UT61E, es51922)
RECEIVE_DATA(VOLTCRAFT_VC820, fs9721) RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)

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

@ -39,10 +39,11 @@
/* 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 {
UNI_T_UT61D, UNI_T_UT61D,
UNI_T_UT61E,
VOLTCRAFT_VC820, VOLTCRAFT_VC820,
}; };
#define DMM_COUNT 2 #define DMM_COUNT 3
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -86,6 +87,7 @@ struct dev_context {
}; };
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_VOLTCRAFT_VC820(int fd, int revents, void *cb_data); SR_PRIV int receive_data_VOLTCRAFT_VC820(int fd, int revents, void *cb_data);
#endif #endif

2
hwdriver.c
View File

@ -165,6 +165,7 @@ 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 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 voltcraft_vc820_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
#endif #endif
/** @endcond */ /** @endcond */
@ -248,6 +249,7 @@ static struct sr_dev_driver *drivers_list[] = {
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM
&uni_t_ut61d_driver_info, &uni_t_ut61d_driver_info,
&uni_t_ut61e_driver_info,
&voltcraft_vc820_driver_info, &voltcraft_vc820_driver_info,
#endif #endif
NULL, NULL,