diff options
-rw-r--r-- | apps/plugins/rockboy/menu.c | 24 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockboy.c | 6 |
2 files changed, 21 insertions, 9 deletions
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index ec72d5e4e9..ab27f3dece 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c | |||
@@ -4,6 +4,7 @@ | |||
4 | /* Note: this file only exposes one function: do_user_menu(). */ | 4 | /* Note: this file only exposes one function: do_user_menu(). */ |
5 | /*********************************************************************/ | 5 | /*********************************************************************/ |
6 | 6 | ||
7 | #include "lib/helper.h" | ||
7 | #include "button.h" | 8 | #include "button.h" |
8 | #include "rockmacros.h" | 9 | #include "rockmacros.h" |
9 | #include "mem.h" | 10 | #include "mem.h" |
@@ -46,18 +47,18 @@ static int getbutton(char *text) | |||
46 | 47 | ||
47 | static void setupkeys(void) | 48 | static void setupkeys(void) |
48 | { | 49 | { |
49 | options.UP=getbutton ("Press Up"); | 50 | options.UP = getbutton("Press Up"); |
50 | options.DOWN=getbutton ("Press Down"); | 51 | options.DOWN = getbutton("Press Down"); |
51 | options.LEFT=getbutton ("Press Left"); | 52 | options.LEFT = getbutton("Press Left"); |
52 | options.RIGHT=getbutton ("Press Right"); | 53 | options.RIGHT = getbutton("Press Right"); |
53 | 54 | ||
54 | options.A=getbutton ("Press A"); | 55 | options.A = getbutton("Press A"); |
55 | options.B=getbutton ("Press B"); | 56 | options.B = getbutton("Press B"); |
56 | 57 | ||
57 | options.START=getbutton ("Press Start"); | 58 | options.START = getbutton("Press Start"); |
58 | options.SELECT=getbutton("Press Select"); | 59 | options.SELECT = getbutton("Press Select"); |
59 | 60 | ||
60 | options.MENU=getbutton ("Press Menu"); | 61 | options.MENU = getbutton("Press Menu"); |
61 | } | 62 | } |
62 | 63 | ||
63 | /* | 64 | /* |
@@ -80,6 +81,8 @@ int do_user_menu(void) { | |||
80 | rb->lcd_set_mode(LCD_MODE_RGB565); | 81 | rb->lcd_set_mode(LCD_MODE_RGB565); |
81 | #endif | 82 | #endif |
82 | 83 | ||
84 | backlight_use_settings(); | ||
85 | |||
83 | /* Clean out the button Queue */ | 86 | /* Clean out the button Queue */ |
84 | while (rb->button_get(false) != BUTTON_NONE) | 87 | while (rb->button_get(false) != BUTTON_NONE) |
85 | rb->yield(); | 88 | rb->yield(); |
@@ -128,6 +131,9 @@ int do_user_menu(void) { | |||
128 | rb->lcd_set_mode(LCD_MODE_PAL256); | 131 | rb->lcd_set_mode(LCD_MODE_PAL256); |
129 | #endif | 132 | #endif |
130 | 133 | ||
134 | /* ignore backlight time out */ | ||
135 | backlight_force_on(); | ||
136 | |||
131 | return ret; | 137 | return ret; |
132 | } | 138 | } |
133 | 139 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 19d346be33..0364f47faa 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -19,6 +19,7 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | #include "plugin.h" | 21 | #include "plugin.h" |
22 | #include "lib/helper.h" | ||
22 | #include "loader.h" | 23 | #include "loader.h" |
23 | #include "rockmacros.h" | 24 | #include "rockmacros.h" |
24 | #include "input.h" | 25 | #include "input.h" |
@@ -426,6 +427,9 @@ enum plugin_status plugin_start(const void* parameter) | |||
426 | rb->lcd_set_mode(LCD_MODE_PAL256); | 427 | rb->lcd_set_mode(LCD_MODE_PAL256); |
427 | #endif | 428 | #endif |
428 | 429 | ||
430 | /* ignore backlight time out */ | ||
431 | backlight_force_on(); | ||
432 | |||
429 | gnuboy_main(parameter); | 433 | gnuboy_main(parameter); |
430 | 434 | ||
431 | #ifdef HAVE_WHEEL_POSITION | 435 | #ifdef HAVE_WHEEL_POSITION |
@@ -436,6 +440,8 @@ enum plugin_status plugin_start(const void* parameter) | |||
436 | rb->lcd_set_mode(LCD_MODE_RGB565); | 440 | rb->lcd_set_mode(LCD_MODE_RGB565); |
437 | #endif | 441 | #endif |
438 | 442 | ||
443 | backlight_use_settings(); | ||
444 | |||
439 | if(shut&&!cleanshut) | 445 | if(shut&&!cleanshut) |
440 | { | 446 | { |
441 | rb->splash(HZ/2, errormsg); | 447 | rb->splash(HZ/2, errormsg); |