Skip to content

Commit 3ea36f6

Browse files
Desktop boot works
1 parent 3598bc3 commit 3ea36f6

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed
File renamed without changes.

internal_filesystem/lib/mpos/main.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
import task_handler
22
import _thread
33
import lvgl as lv
4-
5-
# Allow LVGL M:/path/to/file or M:relative/path/to/file to work for image set_src etc
6-
import mpos.fs_driver
7-
fs_drv = lv.fs_drv_t()
8-
mpos.fs_driver.fs_register(fs_drv, 'M')
9-
104
import mpos.apps
115
import mpos.config
126
import mpos.ui
137
import mpos.ui.topmenu
148
from mpos.ui.display import init_rootscreen
159
from mpos.content.package_manager import PackageManager
1610

11+
# Auto-detect and initialize hardware
12+
import sys
13+
if sys.platform == "linux" or sys.platform == "darwin": # linux and macOS
14+
import mpos.board.linux
15+
elif sys.platform == "esp32":
16+
print("TODO: detect which esp32 this is and then load the appropriate board")
17+
18+
# Allow LVGL M:/path/to/file or M:relative/path/to/file to work for image set_src etc
19+
import mpos.fs_driver
20+
fs_drv = lv.fs_drv_t()
21+
mpos.fs_driver.fs_register(fs_drv, 'M')
22+
1723
prefs = mpos.config.SharedPreferences("com.micropythonos.settings")
1824

1925
mpos.ui.set_theme(prefs)

scripts/run_desktop.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pushd internal_filesystem/
6363
echo "Running app from $scriptdir"
6464
"$binary" -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py) ; import mpos.apps; mpos.apps.start_app('$scriptdir')"
6565
else
66-
"$binary" -X heapsize=$HEAPSIZE -v -i -c "$(cat boot_unix.py main.py)"
66+
"$binary" -X heapsize=$HEAPSIZE -v -i -c "import sys ; sys.path.append('lib/') ; import mpos.main"
6767
fi
6868

6969

0 commit comments

Comments
 (0)