From 82f7fe4d354a5143acc6d3ff04bf95c0142a155c Mon Sep 17 00:00:00 2001 From: aleks Date: Tue, 26 Nov 2019 11:14:09 +0100 Subject: [PATCH] freemodbus: fix merge issues * Original commit: espressif/esp-idf@6e14b6265bd5a74adb47c89c1276075b15d161a4 --- components/freemodbus/modbus/rtu/mbrtu_m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/freemodbus/modbus/rtu/mbrtu_m.c b/components/freemodbus/modbus/rtu/mbrtu_m.c index f4c1ef4..07b6d25 100644 --- a/components/freemodbus/modbus/rtu/mbrtu_m.c +++ b/components/freemodbus/modbus/rtu/mbrtu_m.c @@ -393,7 +393,7 @@ BOOL MB_PORT_ISR_ATTR xMBMasterRTUTimerExpired(void) vMBMasterPortTimersDisable( ); /* If timer mode is convert delay, the master event then turns EV_MASTER_EXECUTE status. */ if (xMBMasterGetCurTimerMode() == MB_TMODE_CONVERT_DELAY) { - xNeedPoll = xMBMasterPortEventPost( EV_MASTER_EXECUTE ); + xNeedPoll = xMBMasterPortEventPost(EV_MASTER_EXECUTE); } return xNeedPoll;