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

uni-t-dmm: Add support for the Voltcraft VC-840. 

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-30 20:27:04 +02:00
parent bbef5e326d
commit 695d0e1efa
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

@ -40,6 +40,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 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 sr_dev_driver voltcraft_vc840_driver_info;
SR_PRIV struct dmm_info udmms[] = { SR_PRIV struct dmm_info udmms[] = {
{ {
@ -63,6 +64,13 @@ SR_PRIV struct dmm_info udmms[] = {
NULL, NULL,
&voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820, &voltcraft_vc820_driver_info, receive_data_VOLTCRAFT_VC820,
}, },
{
"Voltcraft", "VC-840", 2400,
FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
NULL,
&voltcraft_vc840_driver_info, receive_data_VOLTCRAFT_VC840,
},
}; };
static int clear_instances(int dmm) static int clear_instances(int dmm)
@ -319,3 +327,4 @@ 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(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")
DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")

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

@ -293,3 +293,4 @@ SR_PRIV int receive_data_##ID_UPPER(int fd, int revents, void *cb_data) { \
RECEIVE_DATA(UNI_T_UT61D, fs9922) RECEIVE_DATA(UNI_T_UT61D, fs9922)
RECEIVE_DATA(UNI_T_UT61E, es51922) RECEIVE_DATA(UNI_T_UT61E, es51922)
RECEIVE_DATA(VOLTCRAFT_VC820, fs9721) RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)

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

@ -41,9 +41,10 @@ enum {
UNI_T_UT61D, UNI_T_UT61D,
UNI_T_UT61E, UNI_T_UT61E,
VOLTCRAFT_VC820, VOLTCRAFT_VC820,
VOLTCRAFT_VC840,
}; };
#define DMM_COUNT 3 #define DMM_COUNT 4
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -89,5 +90,6 @@ 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_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);
SR_PRIV int receive_data_VOLTCRAFT_VC840(int fd, int revents, void *cb_data);
#endif #endif

2
hwdriver.c
View File

@ -167,6 +167,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_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;
extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
#endif #endif
/** @endcond */ /** @endcond */
@ -251,6 +252,7 @@ static struct sr_dev_driver *drivers_list[] = {
&uni_t_ut61d_driver_info, &uni_t_ut61d_driver_info,
&uni_t_ut61e_driver_info, &uni_t_ut61e_driver_info,
&voltcraft_vc820_driver_info, &voltcraft_vc820_driver_info,
&voltcraft_vc840_driver_info,
#endif #endif
NULL, NULL,
}; };