Skip to content

Commit 40febc8

Browse files
committed
Merge branch 'fix/idf_v5.2.1_compatibility' into 'master'
Fix ota-http support for IDF v5.2.1 on ESP32-S2 and ESP32-C2 See merge request app-frameworks/esp-aws-iot!67
2 parents aead2aa + 32a3e73 commit 40febc8

File tree

3 files changed

+68
-7
lines changed

3 files changed

+68
-7
lines changed

README.md

+43-7
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This SDK enables AWS IoT cloud connectivity with ESP32-based platforms using the
1818
```
1919
- Please refer to https://docs.espressif.com/projects/esp-idf/en/latest/get-started/index.html for setting up ESP-IDF
2020
- ESP-IDF can be downloaded from https://github.com/espressif/esp-idf/
21-
- This SDK supports `release/v5.1`, `release/v5.0`, `release/v4.4` and `release/v4.3` of ESP-IDF.
21+
- This SDK supports `release/v5.2`, `release/v5.1`, `release/v5.0`, `release/v4.4` and `release/v4.3` of ESP-IDF.
2222
- Please set your branch to the IDF release that you would like to use, and pull in the latest changes.
2323
> **Note**: Please read [Support Policy](#support-policy) below for more details.
2424
- Please refer to the [example README](examples/README.md) for more information on setting up examples.
@@ -49,7 +49,7 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
4949
</thead>
5050
<tbody>
5151
<tr align="center">
52-
<td rowspan="4">ESP32</td>
52+
<td rowspan="5">ESP32</td>
5353
<td>IDF v4.3</td>
5454
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
5555
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
@@ -74,7 +74,13 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
7474
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
7575
</tr>
7676
<tr align="center">
77-
<td rowspan="4">ESP32-S2</td>
77+
<td>IDF v5.2</td>
78+
<td></td>
79+
<td></td>
80+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
81+
</tr>
82+
<tr align="center">
83+
<td rowspan="5">ESP32-S2</td>
7884
<td>IDF v4.3</td>
7985
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
8086
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
@@ -97,9 +103,15 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
97103
<td></td>
98104
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
99105
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
106+
</tr>
107+
<tr align="center">
108+
<td>IDF v5.2</td>
109+
<td></td>
110+
<td></td>
111+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
100112
</tr>
101113
<tr align="center">
102-
<td rowspan="4">ESP32-C3</td>
114+
<td rowspan="5">ESP32-C3</td>
103115
<td>IDF v4.3</td>
104116
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
105117
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
@@ -122,9 +134,15 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
122134
<td></td>
123135
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
124136
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
137+
</tr>
138+
<tr align="center">
139+
<td>IDF v5.2</td>
140+
<td></td>
141+
<td></td>
142+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
125143
</tr>
126144
<tr align="center">
127-
<td rowspan="3">ESP32-S3</td>
145+
<td rowspan="4">ESP32-S3</td>
128146
<td>IDF v4.4</td>
129147
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
130148
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
@@ -141,9 +159,15 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
141159
<td></td>
142160
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
143161
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
162+
</tr>
163+
<tr align="center">
164+
<td>IDF v5.2</td>
165+
<td></td>
166+
<td></td>
167+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
144168
</tr>
145169
<tr align="center">
146-
<td rowspan="2">ESP32-C2</td>
170+
<td rowspan="3">ESP32-C2</td>
147171
<td>IDF v5.0</td>
148172
<td></td>
149173
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
@@ -154,14 +178,26 @@ The following table shows esp-aws-iot support with the ESP-IDF support of Espres
154178
<td></td>
155179
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
156180
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
181+
</tr>
182+
<tr align="center">
183+
<td>IDF v5.2</td>
184+
<td></td>
185+
<td></td>
186+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
157187
</tr>
158188
<tr align="center">
159-
<td>ESP32-C6</td>
189+
<td rowspan="2">ESP32-C6</td>
160190
<td>IDF v5.1</td>
161191
<td></td>
162192
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
163193
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
164194
</tr>
195+
<tr align="center">
196+
<td>IDF v5.2</td>
197+
<td></td>
198+
<td></td>
199+
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
200+
</tr>
165201
</tbody>
166202
</table>
167203
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
2+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
3+
CONFIG_SPI_FLASH_ROM_IMPL=y
4+
5+
# Wi-Fi
6+
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
7+
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8
8+
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=8
9+
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n
10+
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n
11+
CONFIG_ESP32_WIFI_IRAM_OPT=n
12+
CONFIG_ESP32_WIFI_RX_IRAM_OPT=n
13+
14+
# LWIP
15+
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=16
16+
17+
# mbedTLS
18+
CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
19+
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
20+
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
21+
CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT=y

examples/ota/ota_http/sdkconfig.defaults.esp32s2

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
2+
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
3+
CONFIG_SPI_FLASH_ROM_IMPL=y
4+
15
# Wi-Fi
26
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
37
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8

0 commit comments

Comments
 (0)