Skip to content

Commit d6f8978

Browse files
alisitsynalisitsyn
committed
Merge branch 'feature/add_support_target_esp32c61' into 'master'
add support target esp32c61 See merge request idf/esp-modbus!73
2 parents 2601e34 + faf6850 commit d6f8978

File tree

5 files changed

+19
-7
lines changed

5 files changed

+19
-7
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ build_idf_latest:
128128
matrix:
129129
- !reference [.options_list, markers]
130130
variables:
131-
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32h2 esp32p4"
131+
TEST_TARGETS: "esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c5 esp32c6 esp32c61 esp32h2 esp32p4"
132132

133133
# Check the support policy for esp-idf v5.3
134134
build_idf_v5.3:

‎test/serial/mb_serial_master/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61| ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
33

44
# Modbus Master Example
55

@@ -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, C61, H2) | |
101101
| ----------------------|--------------------|-----------------------|---------------------------|---------------------------|
102102
| Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI |
103103
| Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO |

‎test/serial/mb_serial_master/main/Kconfig.projbuild‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ menu "Modbus Example Configuration"
3838
range 0 19 if IDF_TARGET_ESP32C3
3939
range 0 20 if IDF_TARGET_ESP32C2
4040
range 0 27 if IDF_TARGET_ESP32H2
41+
range 0 21 if IDF_TARGET_ESP32C61
4142
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
4243
default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
44+
default 8 if IDF_TARGET_ESP32C61
4345
help
4446
GPIO number for UART RX pin. See UART documentation for more information
4547
about available pin numbers for UART.
@@ -56,8 +58,10 @@ menu "Modbus Example Configuration"
5658
range 0 19 if IDF_TARGET_ESP32C3
5759
range 0 20 if IDF_TARGET_ESP32C2
5860
range 0 27 if IDF_TARGET_ESP32H2
61+
range 0 21 if IDF_TARGET_ESP32C61
5962
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
6063
default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
64+
default 9 if IDF_TARGET_ESP32C61
6165
help
6266
GPIO number for UART TX pin. See UART documentation for more information
6367
about available pin numbers for UART.
@@ -75,8 +79,10 @@ menu "Modbus Example Configuration"
7579
range 0 19 if IDF_TARGET_ESP32C3
7680
range 0 20 if IDF_TARGET_ESP32C2
7781
range 0 27 if IDF_TARGET_ESP32H2
82+
range 0 21 if IDF_TARGET_ESP32C61
7883
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
7984
default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
85+
default 10 if IDF_TARGET_ESP32C61
8086
help
8187
GPIO number for UART RTS pin. This pin is connected to
8288
~RE/DE pin of RS485 transceiver to switch direction.

‎test/serial/mb_serial_slave/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61| ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
33

44
# Modbus Slave Example
55

@@ -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, C61, H2) | |
5151
| ----------------------|--------------------|-----------------------|---------------------------|---------------------------|
5252
| Transmit Data (TxD) | CONFIG_MB_UART_TXD | GPIO23 | GPIO9 | DI |
5353
| Receive Data (RxD) | CONFIG_MB_UART_RXD | GPIO22 | GPIO8 | RO |

‎test/serial/mb_serial_slave/main/Kconfig.projbuild‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ menu "Modbus Example Configuration"
3838
range 0 19 if IDF_TARGET_ESP32C3
3939
range 0 20 if IDF_TARGET_ESP32C2
4040
range 0 27 if IDF_TARGET_ESP32H2
41+
range 0 21 if IDF_TARGET_ESP32C61
4142
default 8 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
4243
default 8 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
44+
default 8 if IDF_TARGET_ESP32C61
4345
help
4446
GPIO number for UART RX pin. See UART documentation for more information
4547
about available pin numbers for UART.
@@ -56,8 +58,10 @@ menu "Modbus Example Configuration"
5658
range 0 19 if IDF_TARGET_ESP32C3
5759
range 0 20 if IDF_TARGET_ESP32C2
5860
range 0 27 if IDF_TARGET_ESP32H2
61+
range 0 21 if IDF_TARGET_ESP32C61
5962
default 9 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
6063
default 9 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
64+
default 9 if IDF_TARGET_ESP32C61
6165
help
6266
GPIO number for UART TX pin. See UART documentation for more information
6367
about available pin numbers for UART.
@@ -75,8 +79,10 @@ menu "Modbus Example Configuration"
7579
range 0 19 if IDF_TARGET_ESP32C3
7680
range 0 20 if IDF_TARGET_ESP32C2
7781
range 0 27 if IDF_TARGET_ESP32H2
82+
range 0 21 if IDF_TARGET_ESP32C61
7883
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32H2
7984
default 10 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C5
85+
default 10 if IDF_TARGET_ESP32C61
8086
help
8187
GPIO number for UART RTS pin. This pin is connected to
8288
~RE/DE pin of RS485 transceiver to switch direction.

0 commit comments

Comments
 (0)