Skip to content

Commit

Permalink
Merge branch 'fix/idf_v5.2.1_compatibility' into 'master'
Browse files Browse the repository at this point in the history
Fix ota-http support for IDF v5.2.1 on ESP32-S2 and ESP32-C2

See merge request app-frameworks/esp-aws-iot!67
avsheth committed May 20, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents aead2aa + 32a3e73 commit 40febc8
Showing 3 changed files with 68 additions and 7 deletions.
50 changes: 43 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ This SDK enables AWS IoT cloud connectivity with ESP32-based platforms using the
```
- Please refer to https://docs.espressif.com/projects/esp-idf/en/latest/get-started/index.html for setting up ESP-IDF
- ESP-IDF can be downloaded from https://github.com/espressif/esp-idf/
- This SDK supports `release/v5.1`, `release/v5.0`, `release/v4.4` and `release/v4.3` of ESP-IDF.
- This SDK supports `release/v5.2`, `release/v5.1`, `release/v5.0`, `release/v4.4` and `release/v4.3` of ESP-IDF.
- Please set your branch to the IDF release that you would like to use, and pull in the latest changes.
> **Note**: Please read [Support Policy](#support-policy) below for more details.
- 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
</thead>
<tbody>
<tr align="center">
<td rowspan="4">ESP32</td>
<td rowspan="5">ESP32</td>
<td>IDF v4.3</td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<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
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td rowspan="4">ESP32-S2</td>
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td rowspan="5">ESP32-S2</td>
<td>IDF v4.3</td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<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
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td rowspan="4">ESP32-C3</td>
<td rowspan="5">ESP32-C3</td>
<td>IDF v4.3</td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<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
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td rowspan="3">ESP32-S3</td>
<td rowspan="4">ESP32-S3</td>
<td>IDF v4.4</td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<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
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td rowspan="2">ESP32-C2</td>
<td rowspan="3">ESP32-C2</td>
<td>IDF v5.0</td>
<td></td>
<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
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>ESP32-C6</td>
<td rowspan="2">ESP32-C6</td>
<td>IDF v5.1</td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
<tr align="center">
<td>IDF v5.2</td>
<td></td>
<td></td>
<td><img src="https://img.shields.io/badge/-supported-green" alt="Image" width="65" height="20"></td>
</tr>
</tbody>
</table>
21 changes: 21 additions & 0 deletions examples/ota/ota_http/sdkconfig.defaults.esp32c2
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
CONFIG_SPI_FLASH_ROM_IMPL=y

# Wi-Fi
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8
CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=8
CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=n
CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=n
CONFIG_ESP32_WIFI_IRAM_OPT=n
CONFIG_ESP32_WIFI_RX_IRAM_OPT=n

# LWIP
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=16

# mbedTLS
CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=2048
CONFIG_MBEDTLS_DYNAMIC_BUFFER=y
CONFIG_MBEDTLS_DYNAMIC_FREE_CONFIG_DATA=y
CONFIG_MBEDTLS_DYNAMIC_FREE_CA_CERT=y
4 changes: 4 additions & 0 deletions examples/ota/ota_http/sdkconfig.defaults.esp32s2
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
CONFIG_SPI_FLASH_ROM_IMPL=y

# Wi-Fi
CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=4
CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=8

0 comments on commit 40febc8

Please sign in to comment.