From 464b6d803ca16d0696d73e94c99626f5ec4eaaed Mon Sep 17 00:00:00 2001 From: Alex Lisitsyn Date: Sat, 28 Jan 2023 00:45:46 +0800 Subject: [PATCH] examples: modbus add esp32c2 esp32c6 targets --- examples/protocols/.build-test-rules.yml | 6 ++++-- .../protocols/modbus/serial/mb_master/README.md | 8 ++++---- .../serial/mb_master/main/Kconfig.projbuild | 16 ++++++++-------- .../protocols/modbus/serial/mb_slave/README.md | 8 ++++---- .../serial/mb_slave/main/Kconfig.projbuild | 16 ++++++++-------- .../protocols/modbus/tcp/mb_tcp_master/README.md | 4 ++-- .../protocols/modbus/tcp/mb_tcp_slave/README.md | 4 ++-- 7 files changed, 32 insertions(+), 30 deletions(-) diff --git a/examples/protocols/.build-test-rules.yml b/examples/protocols/.build-test-rules.yml index 15d700987f..c64d4da25d 100644 --- a/examples/protocols/.build-test-rules.yml +++ b/examples/protocols/.build-test-rules.yml @@ -129,9 +129,11 @@ examples/protocols/mdns: examples/protocols/modbus: disable: - - if: IDF_TARGET in ["esp32c2", "esp32c6", "esp32h2"] + - if: IDF_TARGET in ["esp32h2"] + disable_test: + - if: IDF_TARGET != "esp32" temporary: true - reason: target(s) not supported yet + reason: lack of runners examples/protocols/mqtt/ssl: disable: diff --git a/examples/protocols/modbus/serial/mb_master/README.md b/examples/protocols/modbus/serial/mb_master/README.md index cb3903cf04..6239bcb664 100644 --- a/examples/protocols/modbus/serial/mb_master/README.md +++ b/examples/protocols/modbus/serial/mb_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 ESP32 Pin | Default pins for | External RS485 Driver Pin | - | | | | ESP32-S2(S3, C3) | | + | 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 | diff --git a/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild b/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild index 76f0397ef2..a87cab7501 100644 --- a/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild +++ b/examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild @@ -6,8 +6,8 @@ menu "Modbus Example Configuration" 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 - default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 + 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 help UART communication port number for Modbus example. @@ -21,8 +21,8 @@ menu "Modbus Example Configuration" config MB_UART_RXD int "UART RXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX - default 22 if IDF_TARGET_ESP32 - default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -30,8 +30,8 @@ menu "Modbus Example Configuration" config MB_UART_TXD int "UART TXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 23 if IDF_TARGET_ESP32 - default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -39,8 +39,8 @@ menu "Modbus Example Configuration" config MB_UART_RTS int "UART RTS pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 18 if IDF_TARGET_ESP32 - default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 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/protocols/modbus/serial/mb_slave/README.md b/examples/protocols/modbus/serial/mb_slave/README.md index f7f52907b7..f32cbf7329 100644 --- a/examples/protocols/modbus/serial/mb_slave/README.md +++ b/examples/protocols/modbus/serial/mb_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | 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 ESP32 Pin | Default pins for | External RS485 Driver Pin | - | | | | ESP32-S2(S3, C3) | | + | 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 | diff --git a/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild b/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild index 1d3baecbc2..8e332df7f2 100644 --- a/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild +++ b/examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild @@ -6,8 +6,8 @@ menu "Modbus Example Configuration" 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 - default 1 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 + 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 help UART communication port number for Modbus example. @@ -21,8 +21,8 @@ menu "Modbus Example Configuration" config MB_UART_RXD int "UART RXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX - default 22 if IDF_TARGET_ESP32 - default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 help GPIO number for UART RX pin. See UART documentation for more information about available pin numbers for UART. @@ -30,8 +30,8 @@ menu "Modbus Example Configuration" config MB_UART_TXD int "UART TXD pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 23 if IDF_TARGET_ESP32 - default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 help GPIO number for UART TX pin. See UART documentation for more information about available pin numbers for UART. @@ -39,8 +39,8 @@ menu "Modbus Example Configuration" config MB_UART_RTS int "UART RTS pin number" range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX - default 18 if IDF_TARGET_ESP32 - default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 + default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 + default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 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/protocols/modbus/tcp/mb_tcp_master/README.md b/examples/protocols/modbus/tcp/mb_tcp_master/README.md index eb348d4e25..d75ea59fef 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_master/README.md +++ b/examples/protocols/modbus/tcp/mb_tcp_master/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Modbus TCP Master Example diff --git a/examples/protocols/modbus/tcp/mb_tcp_slave/README.md b/examples/protocols/modbus/tcp/mb_tcp_slave/README.md index b0fe931c76..912073c015 100644 --- a/examples/protocols/modbus/tcp/mb_tcp_slave/README.md +++ b/examples/protocols/modbus/tcp/mb_tcp_slave/README.md @@ -1,5 +1,5 @@ -| Supported Targets | ESP32 | ESP32-C3 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | # Modbus Slave Example