Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tidal 3D Firmware #84

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Tidal 3D Firmware #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48cc142
Update micropython to v1.19.1 snapshot
mbooth101 Aug 11, 2022
3dd3bd9
Add tidal 3D helpers module
mbooth101 Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,6 @@
[submodule "lodepng"]
path = lodepng
url = https://github.com/lvandeve/lodepng
[submodule "tidal3d"]
path = tidal3d
url = [email protected]:mbooth101/tidal3d.git
2 changes: 1 addition & 1 deletion drivers/lodepng/lodepng_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 2 additions & 0 deletions drivers/micropython.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion drivers/ota/ota.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/tidal_helpers/tidal_helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion drivers/tidal_usb/tidal_usb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
MP_REGISTER_MODULE(MP_QSTR__tidal_usb, tidal_usb_module);
2 changes: 1 addition & 1 deletion micropython
Open in desktop
Submodule micropython updated 1316 files
5 changes: 3 additions & 2 deletions micropython.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,16 @@ 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();
}
- #if CONFIG_USB_ENABLED
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) {
Expand Down
2 changes: 1 addition & 1 deletion st7789
Open in desktop
Submodule st7789 updated 24 files
+280 −148 README.md
+ − docs/madctl_0.png
+ − docs/madctl_v.png
+ − docs/madctl_vx.png
+ − docs/madctl_vxy.png
+ − docs/madctl_vy.png
+ − docs/madctl_x.png
+ − docs/madctl_xy.png
+ − docs/madctl_y.png
+1 −0 examples/configs/README.md
+31 −0 examples/configs/t-picoc3/tft_config.py
+ − firmware/GENERIC-7789/firmware.bin
+ − firmware/GENERIC_C3/firmware.bin
+ − firmware/GENERIC_SPIRAM-7789/firmware.bin
+ − firmware/LOLIN_S2_MINI/firmware.bin
+ − firmware/PYBV11/firmware.dfu
+ − firmware/RP2/firmware.uf2
+ − firmware/RP2W/firmware.uf2
+ − firmware/T-DISPLAY-ESP32/firmware.bin
+ − firmware/T-DISPLAY-RP2040/firmware.uf2
+ − firmware/TWATCH-2020/firmware.bin
+0 −5 st7789/micropython.cmake
+6 −2 st7789/st7789.c
+23 −14 utils/font2bitmap.py
1 change: 1 addition & 0 deletions tidal3d
Open in desktop
Submodule tidal3d added at 4e0b88
2 changes: 1 addition & 1 deletion tildamk6/manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down