Skip to content

Commit bd08297

Browse files
suda-morrissuda-morris
committed
Merge branch 'feature/modbus_add_support_esp32c61' into 'master'
feature modbus add support esp32c61 Closes IDF-10050 See merge request espressif/esp-idf!32707
2 parents 9acd005 + 01dcc49 commit bd08297

File tree

4 files changed

+20
-14
lines changed

4 files changed

+20
-14
lines changed

‎examples/protocols/modbus/serial/mb_master/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Configure the slave address for each slave in the Modbus segment (the CONFIG_MB_
9797
```
9898
------------------------------------------------------------------------------------------------------------------------------
9999
| UART Interface | #define | Default pins for | Default pins for ESP32-S2 | External RS485 Driver Pin |
100-
| | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2) | |
100+
| | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2, C61) | |
101101
| ----------------------|--------------------|-----------------------|---------------------------|---------------------------|
102102
| Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI |
103103
| Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO |

‎examples/protocols/modbus/serial/mb_master/main/Kconfig.projbuild‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ menu "Modbus Example Configuration"
3232
int "UART RXD pin number"
3333
range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
3434
default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4
35-
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
36-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
35+
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
36+
default 8 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
37+
default 8 if IDF_TARGET_ESP32C61
3738
help
3839
GPIO number for UART RX pin. See UART documentation for more information
3940
about available pin numbers for UART.
@@ -42,8 +43,9 @@ menu "Modbus Example Configuration"
4243
int "UART TXD pin number"
4344
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
4445
default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4
45-
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
46-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
46+
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
47+
default 9 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
48+
default 9 if IDF_TARGET_ESP32C61
4749
help
4850
GPIO number for UART TX pin. See UART documentation for more information
4951
about available pin numbers for UART.
@@ -53,8 +55,9 @@ menu "Modbus Example Configuration"
5355
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
5456
default 20 if IDF_TARGET_ESP32P4
5557
default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6
56-
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
57-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
58+
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
59+
default 10 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
60+
default 10 if IDF_TARGET_ESP32C61
5861
help
5962
GPIO number for UART RTS pin. This pin is connected to
6063
~RE/DE pin of RS485 transceiver to switch direction.

‎examples/protocols/modbus/serial/mb_slave/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Configure the UART pins used for modbus communication using the command and tabl
4747
```
4848
------------------------------------------------------------------------------------------------------------------------------
4949
| UART Interface | #define | Default pins for | Default pins for ESP32-S2 | External RS485 Driver Pin |
50-
| | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2) | |
50+
| | | ESP32 (C6, P4) | (S3, C3, C2, C5, H2, C61) | |
5151
| ----------------------|--------------------|-----------------------|---------------------------|---------------------------|
5252
| Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI |
5353
| Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO |

‎examples/protocols/modbus/serial/mb_slave/main/Kconfig.projbuild‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ menu "Modbus Example Configuration"
3232
int "UART RXD pin number"
3333
range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
3434
default 22 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4
35-
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
36-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
35+
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
36+
default 8 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
37+
default 8 if IDF_TARGET_ESP32C61
3738
help
3839
GPIO number for UART RX pin. See UART documentation for more information
3940
about available pin numbers for UART.
@@ -42,8 +43,9 @@ menu "Modbus Example Configuration"
4243
int "UART TXD pin number"
4344
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
4445
default 23 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32P4
45-
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
46-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
46+
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
47+
default 9 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
48+
default 9 if IDF_TARGET_ESP32C61
4749
help
4850
GPIO number for UART TX pin. See UART documentation for more information
4951
about available pin numbers for UART.
@@ -53,8 +55,9 @@ menu "Modbus Example Configuration"
5355
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
5456
default 20 if IDF_TARGET_ESP32P4
5557
default 18 if IDF_TARGET_ESP32 || IDF_TARGET_ESP32C6
56-
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3 ||\
57-
IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
58+
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C3
59+
default 10 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C5
60+
default 10 if IDF_TARGET_ESP32C61
5861
help
5962
GPIO number for UART RTS pin. This pin is connected to
6063
~RE/DE pin of RS485 transceiver to switch direction.

0 commit comments

Comments
 (0)