Skip to content

Commit 2653ed5

Browse files
kostaondkostaond
committed
Merge branch 'feat/spi_eth_c61' into 'master'
feat(esp_eth): added SPI ETH defaults for C61 in examples Closes IDF-9298 See merge request espressif/esp-idf!33559
2 parents 9bbc61e + 301e671 commit 2653ed5

File tree

50 files changed

+107
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+107
-195
lines changed

‎examples/common_components/env_caps/esp32c61/Kconfig.env_caps‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ config ENV_GPIO_RANGE_MIN
44

55
config ENV_GPIO_RANGE_MAX
66
int
7-
default 21
7+
default 24
88

99
config ENV_GPIO_IN_RANGE_MAX
1010
int

‎examples/ethernet/.build-test-rules.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
examples/ethernet/basic:
44
enable:
55
- if: INCLUDE_DEFAULT == 1
6-
disable:
7-
- if: IDF_TARGET in ["esp32c61"]
8-
temporary: true
9-
reason: not supported yet # TODO: [esp32c61] IDF-9298
106
disable_test:
117
- if: IDF_TARGET not in ["esp32"]
128
temporary: true
@@ -20,10 +16,6 @@ examples/ethernet/basic:
2016
- esp_driver_spi
2117

2218
examples/ethernet/enc28j60:
23-
disable:
24-
- if: IDF_TARGET in ["esp32c61"]
25-
temporary: true
26-
reason: not supported yet # TODO: [esp32c61] IDF-9298
2719
depends_components:
2820
- esp_eth
2921
- esp_netif
@@ -33,10 +25,6 @@ examples/ethernet/enc28j60:
3325
- esp_driver_spi
3426

3527
examples/ethernet/iperf:
36-
disable:
37-
- if: IDF_TARGET in ["esp32c61"]
38-
temporary: true
39-
reason: not supported yet # TODO: [esp32c61] IDF-9298
4028
disable_test:
4129
- if: IDF_TARGET not in ["esp32"]
4230
temporary: true

‎examples/ethernet/basic/README.md‎

Lines changed: 2 additions & 2 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
# Ethernet Example
55
(See the README.md file in the upper level 'examples' directory for more information about examples.)

‎examples/ethernet/basic/components/ethernet_init/Kconfig.projbuild‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ menu "Example Ethernet Configuration"
145145
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
146146
default 14 if IDF_TARGET_ESP32
147147
default 12 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
148-
default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
148+
default 6 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
149149
default 4 if IDF_TARGET_ESP32H2
150150
default 33 if IDF_TARGET_ESP32P4
151151
default 8 if IDF_TARGET_ESP32C5
@@ -157,7 +157,7 @@ menu "Example Ethernet Configuration"
157157
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
158158
default 13 if IDF_TARGET_ESP32
159159
default 11 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
160-
default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
160+
default 7 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
161161
default 5 if IDF_TARGET_ESP32H2
162162
default 32 if IDF_TARGET_ESP32P4
163163
default 10 if IDF_TARGET_ESP32C5
@@ -169,7 +169,7 @@ menu "Example Ethernet Configuration"
169169
range ENV_GPIO_RANGE_MIN ENV_GPIO_IN_RANGE_MAX
170170
default 12 if IDF_TARGET_ESP32
171171
default 13 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
172-
default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6
172+
default 2 if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C61
173173
default 0 if IDF_TARGET_ESP32H2
174174
default 52 if IDF_TARGET_ESP32P4
175175
default 9 if IDF_TARGET_ESP32C5
@@ -188,7 +188,7 @@ menu "Example Ethernet Configuration"
188188
range ENV_GPIO_RANGE_MIN ENV_GPIO_OUT_RANGE_MAX
189189
default 15 if IDF_TARGET_ESP32
190190
default 10 if IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 || IDF_TARGET_ESP32C2
191-
default 3 if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
191+
default 3 if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5 || IDF_TARGET_ESP32C61
192192
default 1 if IDF_TARGET_ESP32H2
193193
default 53 if IDF_TARGET_ESP32P4
194194
help
@@ -204,7 +204,7 @@ menu "Example Ethernet Configuration"
204204
default 21 if IDF_TARGET_ESP32C6
205205
default 3 if IDF_TARGET_ESP32C2
206206
default 11 if IDF_TARGET_ESP32H2
207-
default 23 if IDF_TARGET_ESP32P4
207+
default 23 if IDF_TARGET_ESP32P4 || IDF_TARGET_ESP32C61
208208
default 1 if IDF_TARGET_ESP32C5
209209
help
210210
Set the GPIO number used by SPI CS1, i.e. Chip Select associated with the second SPI Eth module.
@@ -216,6 +216,7 @@ menu "Example Ethernet Configuration"
216216
default 4 if IDF_TARGET_ESP32C2 || IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
217217
default 10 if IDF_TARGET_ESP32H2
218218
default 48 if IDF_TARGET_ESP32P4
219+
default 0 if IDF_TARGET_ESP32C61
219220
help
220221
Set the GPIO number used by the first SPI Ethernet module interrupt line.
221222
Set -1 to use SPI Ethernet module in polling mode.
@@ -229,6 +230,7 @@ menu "Example Ethernet Configuration"
229230
default 5 if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32C5
230231
default 9 if IDF_TARGET_ESP32H2
231232
default 47 if IDF_TARGET_ESP32P4
233+
default 1 if IDF_TARGET_ESP32C61
232234
help
233235
Set the GPIO number used by the second SPI Ethernet module interrupt line.
234236
Set -1 to use SPI Ethernet module in polling mode.

