diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/features.txt | 10 | ||||
-rw-r--r-- | apps/menus/display_menu.c | 10 | ||||
-rw-r--r-- | apps/settings.c | 5 | ||||
-rw-r--r-- | apps/settings.h | 5 | ||||
-rw-r--r-- | apps/settings_list.c | 7 |
5 files changed, 15 insertions, 22 deletions
diff --git a/apps/features.txt b/apps/features.txt index 4fbf427a23..4980944605 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -20,12 +20,10 @@ albumart | |||
20 | backlight_brightness | 20 | backlight_brightness |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #if defined(HAVE_BACKLIGHT_PWM_FADING) | 23 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) |
24 | backlight_fade_pwm | 24 | backlight_fade_int |
25 | #elif defined(USE_BACKLIGHT_SW_FADING) | 25 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
26 | backlight_fade_sw | 26 | backlight_fade_bool |
27 | #elif defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
28 | backlight_fade_custom_bool | ||
29 | #endif | 27 | #endif |
30 | 28 | ||
31 | #if BATTERY_TYPES_COUNT > 1 | 29 | #if BATTERY_TYPES_COUNT > 1 |
diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index 488b0ff570..dbc7206b91 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c | |||
@@ -91,9 +91,8 @@ MENUITEM_SETTING(backlight_on_button_hold, | |||
91 | &global_settings.backlight_on_button_hold, NULL); | 91 | &global_settings.backlight_on_button_hold, NULL); |
92 | #endif | 92 | #endif |
93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); | 93 | MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL); |
94 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ | 94 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \ |
95 | defined(USE_BACKLIGHT_SW_FADING) || \ | 95 | || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
96 | defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
97 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); | 96 | MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL); |
98 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); | 97 | MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL); |
99 | #endif | 98 | #endif |
@@ -132,9 +131,8 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), | |||
132 | ,&backlight_on_button_hold | 131 | ,&backlight_on_button_hold |
133 | # endif | 132 | # endif |
134 | ,&caption_backlight | 133 | ,&caption_backlight |
135 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \ | 134 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \ |
136 | defined(USE_BACKLIGHT_SW_FADING) || \ | 135 | || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
137 | defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
138 | ,&backlight_fade_in, &backlight_fade_out | 136 | ,&backlight_fade_in, &backlight_fade_out |
139 | #endif | 137 | #endif |
140 | ,&bl_filter_first_keypress | 138 | ,&bl_filter_first_keypress |
diff --git a/apps/settings.c b/apps/settings.c index 42fb4dad5d..7bbbe92a9b 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -773,9 +773,8 @@ void settings_apply(bool read_disk) | |||
773 | #if CONFIG_CHARGING | 773 | #if CONFIG_CHARGING |
774 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); | 774 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); |
775 | #endif | 775 | #endif |
776 | #if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) \ | 776 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \ |
777 | || defined(USE_BACKLIGHT_SW_FADING) \ | 777 | || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
778 | || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
779 | backlight_set_fade_in(global_settings.backlight_fade_in); | 778 | backlight_set_fade_in(global_settings.backlight_fade_in); |
780 | backlight_set_fade_out(global_settings.backlight_fade_out); | 779 | backlight_set_fade_out(global_settings.backlight_fade_out); |
781 | #endif | 780 | #endif |
diff --git a/apps/settings.h b/apps/settings.h index efa50f78dd..50c53718f7 100644 --- a/apps/settings.h +++ b/apps/settings.h | |||
@@ -681,11 +681,10 @@ struct user_settings | |||
681 | int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight | 681 | int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight |
682 | has turned off */ | 682 | has turned off */ |
683 | #endif | 683 | #endif |
684 | #if defined(HAVE_BACKLIGHT_PWM_FADING) | 684 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) |
685 | int backlight_fade_in; /* backlight fade in timing: 0..3 */ | 685 | int backlight_fade_in; /* backlight fade in timing: 0..3 */ |
686 | int backlight_fade_out; /* backlight fade in timing: 0..7 */ | 686 | int backlight_fade_out; /* backlight fade in timing: 0..7 */ |
687 | #elif defined(USE_BACKLIGHT_SW_FADING) \ | 687 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
688 | || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
689 | bool backlight_fade_in; | 688 | bool backlight_fade_in; |
690 | bool backlight_fade_out; | 689 | bool backlight_fade_out; |
691 | #endif | 690 | #endif |
diff --git a/apps/settings_list.c b/apps/settings_list.c index 3618c16aa2..c855c70e10 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -671,15 +671,14 @@ const struct settings_list settings[] = { | |||
671 | OFFON_SETTING(0, remote_caption_backlight, LANG_CAPTION_BACKLIGHT, | 671 | OFFON_SETTING(0, remote_caption_backlight, LANG_CAPTION_BACKLIGHT, |
672 | false, "remote caption backlight", NULL), | 672 | false, "remote caption backlight", NULL), |
673 | #endif | 673 | #endif |
674 | #endif /* HAVE_BACKLIGHT */ | ||
675 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS | 674 | #ifdef HAVE_BACKLIGHT_BRIGHTNESS |
676 | INT_SETTING(F_NO_WRAP, brightness, LANG_BRIGHTNESS, | 675 | INT_SETTING(F_NO_WRAP, brightness, LANG_BRIGHTNESS, |
677 | DEFAULT_BRIGHTNESS_SETTING, "brightness",UNIT_INT, | 676 | DEFAULT_BRIGHTNESS_SETTING, "brightness",UNIT_INT, |
678 | MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1, | 677 | MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1, |
679 | NULL, NULL, backlight_set_brightness), | 678 | NULL, NULL, backlight_set_brightness), |
680 | #endif | 679 | #endif |
681 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | ||
682 | /* backlight fading */ | 680 | /* backlight fading */ |
681 | #if defined(HAVE_BACKLIGHT_FADING_INT_SETTING) | ||
683 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, backlight_fade_in, | 682 | TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, backlight_fade_in, |
684 | LANG_BACKLIGHT_FADE_IN, 300, "backlight fade in", "off", | 683 | LANG_BACKLIGHT_FADE_IN, 300, "backlight fade in", "off", |
685 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, | 684 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, |
@@ -689,13 +688,13 @@ const struct settings_list settings[] = { | |||
689 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, | 688 | UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off, |
690 | backlight_set_fade_out, 10, | 689 | backlight_set_fade_out, 10, |
691 | 0,100,200,300,500,1000,2000,3000,5000,10000), | 690 | 0,100,200,300,500,1000,2000,3000,5000,10000), |
692 | #elif defined(USE_BACKLIGHT_SW_FADING) \ | 691 | #elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING) |
693 | || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL) | ||
694 | OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN, | 692 | OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN, |
695 | true, "backlight fade in", backlight_set_fade_in), | 693 | true, "backlight fade in", backlight_set_fade_in), |
696 | OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, | 694 | OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT, |
697 | true, "backlight fade out", backlight_set_fade_out), | 695 | true, "backlight fade out", backlight_set_fade_out), |
698 | #endif | 696 | #endif |
697 | #endif /* HAVE_BACKLIGHT */ | ||
699 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", | 698 | INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed", |
700 | UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), | 699 | UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed), |
701 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, | 700 | INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000, |