djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32: Add support to build with ESP-IDF v4.3 pre-release.

Browse Source 
The esp32 port now builds against IDF v4.3-beta1, as well as v4.4-dev.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-02-19 10:38:01 +11:00
parent 466ad35a72
commit 143372ab5e
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/esp32/main/CMakeLists.txt
View File

@ -113,6 +113,12 @@ if(IDF_VERSION_MINOR GREATER_EQUAL 2)
list(APPEND IDF_COMPONENTS esp_timer)
endif()
if(IDF_VERSION_MINOR GREATER_EQUAL 3)
list(APPEND IDF_COMPONENTS esp_hw_support)
list(APPEND IDF_COMPONENTS esp_pm)
list(APPEND IDF_COMPONENTS hal)
endif()
# Register the main IDF component.
idf_component_register(
SRCS

8
ports/esp32/modesp32.c
View File

@ -35,7 +35,6 @@
#include "driver/adc.h"
#include "esp_heap_caps.h"
#include "multi_heap.h"
#include "../heap_private.h"
#include "py/nlr.h"
#include "py/obj.h"
@ -46,6 +45,13 @@
#include "machine_rtc.h"
#include "modesp32.h"
// These private includes are needed for idf_heap_info.
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 3, 0)
#define MULTI_HEAP_FREERTOS
#include "../multi_heap_platform.h"
#endif
#include "../heap_private.h"
STATIC mp_obj_t esp32_wake_on_touch(const mp_obj_t wake) {
if (machine_rtc_config.ext0_pin != -1) {