From 3ea36f6bd8e77f2a2a0237fa500b61780ac824f0 Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Sat, 22 Nov 2025 08:24:28 +0100 Subject: [PATCH] Desktop boot works --- .../lib/mpos/board/{boot_unix.py => linux.py} | 0 internal_filesystem/lib/mpos/main.py | 18 ++++++++++++------ scripts/run_desktop.sh | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) rename internal_filesystem/lib/mpos/board/{boot_unix.py => linux.py} (100%) diff --git a/internal_filesystem/lib/mpos/board/boot_unix.py b/internal_filesystem/lib/mpos/board/linux.py similarity index 100% rename from internal_filesystem/lib/mpos/board/boot_unix.py rename to internal_filesystem/lib/mpos/board/linux.py diff --git a/internal_filesystem/lib/mpos/main.py b/internal_filesystem/lib/mpos/main.py index f3b38df7..6ddc3611 100644 --- a/internal_filesystem/lib/mpos/main.py +++ b/internal_filesystem/lib/mpos/main.py @@ -1,12 +1,6 @@ import task_handler import _thread import lvgl as lv - -# Allow LVGL M:/path/to/file or M:relative/path/to/file to work for image set_src etc -import mpos.fs_driver -fs_drv = lv.fs_drv_t() -mpos.fs_driver.fs_register(fs_drv, 'M') - import mpos.apps import mpos.config import mpos.ui @@ -14,6 +8,18 @@ import mpos.ui.topmenu from mpos.ui.display import init_rootscreen from mpos.content.package_manager import PackageManager +# Auto-detect and initialize hardware +import sys +if sys.platform == "linux" or sys.platform == "darwin": # linux and macOS + import mpos.board.linux +elif sys.platform == "esp32": + print("TODO: detect which esp32 this is and then load the appropriate board") + +# Allow LVGL M:/path/to/file or M:relative/path/to/file to work for image set_src etc +import mpos.fs_driver +fs_drv = lv.fs_drv_t() +mpos.fs_driver.fs_register(fs_drv, 'M') + prefs = mpos.config.SharedPreferences("com.micropythonos.settings") mpos.ui.set_theme(prefs) diff --git a/scripts/run_desktop.sh b/scripts/run_desktop.sh index 1f229ac6..2ec26a8c 100755 --- a/scripts/run_desktop.sh +++ b/scripts/run_desktop.sh @@ -63,7 +63,7 @@ pushd internal_filesystem/ echo "Running app from $scriptdir" "$binary" -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py) ; import mpos.apps; mpos.apps.start_app('$scriptdir')" else - "$binary" -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py)" + "$binary" -X heapsize=$HEAPSIZE -v -i -c "import sys ; sys.path.append('lib/') ; import mpos.main" fi