NotificationsYou must be signed in to change notification settings
Fork12
Star239

Commit0642c39

committed

Add Restart to Bootloader setting

1 parent0ff2ff2 commit0642c39Copy full SHA for 0642c39

File tree

3 files changed

+16

-32

lines changed

CHANGELOG.md
internal_filesystem/builtin
- apps/com.micropythonos.settings/assets
  - settings.py
- system
  - button.py

3 files changed

+16

-32

lines changed

`‎CHANGELOG.md‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,8 @@`
`2`	`2`	`=====`
`3`	`3`	`- Tweak button size in drawer and add "Settings" button`
`4`	`4`	`- Show "Brightness" text in drawer`
`5`		`-- Add builtin "Settings" app with settings for dark/light theme, theme color`
	`5`	`+- Save and restore "Brightness" setting`
	`6`	`+- Add builtin "Settings" app with settings for Light/Dark Theme, Theme Color, Restart to Bootloader`
`6`	`7`
`7`	`8`	`0.0.5`
`8`	`9`	`=====`

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

Lines changed: 11 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,8 @@`
`1`		`-frommpos.appsimportActivity,Intent`
	`1`	`+frommpos.appsimportActivity,ActivityNavigator,Intent`
	`2`	`+`
`2`	`3`	`importmpos.config`
`3`	`4`	`importmpos.ui`
`4`	`5`
`5`		`-classHello(Activity):`
`6`		`-`
`7`		`-defonCreate(self):`
`8`		`-screen=lv.obj()`
`9`		`-label=lv.label(screen)`
`10`		`-label.set_text('Hello World!')`
`11`		`-label.center()`
`12`		`-self.setContentView(screen)`
`13`		`-`
`14`	`6`
`15`	`7`	`# Used to list and edit all settings:`
`16`	`8`	`classSettingsActivity(Activity):`
`@@ -20,9 +12,10 @@ def __init__(self):`
`20`	`12`	`self.settings= [`
`21`	`13`	`{"title":"Light/Dark Theme","key":"theme_light_dark","value_label":None,"cont":None},`
`22`	`14`	`{"title":"Theme Color","key":"theme_primary_color","value_label":None,"cont":None,"placeholder":"HTML hex color, like: EC048C"},`
	`15`	`+ {"title":"Restart to Bootloader","key":"boot_mode","value_label":None,"cont":None},# special that doesn't get saved`
	`16`	`+# This is currently only in the drawer but would make sense to have it here for completeness:`
`23`	`17`	`#{"title": "Display Brightness", "key": "display_brightness", "value_label": None, "cont": None, "placeholder": "A value from 0 to 100."},`
`24`	`18`	`# Maybe also add font size (but ideally then all fonts should scale up/down)`
`25`		`-#{"title": "Reboot into Bootloader", "key": "boot_mode", "value_label": None, "cont": None}, # special that doesn't get saved`
`26`	`19`	`#{"title": "Timezone", "key": "timezone", "value_label": None, "cont": None, "placeholder": "Example: Europe/Prague"},`
`27`	`20`	`]`
`28`	`21`
`@@ -238,6 +231,13 @@ def cambutton_cb_unused(self, event):`
`238`	`231`	`self.startActivityForResult(Intent(activity_class=CameraApp).putExtra("scanqr_mode",True),self.gotqr_result_callback)`
`239`	`232`
`240`	`233`	`defsave_setting(self,setting):`
	`234`	`+ifsetting["key"]=="boot_mode"andself.radio_container:`
	`235`	`+ifself.active_radio_index==1:`
	`236`	`+frommpos.bootloaderimportResetIntoBootloader`
	`237`	`+intent=Intent(activity_class=ResetIntoBootloader)`
	`238`	`+ActivityNavigator.startActivity(intent)`
	`239`	`+return`
	`240`	`+`
`241`	`241`	`if (setting["key"]=="theme_light_dark"orsetting["key"]=="boot_mode" )andself.radio_container:`
`242`	`242`	`ifsetting["key"]=="boot_mode":`
`243`	`243`	`options= [("Normal","normal"), ("Bootloader","bootloader")]`

`‎internal_filesystem/builtin/system/button.py‎`

Lines changed: 3 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`
`9`	`9`	`frommpos.appsimportActivity,ActivityNavigator,Intent`
`10`	`10`
	`11`	`+frommpos.bootloaderimportResetIntoBootloader`
	`12`	`+`
`11`	`13`	`#import mpos.config`
`12`	`14`	`#import mpos.ui`
`13`	`15`
`@@ -24,26 +26,7 @@`
`24`	`26`	`# Timer for checking long press`
`25`	`27`	`timer=Timer(-1)`
`26`	`28`
`27`		`-message="Bootloader mode activated.\nYou can now install firmware over USB.\n\nReset the device to cancel."`
`28`		`-`
`29`		`-classBootloader(Activity):`
`30`		`-`
`31`		`-defonCreate(self):`
`32`		`-print(message)`
`33`		`-screen=lv.obj()`
`34`		`-label=lv.label(screen)`
`35`		`-label.set_text(message)`
`36`		`-label.center()`
`37`		`-self.setContentView(screen)`
`38`		`-`
`39`		`-defonResume(self,screen):`
`40`		`-# Use a timer, otherwise the UI won't have time to update:`
`41`		`-timer=lv.timer_create(self.start_bootloader,1000,None)# give it some time (at least 500ms) for the new screen animation`
`42`		`-timer.set_repeat_count(1)`
`43`	`29`
`44`		`-defstart_bootloader(self,timer):`
`45`		`-importmachine`
`46`		`-machine.bootloader()`
`47`	`30`
`48`	`31`	`defon_long_press(t):# Callback for when long press duration is reached.`
`49`	`32`	`print("button.py: long press detected")`
`@@ -54,7 +37,7 @@ def on_long_press(t): # Callback for when long press duration is reached.`
`54`	`37`	`#_thread.stack_size(mpos.apps.good_stack_size())`
`55`	`38`	`#_thread.start_new_thread(handle_long_press, ())`
`56`	`39`	`#lv.async_call(lambda l: handle_long_press(), None)`
`57`		`-intent=Intent(activity_class=Bootloader)`
	`40`	`+intent=Intent(activity_class=ResetIntoBootloader)`
`58`	`41`	`ActivityNavigator.startActivity(intent)`
`59`	`42`	`else:`
`60`	`43`	`is_pressed=False`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0642c39

File tree

3 files changed

3 files changed

`‎CHANGELOG.md‎`

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

`‎internal_filesystem/builtin/system/button.py‎`

0 commit comments