Skip to content

Commit b23107e

Browse files
Move ResetIntoBootloader activity to Settings app
1 parent 7797468 commit b23107e

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

internal_filesystem/lib/mpos/bootloader.py renamed to internal_filesystem/builtin/apps/com.micropythonos.settings/assets/bootloader.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import lvgl as lv
22

3-
from .app.activity import Activity
3+
from mpos import Activity
44

55
class ResetIntoBootloader(Activity):
66

internal_filesystem/builtin/apps/com.micropythonos.settings/assets/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from mpos import Intent, AppManager, SettingActivity, SettingsActivity, TimeZone
44

5+
from bootloader import ResetIntoBootloader
56
from calibrate_imu import CalibrateIMUActivity
67
from check_imu_calibration import CheckIMUCalibrationActivity
78

@@ -59,7 +60,6 @@ def getIntent(self):
5960
def reset_into_bootloader(self, new_value):
6061
if new_value is not "bootloader":
6162
return
62-
from mpos.bootloader import ResetIntoBootloader
6363
intent = Intent(activity_class=ResetIntoBootloader)
6464
self.startActivity(intent)
6565

internal_filesystem/lib/mpos/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
from .ui import focus_direction
5151

5252
# Utility modules
53-
from . import bootloader
5453
from . import ui
5554
from . import config
5655
from . import net
@@ -95,7 +94,7 @@
9594
"get_all_widgets_with_text",
9695
# Submodules
9796
"ui", "config", "net", "content", "time", "sensor_manager",
98-
"camera_manager", "sdcard", "audio", "hardware", "bootloader",
97+
"camera_manager", "sdcard", "audio", "hardware",
9998
# Timezone utilities
10099
"TimeZone"
101100
]

0 commit comments

Comments
 (0)