feat(modbus): modify modbus tcp port that can run on ESP8266

Author: ESP-YJM

components/freemodbus/CMakeLists.txt

@@ -5,20 +5,13 @@ set(srcs
     "common/esp_modbus_slave.c"
     "modbus/mb.c"
     "modbus/mb_m.c"
-    "modbus/ascii/mbascii.c"
-    "modbus/ascii/mbascii_m.c"
-    "modbus/rtu/mbrtu_m.c"
-    "modbus/rtu/mbrtu.c"
-    "modbus/rtu/mbcrc.c"
     "modbus/tcp/mbtcp.c"
     "modbus/tcp/mbtcp_m.c"
     "port/port.c"
     "port/portevent.c"
     "port/portevent_m.c"
     "port/portother.c"
     "port/portother_m.c"
-    "port/portserial.c"
-    "port/portserial_m.c"
     "port/porttimer.c"
     "port/porttimer_m.c"
     "modbus/functions/mbfunccoils.c"
@@ -32,28 +25,21 @@ set(srcs
     "modbus/functions/mbfuncinput_m.c"
     "modbus/functions/mbfuncother.c"
     "modbus/functions/mbutils.c"
-    "serial_slave/modbus_controller/mbc_serial_slave.c"
-    "serial_master/modbus_controller/mbc_serial_master.c"
     "tcp_slave/port/port_tcp_slave.c"
     "tcp_slave/modbus_controller/mbc_tcp_slave.c"
     "tcp_master/modbus_controller/mbc_tcp_master.c"
     "tcp_master/port/port_tcp_master.c"
     "common/esp_modbus_master_tcp.c"
-    "common/esp_modbus_slave_tcp.c"
-    "common/esp_modbus_master_serial.c"
-    "common/esp_modbus_slave_serial.c")
+    "common/esp_modbus_slave_tcp.c")
 
 set(include_dirs common/include)
 
 set(priv_include_dirs common port modbus modbus/ascii modbus/functions
                                 modbus/rtu modbus/tcp modbus/include)
 
-list(APPEND priv_include_dirs serial_slave/port serial_slave/modbus_controller
-                                        serial_master/port serial_master/modbus_controller
-                                tcp_slave/port tcp_slave/modbus_controller
+list(APPEND priv_include_dirs   tcp_slave/port tcp_slave/modbus_controller
                                 tcp_master/port tcp_master/modbus_controller)
 
 idf_component_register(SRCS "${srcs}"
                     INCLUDE_DIRS "${include_dirs}"
-                    PRIV_INCLUDE_DIRS "${priv_include_dirs}"
-                    REQUIRES driver)
+                    PRIV_INCLUDE_DIRS "${priv_include_dirs}")

components/freemodbus/Kconfig

@@ -35,18 +35,6 @@ menu "Modbus configuration"
                 Once expired the current connection with the client will be closed
                 and Modbus slave will be waiting for new connection to accept.
 
-    config FMB_COMM_MODE_RTU_EN
-        bool "Enable Modbus stack support for RTU mode"
-        default y
-        help
-                Enable RTU Modbus communication mode option for Modbus serial stack.
-
-    config FMB_COMM_MODE_ASCII_EN
-        bool "Enable Modbus stack support for ASCII mode"
-        default y
-        help
-                Enable ASCII Modbus communication mode option for Modbus serial stack.
-
     config FMB_MASTER_TIMEOUT_MS_RESPOND
         int "Slave respond timeout (Milliseconds)"
         default 150
@@ -88,23 +76,6 @@ menu "Modbus configuration"
                 This buffer is used for modbus frame transfer. The Modbus protocol maximum
                 frame size is 256 bytes. Bigger size can be used for non standard implementations.
 
-    config FMB_SERIAL_ASCII_BITS_PER_SYMB
-        int "Number of data bits per ASCII character"
-        default 8
-        range 7 8
-        depends on FMB_COMM_MODE_ASCII_EN
-        help
-                This option defines the number of data bits per ASCII character.
-
-    config FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS
-        int "Response timeout for ASCII communication mode (ms)"
-        default 1000
-        range 300 2000
-        depends on FMB_COMM_MODE_ASCII_EN
-        help
-                This option defines response timeout of slave in milliseconds for ASCII communication mode.
-                Thus the timeout will expire and allow the master program to handle the error.
-
     config FMB_PORT_TASK_PRIO
         int "Modbus port task priority"
         range 3 10
