all: Update to micropython v1.21.0.

Updates the micropython submodule to v1.21.0, and updates the example
modules, and CUSTOM_ESP32 and CUSTOM_PYBD_SF2 boards to build with this
version.

Tested on a lilygo-t-display board, and PYBv1.1 and PYBD-SF2W boards.

Signed-off-by: Karl Palsson <[email protected]>
Signed-off-by: Damien George <[email protected]>

Author: karlp

boards/CUSTOM_ESP32/main/CMakeLists.txt

@@ -1,4 +1,4 @@
 # Include MicroPython ESP32 component.
 get_filename_component(MICROPY_DIR "../../../lib/micropython" ABSOLUTE)
 set(PROJECT_DIR ${MICROPY_DIR}/ports/esp32)
-include(${PROJECT_DIR}/main/CMakeLists.txt)
+include(${PROJECT_DIR}/main_esp32/CMakeLists.txt)

boards/CUSTOM_ESP32/main/idf_component.yml

@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.2"

boards/CUSTOM_ESP32/manifest.py

@@ -1,2 +1,5 @@
-freeze("$(PORT_DIR)/modules")
-freeze("$(BOARD_DIR)/../../src/utils", "xxd.py")
+# include default manifest
+include("$(PORT_DIR)/boards/manifest.py")
+
+# include our own extra...
+module("xxd.py", base_path="$(BOARD_DIR)/../../src/utils")

boards/CUSTOM_ESP32/partitions.csv renamed to boards/CUSTOM_ESP32/partitions-4MiB.csv

@@ -3,5 +3,5 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     0x9000,  0x6000,
 phy_init, data, phy,     0xf000,  0x1000,
-factory,  app,  factory, 0x10000, 0x180000,
+factory,  app,  factory, 0x10000, 0x1F0000,
 vfs,      data, fat,     0x200000, 0x200000,

boards/CUSTOM_PYBD_SF2/manifest.py

@@ -1 +1 @@
-include("$(MPY_DIR)/extmod/uasyncio/manifest.py")
+include("$(MPY_DIR)/extmod/asyncio/manifest.py")

boards/CUSTOM_PYBD_SF2/mpconfigboard.mk

@@ -12,7 +12,7 @@ TEXT1_SECTIONS = .text_ext
 # MicroPython settings
 MICROPY_PY_LWIP = 1
 MICROPY_PY_NETWORK_CYW43 = 1
-MICROPY_PY_USSL = 1
+MICROPY_PY_SSL = 1
 MICROPY_SSL_MBEDTLS = 1
 MICROPY_VFS_LFS2 = 1
 

lib/micropython

@@ -31,7 +31,4 @@ const mp_obj_module_t example_user_cmodule = {
 };
 
 // Register the module to make it available in Python.
-// Note: the "1" in the third argument means this module is always enabled.
-// This "1" can be optionally replaced with a macro like MODULE_CEXAMPLE_ENABLED
-// which can then be used to conditionally enable this module.
-MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule, 1);
+MP_REGISTER_MODULE(MP_QSTR_cexample, example_user_cmodule);

src/cmodules/cexample/modcexample.c

@@ -18,4 +18,4 @@ const mp_obj_module_t example_user_cmodule2 = {
     .globals = (mp_obj_dict_t *)&example_module_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_cexample2, example_user_cmodule2, 1);
+MP_REGISTER_MODULE(MP_QSTR_cexample2, example_user_cmodule2);