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

serial-dmm: Support the Tenma 72-7745 via UT-D02 cable. 

(it was already supported in uni-t-dmm via UT-D04 cable)
This commit is contained in:
Uwe Hermann 2014-01-06 18:08:55 +01:00
parent d9e79c5122
commit 2710cb53fd
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hardware/serial-dmm/api.c
View File

@ -70,6 +70,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info;
SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info; SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_driver_info;
SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info; SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info; SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
SR_PRIV struct dmm_info dmms[] = { SR_PRIV struct dmm_info dmms[] = {
@ -275,15 +276,24 @@ SR_PRIV struct dmm_info dmms[] = {
/* Note: ES51922 baudrate is actually 19230! */ /* Note: ES51922 baudrate is actually 19230! */
"UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", "UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1",
19200, ES519XX_14B_PACKET_SIZE, NULL, 19200, ES519XX_14B_PACKET_SIZE, NULL,
sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse, NULL, sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
NULL,
&uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER, &uni_t_ut61e_ser_driver_info, receive_data_UNI_T_UT61E_SER,
}, },
{ {
"ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1", "ISO-TECH", "IDM103N", "2400/7o1/rts=0/dtr=1",
2400, ES519XX_11B_PACKET_SIZE, NULL, 2400, ES519XX_11B_PACKET_SIZE, NULL,
sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse, NULL, sr_es519xx_2400_11b_packet_valid, sr_es519xx_2400_11b_parse,
NULL,
&iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N, &iso_tech_idm103n_driver_info, receive_data_ISO_TECH_IDM103N,
}, },
{
"Tenma", "72-7745 (UT-D02 cable)", "2400/8n1/rts=0/dtr=1",
2400, FS9721_PACKET_SIZE, NULL,
sr_fs9721_packet_valid, sr_fs9721_parse,
sr_fs9721_00_temp_c,
&tenma_72_7745_ser_driver_info, receive_data_TENMA_72_7745_SER,
},
{ {
/* Note: ES51986 baudrate is actually 19230! */ /* Note: ES51986 baudrate is actually 19230! */
"Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1", "Tenma", "72-7750 (UT-D02 cable)", "19200/7o1/rts=0/dtr=1",
@ -600,4 +610,5 @@ DRV(uni_t_ut61c_ser, UNI_T_UT61C_SER, "uni-t-ut61c-ser", "UNI-T UT61C (UT-D02 ca
DRV(uni_t_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)") DRV(uni_t_ut61d_ser, UNI_T_UT61D_SER, "uni-t-ut61d-ser", "UNI-T UT61D (UT-D02 cable)")
DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)") DRV(uni_t_ut61e_ser, UNI_T_UT61E_SER, "uni-t-ut61e-ser", "UNI-T UT61E (UT-D02 cable)")
DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N") DRV(iso_tech_idm103n, ISO_TECH_IDM103N, "iso-tech-idm103n", "ISO-TECH IDM103N")
DRV(tenma_72_7745_ser, TENMA_72_7745_SER, "tenma-72-7745-ser", "Tenma 72-7745 (UT-D02 cable)")
DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)") DRV(tenma_72_7750_ser, TENMA_72_7750_SER, "tenma-72-7750-ser", "Tenma 72-7750 (UT-D02 cable)")

1
hardware/serial-dmm/protocol.c
View File

@ -189,4 +189,5 @@ RECEIVE_DATA(UNI_T_UT61C_SER, fs9922)
RECEIVE_DATA(UNI_T_UT61D_SER, fs9922) RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
RECEIVE_DATA(UNI_T_UT61E_SER, es519xx) RECEIVE_DATA(UNI_T_UT61E_SER, es519xx)
RECEIVE_DATA(ISO_TECH_IDM103N, es519xx) RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)
RECEIVE_DATA(TENMA_72_7745_SER, fs9721)
RECEIVE_DATA(TENMA_72_7750_SER, es519xx) RECEIVE_DATA(TENMA_72_7750_SER, es519xx)

4
hardware/serial-dmm/protocol.h
View File

@ -53,10 +53,11 @@ enum {
UNI_T_UT61D_SER, UNI_T_UT61D_SER,
UNI_T_UT61E_SER, UNI_T_UT61E_SER,
ISO_TECH_IDM103N, ISO_TECH_IDM103N,
TENMA_72_7745_SER,
TENMA_72_7750_SER, TENMA_72_7750_SER,
}; };
#define DMM_COUNT 30 #define DMM_COUNT 31
struct dmm_info { struct dmm_info {
/** Manufacturer/brand. */ /** Manufacturer/brand. */
@ -138,6 +139,7 @@ SR_PRIV int receive_data_UNI_T_UT61C_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT61D_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_UNI_T_UT61E_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_ISO_TECH_IDM103N(int fd, int revents, void *cb_data); SR_PRIV int receive_data_ISO_TECH_IDM103N(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TENMA_72_7745_SER(int fd, int revents, void *cb_data);
SR_PRIV int receive_data_TENMA_72_7750_SER(int fd, int revents, void *cb_data); SR_PRIV int receive_data_TENMA_72_7750_SER(int fd, int revents, void *cb_data);
#endif #endif

1
hwdriver.c
View File

@ -226,6 +226,7 @@ extern SR_PRIV struct sr_dev_driver uni_t_ut61c_ser_driver_info;
extern SR_PRIV struct sr_dev_driver uni_t_ut61d_ser_driver_info; 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;
extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info; extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_driver_info;
extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info;
extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info; extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info;
#endif #endif
#ifdef HAVE_HW_UNI_T_DMM #ifdef HAVE_HW_UNI_T_DMM