From 52b692293b7f075cefaadf8e0c0d458256bfd0fe Mon Sep 17 00:00:00 2001 From: Alex Lisitsyn Date: Wed, 14 Jun 2023 15:01:13 +0800 Subject: [PATCH] modbus add support for esp32h2 --- .gitlab-ci.yml | 14 +++++---- test/.build-test-rules.yml | 18 +++++++++++ test/serial/mb_serial_master/CMakeLists.txt | 2 +- test/serial/mb_serial_master/README.md | 24 +++++++-------- .../mb_serial_master/main/Kconfig.projbuild | 30 ++++++++++++++----- test/serial/mb_serial_slave/README.md | 24 +++++++-------- .../mb_serial_slave/main/Kconfig.projbuild | 30 ++++++++++++++----- test/tcp/mb_tcp_master/README.md | 2 +- test/tcp/mb_tcp_master/sdkconfig.ci.ethernet | 1 + test/tcp/mb_tcp_master/sdkconfig.ci.wifi | 2 ++ test/tcp/mb_tcp_master/sdkconfig.defaults | 8 ++--- test/tcp/mb_tcp_slave/README.md | 2 +- test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet | 5 +++- test/tcp/mb_tcp_slave/sdkconfig.ci.wifi | 7 +++-- test/tcp/mb_tcp_slave/sdkconfig.defaults | 15 +++++++--- 15 files changed, 123 insertions(+), 61 deletions(-) create mode 100644 test/.build-test-rules.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2cf68d..429a1b0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,7 @@ after_script: .before_script_build_jobs: before_script: - pip install idf-component-manager --upgrade - - pip install "idf_build_apps~=0.3.0" + - pip install "idf_build_apps~=1.0.1" # This template gets expanded multiple times, once for every IDF version. # IDF version is specified by setting the espressif/idf image tag. @@ -87,6 +87,8 @@ after_script: --check-warnings --ignore-warning-file ../tools/ignore_build_warnings.txt --collect-size-info $SIZE_INFO_LOCATION + --manifest-rootpath . + --manifest-file .build-test-rules.yml --parallel-count ${CI_NODE_TOTAL:-1} --parallel-index ${CI_NODE_INDEX:-1} variables: @@ -96,31 +98,31 @@ build_idf_latest: extends: .build_pytest_template image: espressif/idf:latest variables: - TEST_TARGETS: "esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32c6" + TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2" build_idf_v5.0: extends: .build_pytest_template image: espressif/idf:release-v5.0 variables: - TEST_TARGETS: "esp32,esp32s2,esp32s3,esp32c2,esp32c3" + TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3" build_idf_v4.4: extends: .build_pytest_template image: espressif/idf:release-v4.4 variables: - TEST_TARGETS: "esp32,esp32s2,esp32s3,esp32c3" + TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c3" build_idf_v4.3: extends: .build_pytest_template image: espressif/idf:release-v4.3 variables: - TEST_TARGETS: "esp32,esp32s2,esp32c3" + TEST_TARGETS: "esp32 esp32s2 esp32c3" build_idf_v4.2: extends: .build_pytest_template image: espressif/idf:release-v4.2 variables: - TEST_TARGETS: "esp32,esp32s2" + TEST_TARGETS: "esp32 esp32s2" .target_test_template: image: $TARGET_TEST_ENV_IMAGE diff --git a/test/.build-test-rules.yml b/test/.build-test-rules.yml new file mode 100644 index 0000000..216c7b9 --- /dev/null +++ b/test/.build-test-rules.yml @@ -0,0 +1,18 @@ +tcp/mb_tcp_master: + disable_test: + - if: IDF_TARGET != "esp32" + reason: only manual test is performed + disable: + - if: CONFIG_NAME == "wifi" and SOC_WIFI_SUPPORTED != 1 + +tcp/mb_tcp_slave: + disable_test: + - if: IDF_TARGET != "esp32" + reason: only manual test is performed + disable: + - if: CONFIG_NAME == "wifi" and SOC_WIFI_SUPPORTED != 1 + + + + + diff --git a/test/serial/mb_serial_master/CMakeLists.txt b/test/serial/mb_serial_master/CMakeLists.txt index c4188f9..842a5fc 100644 --- a/test/serial/mb_serial_master/CMakeLists.txt +++ b/test/serial/mb_serial_master/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5) set(EXTRA_COMPONENT_DIRS "../../../") -set(EXCLUDE_COMPONENTS examples test_app test freemodbus) +set(EXCLUDE_COMPONENTS freemodbus) # Include parameters from common modbus folder set(MB_PARAMS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../mb_example_common") diff --git a/test/serial/mb_serial_master/README.md b/test/serial/mb_serial_master/README.md index 31679a0..4128ec5 100644 --- a/test/serial/mb_serial_master/README.md +++ b/test/serial/mb_serial_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 | ESP32-C6 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Master Example @@ -72,7 +72,7 @@ RS485 example circuit schematic for connection of master and slave devices into +-------x-------+ +-------x-------+ RXD <------| RO | DIFFERENTIAL | RO|-----> RXD | B|---------------|B | - TXD ------>| DI MAX485 | \ / | MAX485 DI|<----- TXD + TXD ------>| DI MAX483 | \ / | MAX483 DI|<----- TXD ESP32 BOARD | | RS-485 side | | External PC (emulator) with USB to serial or RTS --+--->| DE | / \ | DE|---+ ESP32 BOARD (slave) | | A|---------------|A | | @@ -95,15 +95,15 @@ Configure the UART pins used for modbus communication using and table below. Define the communication mode parameter for master and slave in Kconfig - CONFIG_MB_COMM_MODE (must be the same for master and slave devices in one segment). Configure the slave address for each slave in the Modbus segment (the CONFIG_MB_SLAVE_ADDR in Kconfig). ``` - -------------------------------------------------------------------------------------------------------------------------- - | UART Interface | #define | Default pins for | Default pins for | External RS485 Driver Pin | - | | | ESP32 (C6) | ESP32-S2 (S3, C3, C2) | | - | ----------------------|--------------------|-----------------------|-----------------------|---------------------------| - | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | - | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | - | Request To Send (RTS) | CONFIG_MB_UART_RTS | GPIO18 | GPIO10 | ~RE/DE | - | Ground | n/a | GND | GND | GND | - -------------------------------------------------------------------------------------------------------------------------- + ------------------------------------------------------------------------------------------------------------------------------ + | UART Interface | #define | Default pins for | Default pins for | External RS485 Driver Pin | + | | | ESP32 (C6) | ESP32-S2 (S3, C3, C2, H2) | | + | ----------------------|--------------------|-----------------------|---------------------------|---------------------------| + | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | + | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | + | Request To Send (RTS) | CONFIG_MB_UART_RTS | GPIO18 | GPIO10 | ~RE/DE | + | Ground | n/a | GND | GND | GND | + ------------------------------------------------------------------------------------------------------------------------------ ``` Note: Each target chip has different GPIO pins available for UART connection. Please refer to UART documentation for selected target for more information. diff --git a/test/serial/mb_serial_master/main/Kconfig.projbuild b/test/serial/mb_serial_master/main/Kconfig.projbuild index 3d9f150..ef661fc 100644 --- a/test/serial/mb_serial_master/main/Kconfig.projbuild +++ b/test/serial/mb_serial_master/main/Kconfig.projbuild @@ -1,11 +1,21 @@ menu "Modbus Example Configuration" + config MB_UART_PORT_ONE + bool + default y + depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_NUM > 1) + + config MB_UART_PORT_TWO + bool + default y + depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2) + config MB_UART_PORT_NUM int "UART port number" - range 0 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3 - default 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3 - range 0 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 - default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 + range 0 2 if MB_UART_PORT_TWO + default 2 if MB_UART_PORT_TWO + range 0 1 if MB_UART_PORT_ONE + default 1 if MB_UART_PORT_ONE help UART communication port number for Modbus example. @@ -25,7 +35,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -39,7 +51,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -53,7 +67,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART RTS pin. This pin is connected to ~RE/DE pin of RS485 transceiver to switch direction. diff --git a/test/serial/mb_serial_slave/README.md b/test/serial/mb_serial_slave/README.md index ea3c978..48881bf 100644 --- a/test/serial/mb_serial_slave/README.md +++ b/test/serial/mb_serial_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 | ESP32-C6 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example @@ -25,7 +25,7 @@ RS485 example circuit schematic: +-------x-------+ +-------x-------+ RXD <------| RO | DIFFERENTIAL | RO|-----> RXD | B|---------------|B | - TXD ------>| DI MAX485 | \ / | MAX485 DI|<----- TXD + TXD ------>| DI MAX483 | \ / | MAX483 DI|<----- TXD ESP32 board | | RS-485 side | | Modbus master RTS --+--->| DE | / \ | DE|---+ | | A|---------------|A | | @@ -45,15 +45,15 @@ idf.py menuconfig Select Modbus Example Configuration menu item. Configure the UART pins used for modbus communication using the command and table below. ``` - -------------------------------------------------------------------------------------------------------------------------- - | UART Interface | #define | Default pins for | Default pins for | External RS485 Driver Pin | - | | | ESP32 (C6) | ESP32-S2 (S3, C3, C2) | | - | ----------------------|--------------------|-----------------------|-----------------------|---------------------------| - | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | - | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | - | Request To Send (RTS) | CONFIG_MB_UART_RTS | GPIO18 | GPIO10 | ~RE/DE | - | Ground | n/a | GND | GND | GND | - -------------------------------------------------------------------------------------------------------------------------- + ------------------------------------------------------------------------------------------------------------------------------ + | UART Interface | #define | Default pins for | Default pins for | External RS485 Driver Pin | + | | | ESP32 (C6) | ESP32-S2 (S3, C3, C2, H2) | | + | ----------------------|--------------------|-----------------------|---------------------------|---------------------------| + | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | + | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | + | Request To Send (RTS) | CONFIG_MB_UART_RTS | GPIO18 | GPIO10 | ~RE/DE | + | Ground | n/a | GND | GND | GND | + ------------------------------------------------------------------------------------------------------------------------------ ``` Note: Each target chip has different GPIO pins available for UART connection. Please refer to UART documentation for selected target for more information. diff --git a/test/serial/mb_serial_slave/main/Kconfig.projbuild b/test/serial/mb_serial_slave/main/Kconfig.projbuild index d661d2b..7e0abf7 100644 --- a/test/serial/mb_serial_slave/main/Kconfig.projbuild +++ b/test/serial/mb_serial_slave/main/Kconfig.projbuild @@ -1,11 +1,21 @@ menu "Modbus Example Configuration" + config MB_UART_PORT_ONE + bool + default y + depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_NUM > 1) + + config MB_UART_PORT_TWO + bool + default y + depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2) + config MB_UART_PORT_NUM int "UART port number" - range 0 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3 - default 2 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S3 - range 0 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 - default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 + range 0 2 if MB_UART_PORT_TWO + default 2 if MB_UART_PORT_TWO + range 0 1 if MB_UART_PORT_ONE + default 1 if MB_UART_PORT_ONE help UART communication port number for Modbus example. @@ -25,7 +35,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -39,7 +51,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -53,7 +67,9 @@ menu "Modbus Example Configuration" range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if IDF_TARGET_ESP32C2 - default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 + range 0 27 if IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 help GPIO number for UART RTS pin. This pin is connected to ~RE/DE pin of RS485 transceiver to switch direction. diff --git a/test/tcp/mb_tcp_master/README.md b/test/tcp/mb_tcp_master/README.md index 2d51649..d75ea59 100644 --- a/test/tcp/mb_tcp_master/README.md +++ b/test/tcp/mb_tcp_master/README.md @@ -1,4 +1,4 @@ -| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 | ESP32-C6 | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | | ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Modbus TCP Master Example diff --git a/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet b/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet index 1d8527b..b2a8033 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet +++ b/test/tcp/mb_tcp_master/sdkconfig.ci.ethernet @@ -11,6 +11,7 @@ CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_PORT_ENABLED=y +CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y diff --git a/test/tcp/mb_tcp_master/sdkconfig.ci.wifi b/test/tcp/mb_tcp_master/sdkconfig.ci.wifi index b4b5485..31f08b6 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.ci.wifi +++ b/test/tcp/mb_tcp_master/sdkconfig.ci.wifi @@ -8,10 +8,12 @@ CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_PORT_ENABLED=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y +CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" diff --git a/test/tcp/mb_tcp_master/sdkconfig.defaults b/test/tcp/mb_tcp_master/sdkconfig.defaults index cb2ab90..d80d67d 100644 --- a/test/tcp/mb_tcp_master/sdkconfig.defaults +++ b/test/tcp/mb_tcp_master/sdkconfig.defaults @@ -8,17 +8,13 @@ CONFIG_FMB_PORT_TASK_STACK_SIZE=4096 CONFIG_FMB_PORT_TASK_PRIO=10 CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=1000 +CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_PORT_ENABLED=y CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y -CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_MDNS_IP_RESOLVER=n +CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y -CONFIG_MB_SLAVE_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=n -CONFIG_EXAMPLE_CONNECT_ETHERNET=n -CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" \ No newline at end of file diff --git a/test/tcp/mb_tcp_slave/README.md b/test/tcp/mb_tcp_slave/README.md index fa55b3d..a034c01 100644 --- a/test/tcp/mb_tcp_slave/README.md +++ b/test/tcp/mb_tcp_slave/README.md @@ -1,4 +1,4 @@ -| Supported Targets | ESP32 | ESP32-S2 | ESP32-S3 | ESP32-C3 | ESP32-C2 | ESP32-C6 | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | | ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example diff --git a/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet b/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet index 3dd63cd..b2a8033 100644 --- a/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet +++ b/test/tcp/mb_tcp_slave/sdkconfig.ci.ethernet @@ -8,13 +8,15 @@ CONFIG_FMB_PORT_TASK_STACK_SIZE=4096 CONFIG_FMB_PORT_TASK_PRIO=10 CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=1000 +CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_PORT_ENABLED=y +CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_MB_SLAVE_ADDR=1 +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_EXAMPLE_CONNECT_WIFI=n CONFIG_EXAMPLE_CONNECT_ETHERNET=y @@ -24,6 +26,7 @@ CONFIG_EXAMPLE_ETH_MDC_GPIO=23 CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_EXAMPLE_ETHERNET_EMAC_TASK_STACK_SIZE=4096 CONFIG_ETH_ENABLED=y CONFIG_ETH_USE_ESP32_EMAC=y diff --git a/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi b/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi index 9de718d..a9308fc 100644 --- a/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi +++ b/test/tcp/mb_tcp_slave/sdkconfig.ci.wifi @@ -5,15 +5,16 @@ CONFIG_FMB_PORT_TASK_STACK_SIZE=4096 CONFIG_FMB_PORT_TASK_PRIO=10 CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 +CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=3000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y +CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y +CONFIG_FMB_TCP_UID_ENABLED=n CONFIG_MB_MDNS_IP_RESOLVER=n CONFIG_MB_SLAVE_IP_FROM_STDIN=y CONFIG_MB_SLAVE_ADDR=1 CONFIG_EXAMPLE_CONNECT_IPV6=n -CONFIG_EXAMPLE_CONNECT_ETHERNET=n +CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y CONFIG_EXAMPLE_CONNECT_WIFI=y CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" diff --git a/test/tcp/mb_tcp_slave/sdkconfig.defaults b/test/tcp/mb_tcp_slave/sdkconfig.defaults index 04afa5a..e0d3cdd 100644 --- a/test/tcp/mb_tcp_slave/sdkconfig.defaults +++ b/test/tcp/mb_tcp_slave/sdkconfig.defaults @@ -10,10 +10,17 @@ CONFIG_FMB_COMM_MODE_RTU_EN=n CONFIG_FMB_COMM_MODE_ASCII_EN=n CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=2000 CONFIG_FMB_MASTER_DELAY_MS_CONVERT=300 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_MB_MDNS_IP_RESOLVER=n -CONFIG_MB_SLAVE_IP_FROM_STDIN=y -CONFIG_EXAMPLE_CONNECT_IPV6=n +CONFIG_FMB_TIMER_ISR_IN_IRAM=y CONFIG_FMB_TIMER_USE_ISR_DISPATCH_METHOD=y +CONFIG_MB_MDNS_IP_RESOLVER=n +CONFIG_FMB_TCP_UID_ENABLED=n +CONFIG_MB_SLAVE_IP_FROM_STDIN=y +CONFIG_MB_SLAVE_ADDR=1 +CONFIG_EXAMPLE_CONNECT_IPV6=n CONFIG_EXAMPLE_WIFI_SSID="${CI_WIFI_SSID}" CONFIG_EXAMPLE_WIFI_PASSWORD="${CI_WIFI_PASSW}" + +CONFIG_EXAMPLE_CONNECT_ETHERNET=n +CONFIG_EXAMPLE_CONNECT_WIFI=y + +