diff options
author | Dana Conrad <dconrad@fastmail.com> | 2021-05-16 15:01:26 -0500 |
---|---|---|
committer | Dana Conrad <dconrad@fastmail.com> | 2021-05-27 19:58:09 -0500 |
commit | 8056b7fd1a333fe4d0c7ed8d3de0caf702f89164 (patch) | |
tree | c0b114af2cbfaa2ded440a2fc5c8b2b377613d9a | |
parent | 10d199f9d5bf85136211c0811e29679787343375 (diff) | |
download | rockbox-8056b7fd1a333fe4d0c7ed8d3de0caf702f89164.tar.gz rockbox-8056b7fd1a333fe4d0c7ed8d3de0caf702f89164.zip |
Yes/No Screen: Allow accept to be button release
Allows the ACTION_YESNO_ACCEPT action to be set
to a button release by ignoring certain system events.
Moving USB init in main.c to the last thing to prevent
getting stuck in the USB prompt, if enabled.
Also changing ACTION_YESNO_ACCEPT to button release on erosq
Change-Id: I5e7498521a13cb4e840223dd0b9c8633e99093bc
-rw-r--r-- | apps/gui/yesno.c | 5 | ||||
-rw-r--r-- | apps/keymaps/keymap-erosq.c | 2 | ||||
-rw-r--r-- | apps/main.c | 11 |
3 files changed, 13 insertions, 5 deletions
diff --git a/apps/gui/yesno.c b/apps/gui/yesno.c index a50b2f1921..669f8ca09a 100644 --- a/apps/gui/yesno.c +++ b/apps/gui/yesno.c | |||
@@ -201,8 +201,13 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message, | |||
201 | result=YESNO_YES; | 201 | result=YESNO_YES; |
202 | break; | 202 | break; |
203 | case ACTION_NONE: | 203 | case ACTION_NONE: |
204 | case ACTION_UNKNOWN: | ||
204 | case SYS_CHARGER_DISCONNECTED: | 205 | case SYS_CHARGER_DISCONNECTED: |
205 | case SYS_BATTERY_UPDATE: | 206 | case SYS_BATTERY_UPDATE: |
207 | case SYS_TIMEOUT: | ||
208 | #if CONFIG_CHARGING | ||
209 | case SYS_CHARGER_CONNECTED: | ||
210 | #endif | ||
206 | /* ignore some SYS events that can happen */ | 211 | /* ignore some SYS events that can happen */ |
207 | continue; | 212 | continue; |
208 | default: | 213 | default: |
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c index 59b70d24ca..24d040ebec 100644 --- a/apps/keymaps/keymap-erosq.c +++ b/apps/keymaps/keymap-erosq.c | |||
@@ -118,7 +118,7 @@ static const struct button_mapping button_context_tree[] = { | |||
118 | }; /* button_context_tree */ | 118 | }; /* button_context_tree */ |
119 | 119 | ||
120 | static const struct button_mapping button_context_yesno[] = { | 120 | static const struct button_mapping button_context_yesno[] = { |
121 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, | 121 | { ACTION_YESNO_ACCEPT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
122 | 122 | ||
123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
124 | }; /* button_context_settings_yesno */ | 124 | }; /* button_context_settings_yesno */ |
diff --git a/apps/main.c b/apps/main.c index 3c549a8e63..c7b223faea 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -321,10 +321,6 @@ static void init(void) | |||
321 | global_status.font_id[i] = FONT_SYSFIXED; | 321 | global_status.font_id[i] = FONT_SYSFIXED; |
322 | font_init(); | 322 | font_init(); |
323 | show_logo(); | 323 | show_logo(); |
324 | #ifndef USB_NONE | ||
325 | usb_init(); | ||
326 | usb_start_monitoring(); | ||
327 | #endif | ||
328 | button_init(); | 324 | button_init(); |
329 | powermgmt_init(); | 325 | powermgmt_init(); |
330 | backlight_init(); | 326 | backlight_init(); |
@@ -374,6 +370,13 @@ static void init(void) | |||
374 | audio_init(); | 370 | audio_init(); |
375 | talk_announce_voice_invalid(); /* notify user w/ voice prompt if voice file invalid */ | 371 | talk_announce_voice_invalid(); /* notify user w/ voice prompt if voice file invalid */ |
376 | settings_apply_skins(); | 372 | settings_apply_skins(); |
373 | |||
374 | /* do USB last so prompt (if enabled) can work correctly if USB was inserted with device off, | ||
375 | * also doesn't hurt that it will display the nice pretty backdrop this way too. */ | ||
376 | #ifndef USB_NONE | ||
377 | usb_init(); | ||
378 | usb_start_monitoring(); | ||
379 | #endif | ||
377 | } | 380 | } |
378 | 381 | ||
379 | #else /* CONFIG_PLATFORM & PLATFORM_HOSTED */ | 382 | #else /* CONFIG_PLATFORM & PLATFORM_HOSTED */ |