diff --git a/internal_filesystem/lib/mpos/content/package_manager.py b/internal_filesystem/lib/mpos/content/package_manager.py index 51e93935..7efdc2b7 100644 --- a/internal_filesystem/lib/mpos/content/package_manager.py +++ b/internal_filesystem/lib/mpos/content/package_manager.py @@ -99,7 +99,7 @@ class PackageManager: apps_dir = "apps" apps_dir_builtin = "builtin/apps" - for base in (apps_dir, apps_dir_builtin): + for base in (apps_dir, apps_dir_builtin): # added apps override builtin apps try: # ---- does the directory exist? -------------------------------- st = os.stat(base) diff --git a/internal_filesystem/lib/mpos/ui/focus_direction.py b/internal_filesystem/lib/mpos/ui/focus_direction.py index 96490fa7..fcb831e5 100644 --- a/internal_filesystem/lib/mpos/ui/focus_direction.py +++ b/internal_filesystem/lib/mpos/ui/focus_direction.py @@ -198,6 +198,12 @@ def move_focus_direction(angle): if isinstance(current_focused, lv.keyboard): print("focus is on a keyboard, which has its own move_focus_direction: NOT moving") return + if False and isinstance(current_focused, lv.checkbox): # arrow up/down or left/right is the toggle + print("focus is on a checkbox, which has its own move_focus_direction: NOT moving") + return + if False and isinstance(current_focused, lv.slider): # arrows change the slider + print("focus is on a slider, which has its own move_focus_direction: NOT moving") + return if isinstance(current_focused, lv.dropdown) and current_focused.is_open(): print("focus is on an open dropdown, which has its own move_focus_direction: NOT moving") return diff --git a/internal_filesystem/lib/mpos/ui/topmenu.py b/internal_filesystem/lib/mpos/ui/topmenu.py index 7b2ec009..4ad5e196 100644 --- a/internal_filesystem/lib/mpos/ui/topmenu.py +++ b/internal_filesystem/lib/mpos/ui/topmenu.py @@ -334,7 +334,7 @@ def create_drawer(display=None): #wake_pin = machine.Pin(0, machine.Pin.IN, machine.Pin.PULL_UP) # Pull-up enabled, active low #import esp32 #esp32.wake_on_ext0(pin=wake_pin, level=esp32.WAKEUP_ALL_LOW) - print("Entering deep sleep. Press BOOT button to wake up.") + print("Entering deep sleep...") machine.deepsleep() # sleep forever else: # assume unix: lv.deinit() # Deinitialize LVGL (if supported)