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

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

This commit is contained in:
Uwe Hermann 2013-06-22 16:53:13 +02:00
parent 6045b91aa4
commit c134574938
4 changed files with 16 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

@ -42,6 +42,7 @@ 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;
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_vc830_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[] = {
@ -80,6 +81,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-830", 2400,
FS9922_PACKET_SIZE, NULL,
sr_fs9922_packet_valid, sr_fs9922_parse,
NULL,
&voltcraft_vc830_driver_info, receive_data_VOLTCRAFT_VC830,
},
{ {
"Voltcraft", "VC-840", 2400, "Voltcraft", "VC-840", 2400,
FS9721_PACKET_SIZE, NULL, FS9721_PACKET_SIZE, NULL,
@ -340,4 +348,5 @@ 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")
DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820") DRV(voltcraft_vc820, VOLTCRAFT_VC820, "voltcraft-vc820", "Voltcraft VC-820")
DRV(voltcraft_vc830, VOLTCRAFT_VC830, "voltcraft-vc830", "Voltcraft VC-830")
DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840") DRV(voltcraft_vc840, VOLTCRAFT_VC840, "voltcraft-vc840", "Voltcraft VC-840")

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

@ -65,6 +65,7 @@
* - UNI-T UT61E: Cyrustek ES51922 * - UNI-T UT61E: Cyrustek ES51922
* - UNI-T UT70B: ? * - UNI-T UT70B: ?
* - Voltcraft VC-820: Fortune Semiconductor FS9721_LP3 * - Voltcraft VC-820: Fortune Semiconductor FS9721_LP3
* - Voltcraft VC-830: Fortune Semiconductor FS9922-DMM4
* - Voltcraft VC-840: Fortune Semiconductor FS9721_LP3 * - Voltcraft VC-840: Fortune Semiconductor FS9721_LP3
* - ... * - ...
*/ */
@ -307,4 +308,5 @@ 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)
RECEIVE_DATA(VOLTCRAFT_VC820, fs9721) RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
RECEIVE_DATA(VOLTCRAFT_VC840, fs9721) RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)

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

@ -43,10 +43,11 @@ enum {
UNI_T_UT61D, UNI_T_UT61D,
UNI_T_UT61E, UNI_T_UT61E,
VOLTCRAFT_VC820, VOLTCRAFT_VC820,
VOLTCRAFT_VC830,
VOLTCRAFT_VC840, VOLTCRAFT_VC840,
}; };
#define DMM_COUNT 6 #define DMM_COUNT 7
struct dmm_info { struct dmm_info {
char *vendor; char *vendor;
@ -96,6 +97,7 @@ 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);
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_VC830(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_VOLTCRAFT_VC840(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

@ -193,6 +193,7 @@ 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;
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_vc830_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info; extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
#endif #endif
/** @endcond */ /** @endcond */
@ -290,6 +291,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_vc830_driver_info,
&voltcraft_vc840_driver_info, &voltcraft_vc840_driver_info,
#endif #endif
NULL, NULL,