diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 90ec175..63cf0fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -117,7 +117,7 @@ build_idf_master: matrix: - SUBDIR: ["serial", "tcp", "generic"] variables: - TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2 esp32p4" + TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4" build_idf_v5.0: extends: .build_pytest_template diff --git a/test/serial/mb_serial_master/README.md b/test/serial/mb_serial_master/README.md index 5f1d807..178ae99 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-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Master Example @@ -96,8 +96,8 @@ Define the communication mode parameter for master and slave in Kconfig - CONFIG 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, H2) | | + | UART Interface | #define | Default pins for | Default pins for ESP32-S2,| External RS485 Driver Pin | + | | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2) | | | ----------------------|--------------------|-----------------------|---------------------------|---------------------------| | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | diff --git a/test/serial/mb_serial_master/main/Kconfig.projbuild b/test/serial/mb_serial_master/main/Kconfig.projbuild index e81e0f4..a6827d4 100644 --- a/test/serial/mb_serial_master/main/Kconfig.projbuild +++ b/test/serial/mb_serial_master/main/Kconfig.projbuild @@ -3,12 +3,12 @@ menu "Modbus Example Configuration" config MB_UART_PORT_ONE bool default y - depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_NUM > 1) + depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_HP_NUM > 1) config MB_UART_PORT_TWO bool default y - depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2) + depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_HP_NUM > 2) config MB_UART_PORT_NUM int "UART port number" @@ -31,14 +31,15 @@ menu "Modbus Example Configuration" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -48,14 +49,15 @@ menu "Modbus Example Configuration" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -65,6 +67,7 @@ menu "Modbus Example Configuration" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 20 if IDF_TARGET_ESP32P4 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 range 0 46 if IDF_TARGET_ESP32S2 @@ -72,8 +75,8 @@ menu "Modbus Example Configuration" range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 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 15f1db7..6a7f552 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-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example @@ -46,8 +46,8 @@ 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, H2) | | + | UART Interface | #define | Default pins for | Default pins for ESP32-S2 | External RS485 Driver Pin | + | | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2) | | | ----------------------|--------------------|-----------------------|---------------------------|---------------------------| | Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI | | Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO | diff --git a/test/serial/mb_serial_slave/main/Kconfig.projbuild b/test/serial/mb_serial_slave/main/Kconfig.projbuild index 2e2bdca..a208e80 100644 --- a/test/serial/mb_serial_slave/main/Kconfig.projbuild +++ b/test/serial/mb_serial_slave/main/Kconfig.projbuild @@ -3,12 +3,12 @@ menu "Modbus Example Configuration" config MB_UART_PORT_ONE bool default y - depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_NUM > 1) + depends on (ESP_CONSOLE_UART_NUM !=1) && (SOC_UART_HP_NUM > 1) config MB_UART_PORT_TWO bool default y - depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_NUM > 2) + depends on (ESP_CONSOLE_UART_NUM !=2) && (SOC_UART_HP_NUM > 2) config MB_UART_PORT_NUM int "UART port number" @@ -31,14 +31,15 @@ menu "Modbus Example Configuration" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -48,14 +49,15 @@ menu "Modbus Example Configuration" range 0 34 if IDF_TARGET_ESP32 range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -66,14 +68,15 @@ menu "Modbus Example Configuration" range 0 23 if IDF_TARGET_ESP32C6 range 0 56 if IDF_TARGET_ESP32P4 default 20 if IDF_TARGET_ESP32P4 + range 0 28 if IDF_TARGET_ESP32C5 default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 range 0 46 if IDF_TARGET_ESP32S2 range 0 47 if IDF_TARGET_ESP32S3 range 0 19 if IDF_TARGET_ESP32C3 range 0 20 if 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 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 help GPIO number for UART RTS pin. This pin is connected to ~RE/DE pin of RS485 transceiver to switch direction.