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

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 7a03ba32e65f6657b5e7c0edd604cc20d3292f9e..e5bc1c4569a7e385d4678a032608104b1bcaf9c6 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -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,
        },
        {

diff --git a/hardware/serial-dmm/protocol.c b/hardware/serial-dmm/protocol.c
index b08bd3016a86edc09eeb67f0ecbb3dba753d7f26..997597f212531782427f09160b83ff5e60d3d8f7 100644 (file)
--- a/hardware/serial-dmm/protocol.c
+++ b/hardware/serial-dmm/protocol.c
@@ -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)

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 8292dfb0a05823740e05dbe3205447efc11029f5..f874cca0a99bd95877d6eb1a95608294229c2c4d 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -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,
        },

diff --git a/hardware/uni-t-dmm/protocol.c b/hardware/uni-t-dmm/protocol.c
index 3158e0fad54103eb6c534008cd1bfef9b92f56d6..fe45ff765129f1e499c4fb661cbb1332270a288d 100644 (file)
--- a/hardware/uni-t-dmm/protocol.c
+++ b/hardware/uni-t-dmm/protocol.c
@@ -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)