summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/brickmania.c4
-rw-r--r--apps/plugins/chopper.c4
-rw-r--r--apps/plugins/credits.c4
-rw-r--r--apps/plugins/demystify.c4
-rw-r--r--apps/plugins/doom/rockdoom.c2
-rw-r--r--apps/plugins/fft/fft.c2
-rw-r--r--apps/plugins/fire.c4
-rw-r--r--apps/plugins/fireworks.c4
-rw-r--r--apps/plugins/greyscale.c4
-rw-r--r--apps/plugins/imageviewer/imageviewer.c4
-rw-r--r--apps/plugins/invadrox.c4
-rw-r--r--apps/plugins/lib/helper.c26
-rw-r--r--apps/plugins/lib/helper.h3
-rw-r--r--apps/plugins/lrcplayer.c6
-rw-r--r--apps/plugins/maze.c4
-rw-r--r--apps/plugins/mazezam.c4
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c3
-rw-r--r--apps/plugins/oscilloscope.c4
-rw-r--r--apps/plugins/pdbox/pdbox.c2
-rw-r--r--apps/plugins/pictureflow/pictureflow.c4
-rw-r--r--apps/plugins/pitch_detector.c4
-rw-r--r--apps/plugins/plasma.c4
-rw-r--r--apps/plugins/pong.c2
-rw-r--r--apps/plugins/resistor.c6
-rw-r--r--apps/plugins/rockblox.c8
-rw-r--r--apps/plugins/rockboy/menu.c2
-rw-r--r--apps/plugins/rockboy/rockboy.c2
-rw-r--r--apps/plugins/rocklife.c4
-rw-r--r--apps/plugins/spacerocks.c4
-rw-r--r--apps/plugins/starfield.c4
-rw-r--r--apps/plugins/test_disk.c4
-rw-r--r--apps/plugins/test_fps.c4
-rw-r--r--apps/plugins/test_gfx.c2
-rw-r--r--apps/plugins/test_grey.c4
-rw-r--r--apps/plugins/video.c4
-rw-r--r--apps/plugins/wormlet.c4
-rw-r--r--apps/plugins/xobox.c4
37 files changed, 94 insertions, 68 deletions
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c
index 79ebfefbd4..6295862eac 100644
--- a/apps/plugins/brickmania.c
+++ b/apps/plugins/brickmania.c
@@ -2427,7 +2427,7 @@ enum plugin_status plugin_start(const void* parameter)
2427 rb->lcd_set_backdrop(NULL); 2427 rb->lcd_set_backdrop(NULL);
2428#endif 2428#endif
2429 /* Turn off backlight timeout */ 2429 /* Turn off backlight timeout */
2430 backlight_force_on(); /* backlight control in lib/helper.c */ 2430 backlight_ignore_timeout();
2431 2431
2432 /* now go ahead and have fun! */ 2432 /* now go ahead and have fun! */
2433 rb->srand( *rb->current_tick ); 2433 rb->srand( *rb->current_tick );
@@ -2458,7 +2458,7 @@ enum plugin_status plugin_start(const void* parameter)
2458 /* Restore user's original backlight setting */ 2458 /* Restore user's original backlight setting */
2459 rb->lcd_setfont(FONT_UI); 2459 rb->lcd_setfont(FONT_UI);
2460 /* Turn on backlight timeout (revert to settings) */ 2460 /* Turn on backlight timeout (revert to settings) */
2461 backlight_use_settings(); /* backlight control in lib/helper.c */ 2461 backlight_use_settings();
2462 2462
2463 return PLUGIN_OK; 2463 return PLUGIN_OK;
2464} 2464}
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c
index fce7232d23..5f9fadf205 100644
--- a/apps/plugins/chopper.c
+++ b/apps/plugins/chopper.c
@@ -1050,7 +1050,7 @@ enum plugin_status plugin_start(const void* parameter)
1050#endif 1050#endif
1051 1051
1052 /* Turn off backlight timeout */ 1052 /* Turn off backlight timeout */
1053 backlight_force_on(); /* backlight control in lib/helper.c */ 1053 backlight_ignore_timeout();
1054 1054
1055 rb->srand( *rb->current_tick ); 1055 rb->srand( *rb->current_tick );
1056 1056
@@ -1063,7 +1063,7 @@ enum plugin_status plugin_start(const void* parameter)
1063 1063
1064 rb->lcd_setfont(FONT_UI); 1064 rb->lcd_setfont(FONT_UI);
1065 /* Turn on backlight timeout (revert to settings) */ 1065 /* Turn on backlight timeout (revert to settings) */
1066 backlight_use_settings(); /* backlight control in lib/helper.c */ 1066 backlight_use_settings();
1067 1067
1068 return ret; 1068 return ret;
1069} 1069}
diff --git a/apps/plugins/credits.c b/apps/plugins/credits.c
index 8f86c7626b..d766d45cfd 100644
--- a/apps/plugins/credits.c
+++ b/apps/plugins/credits.c
@@ -372,7 +372,7 @@ enum plugin_status plugin_start(const void* parameter)
372 (void)parameter; 372 (void)parameter;
373 373
374 /* Turn off backlight timeout */ 374 /* Turn off backlight timeout */
375 backlight_force_on(); /* backlight control in lib/helper.c */ 375 backlight_ignore_timeout();
376 376
377 rb->show_logo(); 377 rb->show_logo();
378#ifdef HAVE_LCD_CHARCELLS 378#ifdef HAVE_LCD_CHARCELLS
@@ -384,7 +384,7 @@ enum plugin_status plugin_start(const void* parameter)
384 roll_credits(); 384 roll_credits();
385 385
386 /* Turn on backlight timeout (revert to settings) */ 386 /* Turn on backlight timeout (revert to settings) */
387 backlight_use_settings(); /* backlight control in lib/helper.c */ 387 backlight_use_settings();
388 388
389 return PLUGIN_OK; 389 return PLUGIN_OK;
390} 390}
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c
index 6b923a6ed0..e8d4d350d6 100644
--- a/apps/plugins/demystify.c
+++ b/apps/plugins/demystify.c
@@ -436,9 +436,9 @@ enum plugin_status plugin_start(const void* parameter)
436#if LCD_DEPTH > 1 436#if LCD_DEPTH > 1
437 rb->lcd_set_backdrop(NULL); 437 rb->lcd_set_backdrop(NULL);
438#endif 438#endif
439 backlight_force_on(); /* backlight control in lib/helper.c */ 439 backlight_ignore_timeout();
440#ifdef HAVE_REMOTE_LCD 440#ifdef HAVE_REMOTE_LCD
441 remote_backlight_force_on(); /* remote backlight control in lib/helper.c */ 441 remote_backlight_ignore_timeout();
442#endif 442#endif
443 ret = plugin_main(); 443 ret = plugin_main();
444 444
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c
index 4267a613c7..6ce0e6d38d 100644
--- a/apps/plugins/doom/rockdoom.c
+++ b/apps/plugins/doom/rockdoom.c
@@ -723,7 +723,7 @@ enum plugin_status plugin_start(const void* parameter)
723 systemvol= rb->global_settings->volume-rb->global_settings->volume%mod; 723 systemvol= rb->global_settings->volume-rb->global_settings->volume%mod;
724 general_translucency = default_translucency; // phares 724 general_translucency = default_translucency; // phares
725 725
726 backlight_force_on(); 726 backlight_ignore_timeout();
727#ifdef RB_PROFILE 727#ifdef RB_PROFILE
728 rb->profile_thread(); 728 rb->profile_thread();
729#endif 729#endif
diff --git a/apps/plugins/fft/fft.c b/apps/plugins/fft/fft.c
index 3da3b455f7..2f3b12289d 100644
--- a/apps/plugins/fft/fft.c
+++ b/apps/plugins/fft/fft.c
@@ -1352,7 +1352,7 @@ enum plugin_status plugin_start(const void* parameter)
1352 mylcd_clear_display(); 1352 mylcd_clear_display();
1353 mylcd_update(); 1353 mylcd_update();
1354#endif 1354#endif
1355 backlight_force_on(); 1355 backlight_ignore_timeout();
1356 1356
1357#ifdef HAVE_ADJUSTABLE_CPU_FREQ 1357#ifdef HAVE_ADJUSTABLE_CPU_FREQ
1358 rb->cpu_boost(true); 1358 rb->cpu_boost(true);
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c
index b03f68b670..797f4f120b 100644
--- a/apps/plugins/fire.c
+++ b/apps/plugins/fire.c
@@ -278,7 +278,7 @@ void cleanup(void *parameter)
278 grey_release(); 278 grey_release();
279#endif 279#endif
280 /* Turn on backlight timeout (revert to settings) */ 280 /* Turn on backlight timeout (revert to settings) */
281 backlight_use_settings(); /* backlight control in lib/helper.c */ 281 backlight_use_settings();
282} 282}
283 283
284 284
@@ -367,7 +367,7 @@ enum plugin_status plugin_start(const void* parameter)
367 rb->lcd_set_backdrop(NULL); 367 rb->lcd_set_backdrop(NULL);
368#endif 368#endif
369 /* Turn off backlight timeout */ 369 /* Turn off backlight timeout */
370 backlight_force_on(); /* backlight control in lib/helper.c */ 370 backlight_ignore_timeout();
371 371
372#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) 372#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256)
373 rb->lcd_set_mode(LCD_MODE_PAL256); 373 rb->lcd_set_mode(LCD_MODE_PAL256);
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c
index efb49db4f9..7b0c5228b5 100644
--- a/apps/plugins/fireworks.c
+++ b/apps/plugins/fireworks.c
@@ -460,7 +460,7 @@ enum plugin_status plugin_start(const void* parameter)
460 460
461 /* set everything up.. no BL timeout, no backdrop, 461 /* set everything up.. no BL timeout, no backdrop,
462 white-text-on-black-background. */ 462 white-text-on-black-background. */
463 backlight_force_on(); /* backlight control in lib/helper.c */ 463 backlight_ignore_timeout();
464#if LCD_DEPTH > 1 464#if LCD_DEPTH > 1
465 rb->lcd_set_backdrop(NULL); 465 rb->lcd_set_backdrop(NULL);
466 rb->lcd_set_background(LCD_BLACK); 466 rb->lcd_set_background(LCD_BLACK);
@@ -619,7 +619,7 @@ enum plugin_status plugin_start(const void* parameter)
619 } 619 }
620 } 620 }
621 /* Turn on backlight timeout (revert to settings) */ 621 /* Turn on backlight timeout (revert to settings) */
622 backlight_use_settings(); /* backlight control in lib/helper.c */ 622 backlight_use_settings();
623 623
624#ifdef HAVE_ADJUSTABLE_CPU_FREQ 624#ifdef HAVE_ADJUSTABLE_CPU_FREQ
625 rb->cpu_boost(false); 625 rb->cpu_boost(false);
diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c
index 00699715f7..42ebbef73b 100644
--- a/apps/plugins/greyscale.c
+++ b/apps/plugins/greyscale.c
@@ -131,7 +131,7 @@ void cleanup(void *parameter)
131 131
132 grey_release(); /* switch off overlay and deinitialize */ 132 grey_release(); /* switch off overlay and deinitialize */
133 /* Turn on backlight timeout (revert to settings) */ 133 /* Turn on backlight timeout (revert to settings) */
134 backlight_use_settings(); /* backlight control in lib/helper.c */ 134 backlight_use_settings();
135} 135}
136 136
137/* this is only a demo of what the framework can do */ 137/* this is only a demo of what the framework can do */
@@ -216,7 +216,7 @@ int main(void)
216 }; 216 };
217 217
218 /* Turn off backlight timeout */ 218 /* Turn off backlight timeout */
219 backlight_force_on(); /* backlight control in lib/helper.c */ 219 backlight_ignore_timeout();
220 220
221 rb->lcd_setfont(FONT_SYSFIXED); /* select default font */ 221 rb->lcd_setfont(FONT_SYSFIXED); /* select default font */
222 222
diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index 6cc2192cb9..0635a877d4 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -965,7 +965,7 @@ enum plugin_status plugin_start(const void* parameter)
965 rb->memcpy(&old_settings, &settings, sizeof (settings)); 965 rb->memcpy(&old_settings, &settings, sizeof (settings));
966 966
967 /* Turn off backlight timeout */ 967 /* Turn off backlight timeout */
968 backlight_force_on(); /* backlight control in lib/helper.c */ 968 backlight_ignore_timeout();
969 969
970#if LCD_DEPTH > 1 970#if LCD_DEPTH > 1
971 rb->lcd_set_backdrop(NULL); 971 rb->lcd_set_backdrop(NULL);
@@ -993,7 +993,7 @@ enum plugin_status plugin_start(const void* parameter)
993#endif 993#endif
994 994
995 /* Turn on backlight timeout (revert to settings) */ 995 /* Turn on backlight timeout (revert to settings) */
996 backlight_use_settings(); /* backlight control in lib/helper.c */ 996 backlight_use_settings();
997 997
998#ifdef USEGSLIB 998#ifdef USEGSLIB
999 grey_release(); /* deinitialize */ 999 grey_release(); /* deinitialize */
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index efabf81379..6b64fa741c 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -1818,7 +1818,7 @@ enum plugin_status plugin_start(UNUSED const void* parameter)
1818{ 1818{
1819 rb->lcd_setfont(FONT_SYSFIXED); 1819 rb->lcd_setfont(FONT_SYSFIXED);
1820 /* Turn off backlight timeout */ 1820 /* Turn off backlight timeout */
1821 backlight_force_on(); /* backlight control in lib/helper.c */ 1821 backlight_ignore_timeout();
1822 1822
1823 /* now go ahead and have fun! */ 1823 /* now go ahead and have fun! */
1824 game_loop(); 1824 game_loop();
@@ -1835,7 +1835,7 @@ enum plugin_status plugin_start(UNUSED const void* parameter)
1835 /* Restore user's original backlight setting */ 1835 /* Restore user's original backlight setting */
1836 rb->lcd_setfont(FONT_UI); 1836 rb->lcd_setfont(FONT_UI);
1837 /* Turn on backlight timeout (revert to settings) */ 1837 /* Turn on backlight timeout (revert to settings) */
1838 backlight_use_settings(); /* backlight control in lib/helper.c */ 1838 backlight_use_settings();
1839 1839
1840 return PLUGIN_OK; 1840 return PLUGIN_OK;
1841} 1841}
diff --git a/apps/plugins/lib/helper.c b/apps/plugins/lib/helper.c
index ce84915e02..780d636f41 100644
--- a/apps/plugins/lib/helper.c
+++ b/apps/plugins/lib/helper.c
@@ -36,9 +36,18 @@ const unsigned bit_n_table[32] = {
36}; 36};
37#endif 37#endif
38 38
39/* Force the backlight on */ 39/* Force the backlight on */
40void backlight_force_on(void) 40void backlight_force_on(void)
41{ 41{
42 rb->backlight_set_timeout(0);
43#if CONFIG_CHARGING
44 rb->backlight_set_timeout_plugged(0);
45#endif /* CONFIG_CHARGING */
46}
47
48/* Turn off backlight timeout */
49void backlight_ignore_timeout(void)
50{
42 if (rb->global_settings->backlight_timeout > 0) 51 if (rb->global_settings->backlight_timeout > 0)
43 rb->backlight_set_timeout(0); 52 rb->backlight_set_timeout(0);
44#if CONFIG_CHARGING 53#if CONFIG_CHARGING
@@ -61,6 +70,15 @@ void backlight_use_settings(void)
61/* Force the backlight on */ 70/* Force the backlight on */
62void remote_backlight_force_on(void) 71void remote_backlight_force_on(void)
63{ 72{
73 rb->remote_backlight_set_timeout(0);
74#if CONFIG_CHARGING
75 rb->remote_backlight_set_timeout_plugged(0);
76#endif /* CONFIG_CHARGING */
77}
78
79/* Turn off backlight timeout */
80void remote_backlight_ignore_timeout(void)
81{
64 if (rb->global_settings->remote_backlight_timeout > 0) 82 if (rb->global_settings->remote_backlight_timeout > 0)
65 rb->remote_backlight_set_timeout(0); 83 rb->remote_backlight_set_timeout(0);
66#if CONFIG_CHARGING 84#if CONFIG_CHARGING
@@ -85,6 +103,12 @@ void remote_backlight_use_settings(void)
85/* Force the buttonlight on */ 103/* Force the buttonlight on */
86void buttonlight_force_on(void) 104void buttonlight_force_on(void)
87{ 105{
106 rb->buttonlight_set_timeout(0);
107}
108
109/* Turn off backlight timeout */
110void buttonlight_ignore_timeout(void)
111{
88 if (rb->global_settings->buttonlight_timeout > 0) 112 if (rb->global_settings->buttonlight_timeout > 0)
89 rb->buttonlight_set_timeout(0); 113 rb->buttonlight_set_timeout(0);
90} 114}
diff --git a/apps/plugins/lib/helper.h b/apps/plugins/lib/helper.h
index 26baf0f6cd..20f5ee285b 100644
--- a/apps/plugins/lib/helper.h
+++ b/apps/plugins/lib/helper.h
@@ -27,14 +27,17 @@
27 * Backlight on/off operations 27 * Backlight on/off operations
28 */ 28 */
29void backlight_force_on(void); 29void backlight_force_on(void);
30void backlight_ignore_timeout(void);
30void backlight_use_settings(void); 31void backlight_use_settings(void);
31#ifdef HAVE_REMOTE_LCD 32#ifdef HAVE_REMOTE_LCD
32void remote_backlight_force_on(void); 33void remote_backlight_force_on(void);
34void remote_backlight_ignore_timeout(void);
33void remote_backlight_use_settings(void); 35void remote_backlight_use_settings(void);
34#endif 36#endif
35 37
36#ifdef HAVE_BUTTON_LIGHT 38#ifdef HAVE_BUTTON_LIGHT
37void buttonlight_force_on(void); 39void buttonlight_force_on(void);
40void buttonlight_ignore_timeout(void);
38void buttonlight_use_settings(void); 41void buttonlight_use_settings(void);
39#endif 42#endif
40 43
diff --git a/apps/plugins/lrcplayer.c b/apps/plugins/lrcplayer.c
index c31b607414..8e9878f78b 100644
--- a/apps/plugins/lrcplayer.c
+++ b/apps/plugins/lrcplayer.c
@@ -2320,7 +2320,7 @@ static bool lrc_theme_menu(void)
2320#ifdef HAVE_LCD_COLOR 2320#ifdef HAVE_LCD_COLOR
2321 "Inactive Colour", 2321 "Inactive Colour",
2322#endif 2322#endif
2323 "Backlight Force On"); 2323 "Backlight Always On");
2324 2324
2325 while (!exit && !usb) 2325 while (!exit && !usb)
2326 { 2326 {
@@ -2344,7 +2344,7 @@ static bool lrc_theme_menu(void)
2344 break; 2344 break;
2345#endif 2345#endif
2346 case LRC_MENU_BACKLIGHT: 2346 case LRC_MENU_BACKLIGHT:
2347 usb = rb->set_bool("Backlight Force On", &prefs.backlight_on); 2347 usb = rb->set_bool("Backlight Always On", &prefs.backlight_on);
2348 break; 2348 break;
2349 case MENU_ATTACHED_USB: 2349 case MENU_ATTACHED_USB:
2350 usb = true; 2350 usb = true;
@@ -2797,7 +2797,7 @@ static int lrc_main(void)
2797 } 2797 }
2798 2798
2799 if (prefs.backlight_on) 2799 if (prefs.backlight_on)
2800 backlight_force_on(); 2800 backlight_ignore_timeout();
2801 2801
2802#ifdef HAVE_LCD_BITMAP 2802#ifdef HAVE_LCD_BITMAP
2803 /* in case settings that may affect break position 2803 /* in case settings that may affect break position
diff --git a/apps/plugins/maze.c b/apps/plugins/maze.c
index 231b602911..e84173944b 100644
--- a/apps/plugins/maze.c
+++ b/apps/plugins/maze.c
@@ -497,7 +497,7 @@ enum plugin_status plugin_start(const void* parameter)
497 (void)parameter; 497 (void)parameter;
498 498
499 /* Turn off backlight timeout */ 499 /* Turn off backlight timeout */
500 backlight_force_on(); /* backlight control in lib/helper.c */ 500 backlight_ignore_timeout();
501 501
502 /* Seed the RNG */ 502 /* Seed the RNG */
503 rb->srand(*rb->current_tick); 503 rb->srand(*rb->current_tick);
@@ -585,6 +585,6 @@ enum plugin_status plugin_start(const void* parameter)
585 lastbutton = button; 585 lastbutton = button;
586 } 586 }
587 /* Turn on backlight timeout (revert to settings) */ 587 /* Turn on backlight timeout (revert to settings) */
588 backlight_use_settings(); /* backlight control in lib/helper.c */ 588 backlight_use_settings();
589 return ((quit == 1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED); 589 return ((quit == 1) ? PLUGIN_OK : PLUGIN_USB_CONNECTED);
590} 590}
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c
index bb93825453..759ca6477d 100644
--- a/apps/plugins/mazezam.c
+++ b/apps/plugins/mazezam.c
@@ -256,7 +256,7 @@ static void store_lcd_settings(void)
256******************************************************************************/ 256******************************************************************************/
257static void restore_lcd_settings(void) { 257static void restore_lcd_settings(void) {
258 /* Turn on backlight timeout (revert to settings) */ 258 /* Turn on backlight timeout (revert to settings) */
259 backlight_use_settings(); /* backlight control in lib/helper.c */ 259 backlight_use_settings();
260 260
261 /* Restore the old settings */ 261 /* Restore the old settings */
262#if LCD_DEPTH > 1 262#if LCD_DEPTH > 1
@@ -271,7 +271,7 @@ static void restore_lcd_settings(void) {
271******************************************************************************/ 271******************************************************************************/
272static void plugin_lcd_settings(void) { 272static void plugin_lcd_settings(void) {
273 /* Turn off backlight timeout */ 273 /* Turn off backlight timeout */
274 backlight_force_on(); /* backlight control in lib/helper.c */ 274 backlight_ignore_timeout();
275 275
276 /* Set the new settings */ 276 /* Set the new settings */
277#ifdef HAVE_LCD_COLOR 277#ifdef HAVE_LCD_COLOR
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index 5ea17f9a3e..97f648621a 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -822,8 +822,7 @@ static void osd_backlight_on_video_mode(bool video_on)
822{ 822{
823 if (video_on) { 823 if (video_on) {
824 /* Turn off backlight timeout */ 824 /* Turn off backlight timeout */
825 /* backlight control in lib/helper.c */ 825 backlight_ignore_timeout();
826 backlight_force_on();
827#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP) 826#if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
828 rb->remove_event(LCD_EVENT_ACTIVATION, osd_lcd_enable_hook); 827 rb->remove_event(LCD_EVENT_ACTIVATION, osd_lcd_enable_hook);
829#endif 828#endif
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index f80b9c014a..c55948dce9 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -780,7 +780,7 @@ void cleanup(void)
780 rb->lcd_set_background(LCD_DEFAULT_BG); 780 rb->lcd_set_background(LCD_DEFAULT_BG);
781#endif 781#endif
782 /* Turn on backlight timeout (revert to settings) */ 782 /* Turn on backlight timeout (revert to settings) */
783 backlight_use_settings(); /* backlight control in lib/helper.c */ 783 backlight_use_settings();
784} 784}
785 785
786enum plugin_status plugin_start(const void* parameter) 786enum plugin_status plugin_start(const void* parameter)
@@ -808,7 +808,7 @@ enum plugin_status plugin_start(const void* parameter)
808#endif 808#endif
809 809
810 /* Turn off backlight timeout */ 810 /* Turn off backlight timeout */
811 backlight_force_on(); /* backlight control in lib/helper.c */ 811 backlight_ignore_timeout();
812 812
813 rb->lcd_getstringsize("A", NULL, &font_height); 813 rb->lcd_getstringsize("A", NULL, &font_height);
814 814
diff --git a/apps/plugins/pdbox/pdbox.c b/apps/plugins/pdbox/pdbox.c
index 3ba6f4e2cb..f21913788b 100644
--- a/apps/plugins/pdbox/pdbox.c
+++ b/apps/plugins/pdbox/pdbox.c
@@ -245,7 +245,7 @@ enum plugin_status plugin_start(const void* parameter)
245 return PLUGIN_ERROR; 245 return PLUGIN_ERROR;
246 246
247 /* Make backlight remain on -- making music requires attention. */ 247 /* Make backlight remain on -- making music requires attention. */
248 backlight_force_on(); 248 backlight_ignore_timeout();
249 249
250 /* Main loop. */ 250 /* Main loop. */
251 while(!quit) 251 while(!quit)
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c
index c2f07b8d70..caae9dc163 100644
--- a/apps/plugins/pictureflow/pictureflow.c
+++ b/apps/plugins/pictureflow/pictureflow.c
@@ -2203,7 +2203,7 @@ void cleanup(void)
2203#endif 2203#endif
2204 end_pf_thread(); 2204 end_pf_thread();
2205 /* Turn on backlight timeout (revert to settings) */ 2205 /* Turn on backlight timeout (revert to settings) */
2206 backlight_use_settings(); /* backlight control in lib/helper.c */ 2206 backlight_use_settings();
2207 2207
2208#ifdef USEGSLIB 2208#ifdef USEGSLIB
2209 grey_release(); 2209 grey_release();
@@ -2666,7 +2666,7 @@ int main(void)
2666 draw_splashscreen(); 2666 draw_splashscreen();
2667 if(backlight_mode == 0) { 2667 if(backlight_mode == 0) {
2668 /* Turn off backlight timeout */ 2668 /* Turn off backlight timeout */
2669 backlight_force_on(); /* backlight control in lib/helper.c */ 2669 backlight_ignore_timeout();
2670 } 2670 }
2671 2671
2672 init_scroll_lines(); 2672 init_scroll_lines();
diff --git a/apps/plugins/pitch_detector.c b/apps/plugins/pitch_detector.c
index fe31b3c768..324a36bce7 100644
--- a/apps/plugins/pitch_detector.c
+++ b/apps/plugins/pitch_detector.c
@@ -547,7 +547,7 @@ static bool main_menu(void)
547 } 547 }
548 } 548 }
549 549
550 backlight_force_on(); 550 backlight_ignore_timeout();
551 return exit_tuner; 551 return exit_tuner;
552} 552}
553 553
@@ -995,7 +995,7 @@ static void record_and_get_pitch(void)
995 audio_tail = 1; 995 audio_tail = 1;
996#endif 996#endif
997 997
998 backlight_force_on(); 998 backlight_ignore_timeout();
999 999
1000 record_data(); 1000 record_data();
1001 1001
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 58d903cb06..52f4204a17 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -139,7 +139,7 @@ void cleanup(void)
139 grey_release(); 139 grey_release();
140#endif 140#endif
141 /* Turn on backlight timeout (revert to settings) */ 141 /* Turn on backlight timeout (revert to settings) */
142 backlight_use_settings(); /* backlight control in lib/helper.c */ 142 backlight_use_settings();
143#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) 143#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256)
144 rb->lcd_set_mode(LCD_MODE_RGB565); 144 rb->lcd_set_mode(LCD_MODE_RGB565);
145#endif 145#endif
@@ -317,7 +317,7 @@ enum plugin_status plugin_start(const void* parameter)
317 rb->lcd_set_backdrop(NULL); 317 rb->lcd_set_backdrop(NULL);
318#endif 318#endif
319 /* Turn off backlight timeout */ 319 /* Turn off backlight timeout */
320 backlight_force_on(); /* backlight control in lib/helper.c */ 320 backlight_ignore_timeout();
321 321
322#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256) 322#if defined(HAVE_LCD_MODES) && (HAVE_LCD_MODES & LCD_MODE_PAL256)
323 rb->lcd_set_mode(LCD_MODE_PAL256); 323 rb->lcd_set_mode(LCD_MODE_PAL256);
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 9394b7a857..bae1703db5 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -659,7 +659,7 @@ enum plugin_status plugin_start(const void* parameter)
659 (void)parameter; 659 (void)parameter;
660 660
661 /* Turn off backlight timeout */ 661 /* Turn off backlight timeout */
662 backlight_force_on(); 662 backlight_ignore_timeout();
663 /* Clear screen */ 663 /* Clear screen */
664 rb->lcd_clear_display(); 664 rb->lcd_clear_display();
665 665
diff --git a/apps/plugins/resistor.c b/apps/plugins/resistor.c
index eb02ce6d8d..1967335469 100644
--- a/apps/plugins/resistor.c
+++ b/apps/plugins/resistor.c
@@ -574,7 +574,7 @@ static void display_helpfile(void)
574 574
575static void led_resistance_calc(void) 575static void led_resistance_calc(void)
576{ 576{
577 backlight_force_on(); 577 backlight_ignore_timeout();
578 int voltage_menu_selection, button_press, j, k, l, foreward_current = 0; 578 int voltage_menu_selection, button_press, j, k, l, foreward_current = 0;
579 int fwd_current_selection = 0; 579 int fwd_current_selection = 0;
580 bool quit = false; 580 bool quit = false;
@@ -779,7 +779,7 @@ static void led_resistance_calc(void)
779 779
780static void resistance_to_color(void) 780static void resistance_to_color(void)
781{ 781{
782 backlight_force_on(); 782 backlight_ignore_timeout();
783 int menu_selection; 783 int menu_selection;
784 int menu_selection_tol; 784 int menu_selection_tol;
785 int button_press; 785 int button_press;
@@ -916,7 +916,7 @@ static void resistance_to_color(void)
916 916
917static void color_to_resistance(void) 917static void color_to_resistance(void)
918{ 918{
919 backlight_force_on(); 919 backlight_ignore_timeout();
920 bool quit = false; 920 bool quit = false;
921 int button_input = 0; 921 int button_input = 0;
922 922
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index 6d5ef8023e..d86cb1c293 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -1345,13 +1345,13 @@ static int rockblox_loop (void)
1345#ifdef HAS_BUTTON_HOLD 1345#ifdef HAS_BUTTON_HOLD
1346 if (rb->button_hold ()) { 1346 if (rb->button_hold ()) {
1347 /* Turn on backlight timeout (revert to settings) */ 1347 /* Turn on backlight timeout (revert to settings) */
1348 backlight_use_settings(); /* backlight control in lib/helper.c */ 1348 backlight_use_settings();
1349 rb->splash(0, "Paused"); 1349 rb->splash(0, "Paused");
1350 while (rb->button_hold ()) 1350 while (rb->button_hold ())
1351 rb->sleep(HZ/10); 1351 rb->sleep(HZ/10);
1352 1352
1353 /* Turn off backlight timeout */ 1353 /* Turn off backlight timeout */
1354 backlight_force_on(); /* backlight control in lib/helper.c */ 1354 backlight_ignore_timeout();
1355 1355
1356 /* get rid of the splash text */ 1356 /* get rid of the splash text */
1357 rb->lcd_bitmap (rockblox_background, 0, 0, LCD_WIDTH, LCD_HEIGHT); 1357 rb->lcd_bitmap (rockblox_background, 0, 0, LCD_WIDTH, LCD_HEIGHT);
@@ -1527,7 +1527,7 @@ enum plugin_status plugin_start (const void *parameter)
1527 } 1527 }
1528#endif 1528#endif
1529 /* Turn off backlight timeout */ 1529 /* Turn off backlight timeout */
1530 backlight_force_on(); /* backlight control in lib/helper.c */ 1530 backlight_ignore_timeout();
1531 load_game(); 1531 load_game();
1532 resume_file = resume; 1532 resume_file = resume;
1533 while(!rockblox_loop()) { 1533 while(!rockblox_loop()) {
@@ -1548,7 +1548,7 @@ enum plugin_status plugin_start (const void *parameter)
1548#endif 1548#endif
1549 /* Save user's HighScore */ 1549 /* Save user's HighScore */
1550 highscore_save(SCORE_FILE, highscores, NUM_SCORES); 1550 highscore_save(SCORE_FILE, highscores, NUM_SCORES);
1551 backlight_use_settings(); /* backlight control in lib/helper.c */ 1551 backlight_use_settings();
1552 1552
1553 return PLUGIN_OK; 1553 return PLUGIN_OK;
1554} 1554}
diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c
index 0156a3fdd2..54a0db76f5 100644
--- a/apps/plugins/rockboy/menu.c
+++ b/apps/plugins/rockboy/menu.c
@@ -139,7 +139,7 @@ int do_user_menu(void) {
139#endif 139#endif
140 140
141 /* ignore backlight time out */ 141 /* ignore backlight time out */
142 backlight_force_on(); 142 backlight_ignore_timeout();
143 143
144 return ret; 144 return ret;
145} 145}
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index b3fccbf8d8..01a706be45 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -450,7 +450,7 @@ enum plugin_status plugin_start(const void* parameter)
450#endif 450#endif
451 451
452 /* ignore backlight time out */ 452 /* ignore backlight time out */
453 backlight_force_on(); 453 backlight_ignore_timeout();
454 454
455 gnuboy_main(parameter); 455 gnuboy_main(parameter);
456 456
diff --git a/apps/plugins/rocklife.c b/apps/plugins/rocklife.c
index 8ae5cdb120..4b00d7e18a 100644
--- a/apps/plugins/rocklife.c
+++ b/apps/plugins/rocklife.c
@@ -473,7 +473,7 @@ enum plugin_status plugin_start(const void* parameter)
473 char *ptemp; 473 char *ptemp;
474 (void)(parameter); 474 (void)(parameter);
475 475
476 backlight_force_on(); /* backlight control in lib/helper.c */ 476 backlight_ignore_timeout();
477#if LCD_DEPTH > 1 477#if LCD_DEPTH > 1
478 rb->lcd_set_backdrop(NULL); 478 rb->lcd_set_backdrop(NULL);
479#ifdef HAVE_LCD_COLOR 479#ifdef HAVE_LCD_COLOR
@@ -577,6 +577,6 @@ enum plugin_status plugin_start(const void* parameter)
577 rb->yield(); 577 rb->yield();
578 } 578 }
579 579
580 backlight_use_settings(); /* backlight control in lib/helper.c */ 580 backlight_use_settings();
581 return usb? PLUGIN_USB_CONNECTED: PLUGIN_OK; 581 return usb? PLUGIN_USB_CONNECTED: PLUGIN_OK;
582} 582}
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 59463b3c97..2e5600bc79 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -2009,7 +2009,7 @@ enum plugin_status plugin_start(const void* parameter)
2009 /* universal font */ 2009 /* universal font */
2010 rb->lcd_setfont(FONT_SYSFIXED); 2010 rb->lcd_setfont(FONT_SYSFIXED);
2011 /* Turn off backlight timeout */ 2011 /* Turn off backlight timeout */
2012 backlight_force_on(); /* backlight control in lib/helper.c */ 2012 backlight_ignore_timeout();
2013 highscore_load(SCORE_FILE, highscores, NUM_SCORES); 2013 highscore_load(SCORE_FILE, highscores, NUM_SCORES);
2014 rb->srand(*rb->current_tick); 2014 rb->srand(*rb->current_tick);
2015 2015
@@ -2022,7 +2022,7 @@ enum plugin_status plugin_start(const void* parameter)
2022 rb->lcd_setfont(FONT_UI); 2022 rb->lcd_setfont(FONT_UI);
2023 highscore_save(SCORE_FILE, highscores, NUM_SCORES); 2023 highscore_save(SCORE_FILE, highscores, NUM_SCORES);
2024 /* Turn on backlight timeout (revert to settings) */ 2024 /* Turn on backlight timeout (revert to settings) */
2025 backlight_use_settings(); /* backlight control in lib/helper.c */ 2025 backlight_use_settings();
2026 2026
2027 return ret; 2027 return ret;
2028} 2028}
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c
index d06998ee2c..9d4be34629 100644
--- a/apps/plugins/starfield.c
+++ b/apps/plugins/starfield.c
@@ -523,12 +523,12 @@ enum plugin_status plugin_start(const void* parameter)
523 523
524 (void)parameter; 524 (void)parameter;
525 /* Turn off backlight timeout */ 525 /* Turn off backlight timeout */
526 backlight_force_on(); /* backlight control in lib/helper.c */ 526 backlight_ignore_timeout();
527 527
528 ret = plugin_main(); 528 ret = plugin_main();
529 529
530 /* Turn on backlight timeout (revert to settings) */ 530 /* Turn on backlight timeout (revert to settings) */
531 backlight_use_settings(); /* backlight control in lib/helper.c*/ 531 backlight_use_settings();
532 532
533 return ret; 533 return ret;
534} 534}
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index dd0758aec9..b211bc774e 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -441,7 +441,7 @@ enum plugin_status plugin_start(const void* parameter)
441 rb->srand(*rb->current_tick); 441 rb->srand(*rb->current_tick);
442 442
443 /* Turn off backlight timeout */ 443 /* Turn off backlight timeout */
444 backlight_force_on(); /* backlight control in lib/helper.c */ 444 backlight_ignore_timeout();
445 445
446 while(!quit) 446 while(!quit)
447 { 447 {
@@ -460,7 +460,7 @@ enum plugin_status plugin_start(const void* parameter)
460 } 460 }
461 461
462 /* Turn on backlight timeout (revert to settings) */ 462 /* Turn on backlight timeout (revert to settings) */
463 backlight_use_settings(); /* backlight control in lib/helper.c */ 463 backlight_use_settings();
464 464
465 rb->rmdir(testbasedir); 465 rb->rmdir(testbasedir);
466 466
diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c
index 295c172524..6851f6739f 100644
--- a/apps/plugins/test_fps.c
+++ b/apps/plugins/test_fps.c
@@ -367,7 +367,7 @@ enum plugin_status plugin_start(const void* parameter)
367#if (CONFIG_PLATFORM & PLATFORM_NATIVE) 367#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
368 cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ 368 cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */
369#endif 369#endif
370 backlight_force_on(); /* backlight control in lib/helper.c */ 370 backlight_ignore_timeout();
371 371
372 time_main_update(); 372 time_main_update();
373 rb->sleep(HZ); 373 rb->sleep(HZ);
@@ -389,7 +389,7 @@ enum plugin_status plugin_start(const void* parameter)
389 (cpu_freq + 500000) / 1000000); 389 (cpu_freq + 500000) / 1000000);
390 log_text(str); 390 log_text(str);
391#endif 391#endif
392 backlight_use_settings(); /* backlight control in lib/helper.c */ 392 backlight_use_settings();
393 393
394 /* wait until user closes plugin */ 394 /* wait until user closes plugin */
395 while (rb->button_get(true) != FPS_QUIT); 395 while (rb->button_get(true) != FPS_QUIT);
diff --git a/apps/plugins/test_gfx.c b/apps/plugins/test_gfx.c
index aa898549bb..cde77c55fe 100644
--- a/apps/plugins/test_gfx.c
+++ b/apps/plugins/test_gfx.c
@@ -441,7 +441,7 @@ enum plugin_status plugin_start(const void* parameter)
441 rb->lcd_set_backdrop(NULL); 441 rb->lcd_set_backdrop(NULL);
442 rb->lcd_clear_display(); 442 rb->lcd_clear_display();
443#endif 443#endif
444 backlight_force_on(); /* backlight control in lib/helper.c */ 444 backlight_ignore_timeout();
445 445
446 rb->splashf(0, "LCD driver performance test, please wait %d sec", 446 rb->splashf(0, "LCD driver performance test, please wait %d sec",
447 6*4*DURATION/HZ); 447 6*4*DURATION/HZ);
diff --git a/apps/plugins/test_grey.c b/apps/plugins/test_grey.c
index bf6d1755af..efceeff2c3 100644
--- a/apps/plugins/test_grey.c
+++ b/apps/plugins/test_grey.c
@@ -184,7 +184,7 @@ enum plugin_status plugin_start(const void* parameter)
184 for (i = 0; i <= STEPS; i++) 184 for (i = 0; i <= STEPS; i++)
185 input_levels[i] = lcd_levels[i] = (255 * i + (STEPS/2)) / STEPS; 185 input_levels[i] = lcd_levels[i] = (255 * i + (STEPS/2)) / STEPS;
186 186
187 backlight_force_on(); /* backlight control in lib/helper.c */ 187 backlight_ignore_timeout();
188 188
189 grey_set_background(0); /* set background to black */ 189 grey_set_background(0); /* set background to black */
190 grey_clear_display(); 190 grey_clear_display();
@@ -279,6 +279,6 @@ enum plugin_status plugin_start(const void* parameter)
279 } 279 }
280 280
281 grey_release(); 281 grey_release();
282 backlight_use_settings(); /* backlight control in lib/helper.c */ 282 backlight_use_settings();
283 return PLUGIN_OK; 283 return PLUGIN_OK;
284} 284}
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 869a053886..c8f9673a25 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -585,7 +585,7 @@ void Cleanup(void *fd)
585 rb->mp3_play_stop(); /* stop audio ISR */ 585 rb->mp3_play_stop(); /* stop audio ISR */
586 586
587 /* Turn on backlight timeout (revert to settings) */ 587 /* Turn on backlight timeout (revert to settings) */
588 backlight_use_settings(); /* backlight control in lib/helper.c */ 588 backlight_use_settings();
589 589
590 /* restore normal contrast */ 590 /* restore normal contrast */
591 rb->lcd_set_contrast(rb->global_settings->contrast); 591 rb->lcd_set_contrast(rb->global_settings->contrast);
@@ -954,7 +954,7 @@ int main(char* filename)
954 { 954 {
955 gPlay.bHasVideo = true; 955 gPlay.bHasVideo = true;
956 /* Turn off backlight timeout */ 956 /* Turn off backlight timeout */
957 backlight_force_on(); /* backlight control in lib/helper.c */ 957 backlight_ignore_timeout();
958 } 958 }
959 959
960 /* prepare audio playback, if contained */ 960 /* prepare audio playback, if contained */
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index e2076f75bd..ba5eb24967 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -2313,7 +2313,7 @@ static bool launch_wormlet(void)
2313 rb->lcd_clear_display(); 2313 rb->lcd_clear_display();
2314 2314
2315 /* Turn off backlight timeout */ 2315 /* Turn off backlight timeout */
2316 backlight_force_on(); /* backlight control in lib/helper.c */ 2316 backlight_ignore_timeout();
2317 2317
2318 /* start the game */ 2318 /* start the game */
2319 while (game_result == 1) 2319 while (game_result == 1)
@@ -2323,7 +2323,7 @@ static bool launch_wormlet(void)
2323 { 2323 {
2324 case 2: 2324 case 2:
2325 /* Turn on backlight timeout (revert to settings) */ 2325 /* Turn on backlight timeout (revert to settings) */
2326 backlight_use_settings(); /* backlight control in lib/helper.c */ 2326 backlight_use_settings();
2327 return false; 2327 return false;
2328 break; 2328 break;
2329 } 2329 }
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index 49efdc9914..920bc23080 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -1110,13 +1110,13 @@ enum plugin_status plugin_start (const void *parameter)
1110#endif 1110#endif
1111 1111
1112 /* Turn off backlight timeout */ 1112 /* Turn off backlight timeout */
1113 backlight_force_on(); /* backlight control in lib/helper.c */ 1113 backlight_ignore_timeout();
1114 1114
1115 randomize (); 1115 randomize ();
1116 ret = xobox_loop (); 1116 ret = xobox_loop ();
1117 1117
1118 /* Turn on backlight timeout (revert to settings) */ 1118 /* Turn on backlight timeout (revert to settings) */
1119 backlight_use_settings(); /* backlight control in lib/helper.c */ 1119 backlight_use_settings();
1120 rb->lcd_setfont (FONT_UI); 1120 rb->lcd_setfont (FONT_UI);
1121 1121
1122 return ret; 1122 return ret;