freemodbus: fix merge issues

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;

examples/protocols/modbus_slave/sdkconfig.defaults

@@ -1,10 +0,0 @@
-#
-# Modbus configuration
-#
-CONFIG_MB_UART_RXD=22
-CONFIG_MB_UART_TXD=23
-CONFIG_MB_UART_RTS=18
-CONFIG_FMB_TIMER_PORT_ENABLED=y
-CONFIG_FMB_TIMER_GROUP=0
-CONFIG_FMB_TIMER_INDEX=0
-CONFIG_FMB_TIMER_ISR_IN_IRAM=y