‎examples/ethernet/enc28j60/README.md‎

Lines changed: 2 additions & 2 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
# ENC28J60 Example
55
(See the README.md file in the upper level 'examples' directory for more information about examples.)

‎examples/ethernet/iperf/README.md‎

Lines changed: 2 additions & 2 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
# Ethernet iperf Example
55

‎examples/protocols/.build-test-rules.yml‎

Lines changed: 6 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@ examples/protocols/esp_http_client:
1414
<<: *default_dependencies
1515
enable:
1616
- if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
17-
disable:
18-
- if: IDF_TARGET in ["esp32c61"]
19-
temporary: true
20-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
2117
disable_test:
2218
- if: IDF_TARGET not in ["esp32", "linux"]
2319
depends_filepatterns:
@@ -26,9 +22,9 @@ examples/protocols/esp_http_client:
2622
examples/protocols/esp_local_ctrl:
2723
<<: *default_dependencies
2824
disable:
29-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
25+
- if: IDF_TARGET in ["esp32h2"]
3026
temporary: true
31-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
27+
reason: not supported yet
3228
disable_test:
3329
- if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
3430
reason: only test on these targets
@@ -38,20 +34,12 @@ examples/protocols/esp_local_ctrl:
3834

3935
examples/protocols/http_request:
4036
<<: *default_dependencies
41-
disable:
42-
- if: IDF_TARGET in ["esp32c61"]
43-
temporary: true
44-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
4537
disable_test:
4638
- if: IDF_TARGET != "esp32"
4739
reason: only test on esp32
4840

4941
examples/protocols/http_server:
5042
<<: *default_dependencies
51-
disable:
52-
- if: IDF_TARGET in ["esp32c61"]
53-
temporary: true
54-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
5543
disable_test:
5644
- if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
5745
reason: only test on these targets
@@ -63,9 +51,6 @@ examples/protocols/http_server/captive_portal:
6351
disable:
6452
- if: SOC_WIFI_SUPPORTED != 1
6553
reason: WiFi is required
66-
- if: IDF_TARGET in ["esp32c61"]
67-
temporary: true
68-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
6954
disable_test:
7055
- if: IDF_TARGET != "esp32"
7156
reason: only test on esp32
@@ -75,18 +60,14 @@ examples/protocols/http_server/captive_portal:
7560
examples/protocols/http_server/restful_server:
7661
<<: *default_dependencies
7762
disable:
78-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
63+
- if: IDF_TARGET in ["esp32h2"]
7964
temporary: true
80-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
65+
reason: not supported yet
8166
depends_filepatterns:
8267
- components/esp_http_server/**/*
8368

8469
examples/protocols/http_server/ws_echo_server:
8570
<<: *default_dependencies
86-
disable:
87-
- if: IDF_TARGET in ["esp32c61"]
88-
temporary: true
89-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
9071
disable_test:
9172
- if: IDF_TARGET != "esp32"
9273
reason: only test on esp32
@@ -97,30 +78,22 @@ examples/protocols/https_mbedtls:
9778
<<: *default_dependencies
9879
enable:
9980
- if: INCLUDE_DEFAULT == 1 or IDF_TARGET == "linux"
100-
disable:
101-
- if: IDF_TARGET in ["esp32c61"]
102-
temporary: true
103-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
10481
disable_test:
10582
- if: IDF_TARGET != "esp32"
10683
reason: only test on esp32
10784

10885
examples/protocols/https_request:
10986
<<: *default_dependencies
11087
disable:
111-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
88+
- if: IDF_TARGET in ["esp32h2"]
11289
temporary: true
113-
reason: not supported on h2 # TODO: [ESP32C61] IDF-9298
90+
reason: not supported on h2
11491
disable_test:
11592
- if: IDF_TARGET != "esp32"
11693
reason: only test on esp32
11794

11895
examples/protocols/https_server/simple:
11996
<<: *default_dependencies
120-
disable:
121-
- if: IDF_TARGET in ["esp32c61"]
122-
temporary: true
123-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
12497
disable_test:
12598
- if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
12699
reason: only test on these targets
@@ -130,10 +103,6 @@ examples/protocols/https_server/simple:
130103

131104
examples/protocols/https_server/wss_server:
132105
<<: *default_dependencies
133-
disable:
134-
- if: IDF_TARGET in ["esp32c61"]
135-
temporary: true
136-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
137106
disable_test:
138107
- if: IDF_TARGET != "esp32"
139108
reason: only test on esp32
@@ -142,10 +111,6 @@ examples/protocols/https_server/wss_server:
142111

