From 726dabb4dac248b79bac236586cfe23c6fd92559 Mon Sep 17 00:00:00 2001 From: Alex Lisitsyn Date: Wed, 25 Feb 2026 09:27:27 +0000 Subject: [PATCH] fix targets support issues (c61, c5, p4) v2 --- .gitlab-ci.yml | 2 +- .../mb_serial_master/main/Kconfig.projbuild | 29 ++++++++++++------- .../mb_serial_slave/main/Kconfig.projbuild | 27 +++++++++++------ 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8c11c96..23260bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,7 @@ after_script: --manifest-file .build-test-rules.yml \ --parallel-count ${CI_NODE_TOTAL:-1} \ --parallel-index ${CI_NODE_INDEX:-1} - echo "delete build folders:" $(find . -type d -regex '^\./.*build_esp32[a-z]+[0-9]+[_a-z]*' -print -exec rm -rf {} +) + echo "delete build folders:" $(find . -type d -regex '^\./.*build_esp32[a-or-z]+[0-9]+[_a-z]*' -print -exec rm -rf {} +) ls -lh > test_dir_${PWD##*/}.txt # This template gets expanded multiple times, once for every IDF version. diff --git a/examples/serial/mb_serial_master/main/Kconfig.projbuild b/examples/serial/mb_serial_master/main/Kconfig.projbuild index 55b325b..1d757d7 100644 --- a/examples/serial/mb_serial_master/main/Kconfig.projbuild +++ b/examples/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,17 @@ 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 8 if IDF_TARGET_ESP32C61 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -48,14 +51,17 @@ 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 9 if IDF_TARGET_ESP32C61 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -63,17 +69,20 @@ menu "Modbus Example Configuration" config MB_UART_RTS int "UART RTS pin number" range 0 34 if IDF_TARGET_ESP32 - range 0 56 if IDF_TARGET_ESP32P4 range 0 23 if IDF_TARGET_ESP32C6 - default 18 if IDF_TARGET_ESP32 || 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 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 10 if IDF_TARGET_ESP32C61 help GPIO number for UART RTS pin. This pin is connected to ~RE/DE pin of RS485 transceiver to switch direction. diff --git a/examples/serial/mb_serial_slave/main/Kconfig.projbuild b/examples/serial/mb_serial_slave/main/Kconfig.projbuild index 8105254..bf122ac 100644 --- a/examples/serial/mb_serial_slave/main/Kconfig.projbuild +++ b/examples/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,17 @@ 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 8 if IDF_TARGET_ESP32C61 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -46,16 +49,19 @@ menu "Modbus Example Configuration" config MB_UART_TXD int "UART TXD pin number" range 0 34 if IDF_TARGET_ESP32 - range 0 56 if IDF_TARGET_ESP32P4 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 9 if IDF_TARGET_ESP32C61 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -66,14 +72,17 @@ 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 + range 0 21 if IDF_TARGET_ESP32C61 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2 + default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5 + default 10 if IDF_TARGET_ESP32C61 help GPIO number for UART RTS pin. This pin is connected to ~RE/DE pin of RS485 transceiver to switch direction.