@@ -163,13 +134,6 @@ menu "Modbus configuration"
                 Modbus stack event queue timeout in milliseconds. This may help to optimize
                 Modbus stack event processing time.
 
-    config FMB_TIMER_PORT_ENABLED
-        bool "Modbus slave stack use timer for 3.5T symbol time measurement"
-        default y
-        help
-                If this option is set the Modbus stack uses timer for T3.5 time measurement.
-                Else the internal UART TOUT timeout is used for 3.5T symbol time measurement.
-
     config FMB_TIMER_GROUP
         int "Modbus Timer group number"
         range 0 1

components/freemodbus/common/esp_modbus_master_serial.c

@@ -15,7 +15,7 @@
 
 #ifndef _MB_IFACE_COMMON_H
 #define _MB_IFACE_COMMON_H
-
+#include "freertos/FreeRTOS.h"
 #include "driver/uart.h"                    // for UART types
 
 #ifdef __cplusplus

components/freemodbus/common/esp_modbus_slave_serial.c

@@ -18,7 +18,6 @@
 
 #include <stdint.h>                 // for standard int types definition
 #include <stddef.h>                 // for NULL and std defines
-#include "soc/soc.h"                // for BITN definitions
 #include "esp_modbus_common.h"      // for common types
 
 #ifdef __cplusplus

components/freemodbus/common/include/esp_modbus_common.h

@@ -19,7 +19,6 @@
 // Public interface header for slave
 #include <stdint.h>                 // for standard int types definition
 #include <stddef.h>                 // for NULL and std defines
-#include "soc/soc.h"                // for BITN definitions
 #include "freertos/FreeRTOS.h"      // for task creation and queues access
 #include "freertos/event_groups.h"  // for event groups
 #include "esp_modbus_common.h"      // for common types

components/freemodbus/common/include/esp_modbus_master.h

@@ -14,7 +14,7 @@
  */
 #ifndef _MB_CONTROLLER_SLAVE_H
 #define _MB_CONTROLLER_SLAVE_H
-
+#include "freertos/FreeRTOS.h"
 #include "driver/uart.h"    // for uart defines
 #include "errno.h"          // for errno
 #include "esp_log.h"        // for log write

components/freemodbus/common/include/esp_modbus_slave.h

@@ -351,7 +351,6 @@ eMBMasterPoll( void )
             if ( ( eStatus == MB_ENOERR ) && ( ( ucRcvAddress == ucMBMasterGetDestAddress() ) 
                                           || ( ucRcvAddress == MB_TCP_PSEUDO_ADDRESS ) ) )
             {
-                ( void ) xMBMasterPortEventPost( EV_MASTER_EXECUTE );
                 ESP_LOGD(MB_PORT_TAG, "%s: Packet data received successfully (%u).", __func__, eStatus);
                 ESP_LOG_BUFFER_HEX_LEVEL("POLL receive buffer", (void*)ucMBFrame, (uint16_t)usLength, ESP_LOG_DEBUG);
                 ( void ) xMBMasterPortEventPost( EV_MASTER_EXECUTE );

components/freemodbus/common/mbc_slave.h

@@ -17,7 +17,6 @@
 #define PORT_COMMON_H_
 
 #include "freertos/FreeRTOS.h"
-#include "freertos/xtensa_api.h"
 #include "esp_log.h"                // for ESP_LOGE macro
 #include "mbconfig.h"
 

components/freemodbus/modbus/mb_m.c

@@ -52,7 +52,6 @@
 #include "mbport.h"
 #include "port.h"
 #include "sdkconfig.h"
-#include "port_serial_slave.h"
 /* ----------------------- Variables ----------------------------------------*/
 static xQueueHandle xQueueHdl;
 

components/freemodbus/port/port.h

@@ -44,7 +44,7 @@
 #include "port.h"
 #include "mbport.h"
 #include "freertos/semphr.h"
-#include "port_serial_master.h"
+
 
 #if MB_MASTER_RTU_ENABLED || MB_MASTER_ASCII_ENABLED || MB_MASTER_TCP_ENABLED
 /* ----------------------- Defines ------------------------------------------*/