143112
examples/protocols/https_x509_bundle:
144113
<<: *default_dependencies
145-
disable:
146-
- if: IDF_TARGET in ["esp32c61"]
147-
temporary: true
148-
reason: not supported yet # TODO: [ESP32C61] IDF-9298
149114
disable_test:
150115
- if: IDF_TARGET != "esp32"
151116
reason: only test on esp32
@@ -159,47 +124,27 @@ examples/protocols/icmp_echo:
159124

160125
examples/protocols/l2tap:
161126
<<: *default_dependencies
162-
disable:
163-
- if: IDF_TARGET in ["esp32c61"]
164-
temporary: true
165-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
166127
disable_test:
167128
- if: IDF_TARGET != "esp32"
168129
reason: only test on esp32
169130

170131
examples/protocols/modbus:
171132
<<: *default_dependencies
172-
disable:
173-
- if: IDF_TARGET in ["esp32c61"]
174-
temporary: true
175-
reason: not supported yet [ESP32C61] IDF-9298
176133
depends_filepatterns:
177134
- examples/common_components/protocol_examples_common/**/*
178135
- examples/protocols/modbus/mb_example_common/**/*
179136

180137

181138
examples/protocols/mqtt:
182139
<<: *default_dependencies
183-
disable:
184-
- if: IDF_TARGET in ["esp32c61"]
185-
temporary: true
186-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
187140
depends_filepatterns:
188141
- components/mqtt/**/*
189142

190143
examples/protocols/mqtt/custom_outbox:
191144
<<: *default_dependencies
192-
disable:
193-
- if: IDF_TARGET in ["esp32c61"]
194-
temporary: true
195-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
196145

197146
examples/protocols/mqtt/ssl:
198147
<<: *default_dependencies
199-
disable:
200-
- if: IDF_TARGET in ["esp32c61"]
201-
temporary: true
202-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
203148
disable_test:
204149
- if: IDF_TARGET != "esp32"
205150
reason: only test on esp32
@@ -213,50 +158,30 @@ examples/protocols/mqtt/ssl_ds:
213158

214159
examples/protocols/mqtt/tcp:
215160
<<: *default_dependencies
216-
disable:
217-
- if: IDF_TARGET in ["esp32c61"]
218-
temporary: true
219-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
220161
disable_test:
221162
- if: IDF_TARGET != "esp32"
222163
reason: only test on esp32
223164

224165
examples/protocols/mqtt/ws:
225166
<<: *default_dependencies
226-
disable:
227-
- if: IDF_TARGET in ["esp32c61"]
228-
temporary: true
229-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
230167
disable_test:
231168
- if: IDF_TARGET != "esp32"
232169
reason: only test on esp32
233170

234171
examples/protocols/mqtt/wss:
235172
<<: *default_dependencies
236-
disable:
237-
- if: IDF_TARGET in ["esp32c61"]
238-
temporary: true
239-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
240173
disable_test:
241174
- if: IDF_TARGET != "esp32"
242175
reason: only test on esp32
243176

244177
examples/protocols/mqtt5:
245178
<<: *default_dependencies
246-
disable:
247-
- if: IDF_TARGET in ["esp32c61"]
248-
temporary: true
249-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
250179
disable_test:
251180
- if: IDF_TARGET != "esp32"
252181
reason: only test on esp32
253182

254183
examples/protocols/smtp_client:
255184
<<: *default_dependencies
256-
disable:
257-
- if: IDF_TARGET in ["esp32c61"]
258-
temporary: true
259-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
260185

261186
examples/protocols/sntp:
262187
<<: *default_dependencies
@@ -267,10 +192,6 @@ examples/protocols/sntp:
267192

268193
examples/protocols/sockets:
269194
<<: *default_dependencies
270-
disable:
271-
- if: IDF_TARGET in ["esp32c61"]
272-
temporary: true
273-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
274195
disable_test:
275196
- if: SOC_WIFI_SUPPORTED != 1
276197

@@ -286,17 +207,9 @@ examples/protocols/sockets/tcp_client:
286207
disable_test:
287208
- if: SOC_WIFI_SUPPORTED != 1
288209
# linux target won't work with CONFIG_EXAMPLE_SOCKET_IP_INPUT_STDIN=y
289-
disable:
290-
- if: IDF_TARGET in ["esp32c61"]
291-
temporary: true
292-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
293210

294211
examples/protocols/static_ip:
295212
<<: *default_dependencies
296-
disable:
297-
- if: IDF_TARGET in ["esp32c61"]
298-
temporary: true
299-
reason: not supported on c61 # TODO: [ESP32C61] IDF-9298
300213
disable_test:
301214
- if: IDF_TARGET != "esp32"
302215
temporary: true

‎examples/protocols/esp_http_client/README.md‎

Lines changed: 2 additions & 2 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 | Linux |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | ----- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | Linux |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- | -------- | ----- |
33
# ESP HTTP Client Example
44

55
See the README.md file in the upper level 'examples' directory for more information about examples.

0 commit comments

Comments
 (0)