From ab9d47e0230768f82a735343fa5b58e2029d8eda Mon Sep 17 00:00:00 2001 From: Damien George Date: Thu, 8 Apr 2021 23:56:28 +1000 Subject: [PATCH] esp32: Enable btree module. This was disabled with the move to CMake, and this commit reinstates it. Signed-off-by: Damien George --- ports/esp32/main/CMakeLists.txt | 4 +++- ports/esp32/mpconfigport.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt index 2223ecd031..aacdd40d31 100644 --- a/ports/esp32/main/CMakeLists.txt +++ b/ports/esp32/main/CMakeLists.txt @@ -149,6 +149,7 @@ set(MICROPY_CROSS_FLAGS -march=xtensawin) # Set compile options for this port. target_compile_definitions(${MICROPY_TARGET} PUBLIC + ${MICROPY_DEF_CORE} MICROPY_ESP_IDF_4=1 MICROPY_VFS_FAT=1 MICROPY_VFS_LFS2=1 @@ -164,7 +165,8 @@ target_compile_options(${MICROPY_TARGET} PUBLIC -Wno-missing-field-initializers ) -# add usermod +# Add additional extmod and usermod components. +target_link_libraries(${MICROPY_TARGET} micropy_extmod_btree) target_link_libraries(${MICROPY_TARGET} usermod) diff --git a/ports/esp32/mpconfigport.h b/ports/esp32/mpconfigport.h index 392f8c749c..c9c4b6268b 100644 --- a/ports/esp32/mpconfigport.h +++ b/ports/esp32/mpconfigport.h @@ -162,6 +162,7 @@ #define MICROPY_PY_UWEBSOCKET (1) #define MICROPY_PY_WEBREPL (1) #define MICROPY_PY_FRAMEBUF (1) +#define MICROPY_PY_BTREE (1) #define MICROPY_PY_USOCKET_EVENTS (MICROPY_PY_WEBREPL) #define MICROPY_PY_BLUETOOTH_RANDOM_ADDR (1) #define MICROPY_PY_BLUETOOTH_DEFAULT_GAP_NAME ("ESP32")