From 48cc142daa09348dee28eca84d72db428e17cf03 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Thu, 11 Aug 2022 21:28:08 +0100 Subject: [PATCH 1/2] Update micropython to v1.19.1 snapshot This snapshot includes the modframebuf improvements from ticket https://github.com/micropython/micropython/pull/9045 --- drivers/lodepng/lodepng_wrapper.c | 2 +- drivers/ota/ota.c | 2 +- drivers/tidal_helpers/tidal_helpers.c | 2 +- drivers/tidal_usb/tidal_usb.c | 2 +- micropython | 2 +- micropython.diff | 5 +++-- st7789 | 2 +- tildamk6/manifest.py | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/lodepng/lodepng_wrapper.c b/drivers/lodepng/lodepng_wrapper.c index ac06d90..6415887 100644 --- a/drivers/lodepng/lodepng_wrapper.c +++ b/drivers/lodepng/lodepng_wrapper.c @@ -94,4 +94,4 @@ const mp_obj_module_t lodepng_user_module = { .globals = (mp_obj_dict_t *)&lodepng_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_lodepng, lodepng_user_module, 1); +MP_REGISTER_MODULE(MP_QSTR_lodepng, lodepng_user_module); diff --git a/drivers/ota/ota.c b/drivers/ota/ota.c index 34e3313..4c2be20 100644 --- a/drivers/ota/ota.c +++ b/drivers/ota/ota.c @@ -110,4 +110,4 @@ const mp_obj_module_t ota_user_cmodule = { .globals = (mp_obj_dict_t *)&ota_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_ota, ota_user_cmodule, 1); +MP_REGISTER_MODULE(MP_QSTR_ota, ota_user_cmodule); diff --git a/drivers/tidal_helpers/tidal_helpers.c b/drivers/tidal_helpers/tidal_helpers.c index a45807b..83716e1 100644 --- a/drivers/tidal_helpers/tidal_helpers.c +++ b/drivers/tidal_helpers/tidal_helpers.c @@ -423,4 +423,4 @@ const mp_obj_module_t tidal_helpers_user_module = { .globals = (mp_obj_dict_t *)&tidal_helpers_module_globals, }; -MP_REGISTER_MODULE(MP_QSTR_tidal_helpers, tidal_helpers_user_module, 1); +MP_REGISTER_MODULE(MP_QSTR_tidal_helpers, tidal_helpers_user_module); diff --git a/drivers/tidal_usb/tidal_usb.c b/drivers/tidal_usb/tidal_usb.c index 33a4099..6c5a0ed 100644 --- a/drivers/tidal_usb/tidal_usb.c +++ b/drivers/tidal_usb/tidal_usb.c @@ -44,4 +44,4 @@ const mp_obj_module_t tidal_usb_module = { }; // Regisiter as a top-level module -MP_REGISTER_MODULE(MP_QSTR__tidal_usb, tidal_usb_module, 1); \ No newline at end of file +MP_REGISTER_MODULE(MP_QSTR__tidal_usb, tidal_usb_module); diff --git a/micropython b/micropython index afceb56..b1efc13 160000 --- a/micropython +++ b/micropython @@ -1 +1 @@ -Subproject commit afceb56ee2fe7c1741c6437b5d0d3fb7dbb54340 +Subproject commit b1efc1340af122499e5cf1d7214d51e034d45a20 diff --git a/micropython.diff b/micropython.diff index 1c42864..c973e27 100644 --- a/micropython.diff +++ b/micropython.diff @@ -17,7 +17,7 @@ diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c index 41e6e6ec0..761e93c01 100644 --- a/ports/esp32/mphalport.c +++ b/ports/esp32/mphalport.c -@@ -107,13 +107,8 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) { +@@ -107,14 +107,8 @@ void mp_hal_stdout_tx_strn(const char *str, size_t len) { if (release_gil) { MP_THREAD_GIL_EXIT(); } @@ -25,7 +25,8 @@ index 41e6e6ec0..761e93c01 100644 usb_tx_strn(str, len); - #elif CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG - usb_serial_jtag_tx_strn(str, len); -- #else +- #endif +- #if MICROPY_HW_ENABLE_UART_REPL uart_stdout_tx_strn(str, len); - #endif if (release_gil) { diff --git a/st7789 b/st7789 index 93c60b2..0fc81fd 160000 --- a/st7789 +++ b/st7789 @@ -1 +1 @@ -Subproject commit 93c60b264337f96ddbf9b8788f30c07c43ebc90a +Subproject commit 0fc81fd9e8fe65e3f5c4567fc85d54c5dbb84923 diff --git a/tildamk6/manifest.py b/tildamk6/manifest.py index 3b16a45..491e75e 100644 --- a/tildamk6/manifest.py +++ b/tildamk6/manifest.py @@ -27,7 +27,7 @@ def freeze_images(path, generated_dir): freeze("$(PORT_DIR)/modules") freeze("$(MPY_DIR)/tools", ("upip.py", "upip_utarfile.py")) -freeze("$(MPY_DIR)/ports/esp8266/modules", "ntptime.py") +freeze("$(MPY_DIR)/extmod", "ntptime.py") freeze("$(MPY_DIR)/drivers/dht", "dht.py") freeze("$(MPY_DIR)/drivers/onewire") freeze("$(MPY_DIR)/../modules") From 3dd3bd920708c686b64af007d09a95f298077af4 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Wed, 27 Jul 2022 15:19:39 +0100 Subject: [PATCH 2/2] Add tidal 3D helpers module This module contains fast, native implementations of maths functions commonly used in 3D rendering. These are about an order of magnitude faster than the same functions written in pure python. --- .gitmodules | 3 +++ drivers/micropython.cmake | 2 ++ tidal3d | 1 + 3 files changed, 6 insertions(+) create mode 160000 tidal3d diff --git a/.gitmodules b/.gitmodules index 4b8162e..ac526a7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "lodepng"] path = lodepng url = https://github.com/lvandeve/lodepng +[submodule "tidal3d"] + path = tidal3d + url = git@github.com:mbooth101/tidal3d.git diff --git a/drivers/micropython.cmake b/drivers/micropython.cmake index 8158dc2..664b567 100644 --- a/drivers/micropython.cmake +++ b/drivers/micropython.cmake @@ -22,3 +22,5 @@ include(${CMAKE_CURRENT_LIST_DIR}/ota/micropython.cmake) include(${CMAKE_CURRENT_LIST_DIR}/tidal_helpers/micropython.cmake) include(${CMAKE_CURRENT_LIST_DIR}/lodepng/micropython.cmake) + +include(${CMAKE_CURRENT_LIST_DIR}/../tidal3d/module/micropython.cmake) diff --git a/tidal3d b/tidal3d new file mode 160000 index 0000000..4e0b88d --- /dev/null +++ b/tidal3d @@ -0,0 +1 @@ +Subproject commit 4e0b88dc4a3528eb32ecea67f9221496a17c816f