Skip to content

Commit 1e4ebab

Browse files
committed
Merge branch 'feat/enable_ota_examples_for_c61' into 'master'
feat(ota): Enable support for OTA examples for c61 Closes IDF-10915 See merge request espressif/esp-idf!33270
2 parents 312f47c + 7db2dfc commit 1e4ebab

File tree

7 files changed

+24
-23
lines changed

7 files changed

+24
-23
lines changed

examples/system/.build-test-rules.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,9 +133,9 @@ examples/system/nmi_isr:
133133

134134
examples/system/ota/advanced_https_ota:
135135
disable:
136-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
136+
- if: IDF_TARGET in ["esp32h2"]
137137
temporary: true
138-
reason: target esp32h2 esp32c61 is not supported yet
138+
reason: target esp32h2 is not supported yet
139139
disable_test:
140140
- if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]
141141
temporary: true
@@ -153,9 +153,9 @@ examples/system/ota/advanced_https_ota:
153153

154154
examples/system/ota/native_ota_example:
155155
disable:
156-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
156+
- if: IDF_TARGET in ["esp32h2"]
157157
temporary: true
158-
reason: target esp32h2, esp32c61 is not supported yet
158+
reason: target esp32h2 is not supported yet
159159
disable_test:
160160
- if: IDF_TARGET != "esp32"
161161
reason: Only esp32 has ethernet runners
@@ -170,19 +170,19 @@ examples/system/ota/native_ota_example:
170170

171171
examples/system/ota/otatool:
172172
disable:
173-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
173+
- if: IDF_TARGET in ["esp32h2"]
174174
temporary: true
175-
reason: target esp32h2, esp32c61 is not supported yet
175+
reason: target esp32h2 is not supported yet
176176
disable_test:
177-
- if: IDF_TARGET in ["esp32c5"]
178-
reason: incomplete esptool support for esp32c5 # IDF-10915
177+
- if: IDF_TARGET in ["esp32c61"]
178+
reason: target esp32c61 is not supported yet
179179

180180

181181
examples/system/ota/pre_encrypted_ota:
182182
disable:
183-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
183+
- if: IDF_TARGET in ["esp32h2"]
184184
temporary: true
185-
reason: target esp32h2, esp32c61 is not supported yet
185+
reason: target esp32h2 is not supported yet
186186
disable_test:
187187
- if: IDF_TARGET != "esp32"
188188
temporary: true
@@ -198,9 +198,9 @@ examples/system/ota/pre_encrypted_ota:
198198

199199
examples/system/ota/simple_ota_example:
200200
disable:
201-
- if: IDF_TARGET in ["esp32h2", "esp32c61"]
201+
- if: IDF_TARGET in ["esp32h2"]
202202
temporary: true
203-
reason: target esp32h2, esp32c61 is not supported yet
203+
reason: target esp32h2 is not supported yet
204204
- if: CONFIG_NAME == "spiram" and SOC_SPIRAM_SUPPORTED != 1
205205
disable_test:
206206
- if: IDF_TARGET not in ["esp32", "esp32c3", "esp32s3"]

examples/system/ota/advanced_https_ota/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-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
33

44
# Advanced HTTPS OTA example
55

examples/system/ota/native_ota_example/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-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
33

44
# Native OTA example
55

examples/system/ota/otatool/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-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
33

44
# OTA Tool Example
55

examples/system/ota/otatool/pytest_otatool.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ def _real_test_func(dut: Dut) -> None:
3030
@pytest.mark.esp32s2
3131
@pytest.mark.esp32c3
3232
@pytest.mark.esp32s3
33-
# @pytest.mark.esp32c5 # IDF-10915
33+
@pytest.mark.esp32c5
34+
# @pytest.mark.esp32c61 #IDF-11309
3435
@pytest.mark.esp32c6
3536
@pytest.mark.esp32p4
3637
@pytest.mark.generic

examples/system/ota/pre_encrypted_ota/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-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
33

44
# Encrypted Binary OTA
55

examples/system/ota/simple_ota_example/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-P4 | ESP32-S2 | ESP32-S3 |
2-
| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- |
1+
| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C5 | ESP32-C6 | ESP32-C61 | ESP32-P4 | ESP32-S2 | ESP32-S3 |
2+
| ----------------- | ----- | -------- | -------- | -------- | -------- | --------- | -------- | -------- | -------- |
33

44
# Simple OTA example
55

0 commit comments

Comments
 (0)