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

switch the UNI-T UT61E driver to the new es519xx parser

This commit is contained in:
Aurelien Jacobs 2013-10-03 23:30:18 +02:00 committed by Uwe Hermann
parent 29bad967a4
commit d97824e52e
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,8 +249,8 @@ SR_PRIV struct dmm_info dmms[] = {
{
/* Note: ES51922 baudrate is actually 19230! */
"UNI-T", "UT61E (UT-D02 cable)", "19200/7o1/rts=0/dtr=1",
19200, ES51922_PACKET_SIZE, NULL,
sr_es51922_packet_valid, sr_es51922_parse, NULL,
19200, ES519XX_14B_PACKET_SIZE, 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,
},
{

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

@ -184,5 +184,5 @@ RECEIVE_DATA(UNI_T_UT60A_SER, fs9721)
RECEIVE_DATA(UNI_T_UT60E_SER, fs9721)
RECEIVE_DATA(UNI_T_UT61C_SER, fs9922)
RECEIVE_DATA(UNI_T_UT61D_SER, fs9922)
RECEIVE_DATA(UNI_T_UT61E_SER, es51922)
RECEIVE_DATA(UNI_T_UT61E_SER, es519xx)
RECEIVE_DATA(ISO_TECH_IDM103N, es519xx)

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

@ -95,8 +95,8 @@ SR_PRIV struct dmm_info udmms[] = {
* this DMM, of course).
*/
"UNI-T", "UT61E", 19200,
ES51922_PACKET_SIZE,
sr_es51922_packet_valid, sr_es51922_parse,
ES519XX_14B_PACKET_SIZE,
sr_es519xx_19200_14b_packet_valid, sr_es519xx_19200_14b_parse,
NULL,
&uni_t_ut61e_driver_info, receive_data_UNI_T_UT61E,
},

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

@ -237,7 +237,7 @@ static int get_and_handle_data(struct sr_dev_inst *sdi, int dmm, void *info)
num_databytes_in_chunk = buf[0] & 0x0f;
for (i = 0; i < num_databytes_in_chunk; i++, devc->buflen++) {
pbuf[devc->buflen] = buf[1 + i];
if (udmms[dmm].packet_parse == sr_es51922_parse)
if (udmms[dmm].packet_parse == sr_es519xx_19200_14b_parse)
pbuf[devc->buflen] &= ~(1 << 7);
}
@ -305,7 +305,7 @@ RECEIVE_DATA(UNI_T_UT60A, fs9721)
RECEIVE_DATA(UNI_T_UT60E, fs9721)
RECEIVE_DATA(UNI_T_UT61C, fs9922)
RECEIVE_DATA(UNI_T_UT61D, fs9922)
RECEIVE_DATA(UNI_T_UT61E, es51922)
RECEIVE_DATA(UNI_T_UT61E, es519xx)
RECEIVE_DATA(VOLTCRAFT_VC820, fs9721)
RECEIVE_DATA(VOLTCRAFT_VC830, fs9922)
RECEIVE_DATA(VOLTCRAFT_VC840, fs9721)