From b23107ee146aafce8cb3bf39aaf5c78ab22dd9ca Mon Sep 17 00:00:00 2001 From: Thomas Farstrike Date: Sun, 25 Jan 2026 23:37:39 +0100 Subject: [PATCH] Move ResetIntoBootloader activity to Settings app --- .../apps/com.micropythonos.settings/assets}/bootloader.py | 2 +- .../builtin/apps/com.micropythonos.settings/assets/settings.py | 2 +- internal_filesystem/lib/mpos/__init__.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename internal_filesystem/{lib/mpos => builtin/apps/com.micropythonos.settings/assets}/bootloader.py (95%) diff --git a/internal_filesystem/lib/mpos/bootloader.py b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/bootloader.py similarity index 95% rename from internal_filesystem/lib/mpos/bootloader.py rename to internal_filesystem/builtin/apps/com.micropythonos.settings/assets/bootloader.py index f84ed819..7910c866 100644 --- a/internal_filesystem/lib/mpos/bootloader.py +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/bootloader.py @@ -1,6 +1,6 @@ import lvgl as lv -from .app.activity import Activity +from mpos import Activity class ResetIntoBootloader(Activity): diff --git a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py index 8559ef54..698e9442 100644 --- a/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py +++ b/internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py @@ -2,6 +2,7 @@ import lvgl as lv from mpos import Intent, AppManager, SettingActivity, SettingsActivity, TimeZone +from bootloader import ResetIntoBootloader from calibrate_imu import CalibrateIMUActivity from check_imu_calibration import CheckIMUCalibrationActivity @@ -59,7 +60,6 @@ class Settings(SettingsActivity): def reset_into_bootloader(self, new_value): if new_value is not "bootloader": return - from mpos.bootloader import ResetIntoBootloader intent = Intent(activity_class=ResetIntoBootloader) self.startActivity(intent) diff --git a/internal_filesystem/lib/mpos/__init__.py b/internal_filesystem/lib/mpos/__init__.py index 694d45ad..49d8516a 100644 --- a/internal_filesystem/lib/mpos/__init__.py +++ b/internal_filesystem/lib/mpos/__init__.py @@ -50,7 +50,6 @@ from .ui.widget_animator import WidgetAnimator from .ui import focus_direction # Utility modules -from . import bootloader from . import ui from . import config from . import net @@ -95,7 +94,7 @@ __all__ = [ "get_all_widgets_with_text", # Submodules "ui", "config", "net", "content", "time", "sensor_manager", - "camera_manager", "sdcard", "audio", "hardware", "bootloader", + "camera_manager", "sdcard", "audio", "hardware", # Timezone utilities "TimeZone" ]