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
 backlight_brightness
 #endif
 
-#if defined(HAVE_BACKLIGHT_PWM_FADING)
-backlight_fade_pwm
-#elif defined(USE_BACKLIGHT_SW_FADING)
-backlight_fade_sw
-#elif defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
-backlight_fade_custom_bool
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING)
+backlight_fade_int
+#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
+backlight_fade_bool
 #endif
 
 #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,
                 &global_settings.backlight_on_button_hold, NULL);
 #endif
 MENUITEM_SETTING(caption_backlight, &global_settings.caption_backlight, NULL);
-#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
-        defined(USE_BACKLIGHT_SW_FADING) || \
-        defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#if    defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \
+    || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
 MENUITEM_SETTING(backlight_fade_in, &global_settings.backlight_fade_in, NULL);
 MENUITEM_SETTING(backlight_fade_out, &global_settings.backlight_fade_out, NULL);
 #endif
@@ -132,9 +131,8 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
             ,&backlight_on_button_hold
 # endif
             ,&caption_backlight
-#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) || \
-        defined(USE_BACKLIGHT_SW_FADING) || \
-        defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#if    defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \
+    || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
             ,&backlight_fade_in, &backlight_fade_out
 #endif
             ,&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)
 #if CONFIG_CHARGING
     backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged);
 #endif
-#if (defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR)) \
-        || defined(USE_BACKLIGHT_SW_FADING) \
-        || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#if    defined(HAVE_BACKLIGHT_FADING_INT_SETTING) \
+    || defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
     backlight_set_fade_in(global_settings.backlight_fade_in);
     backlight_set_fade_out(global_settings.backlight_fade_out);
 #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
     int lcd_sleep_after_backlight_off; /* when to put lcd to sleep after backlight
                                           has turned off */
 #endif
-#if defined(HAVE_BACKLIGHT_PWM_FADING)
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING)
     int backlight_fade_in;  /* backlight fade in timing: 0..3 */
     int backlight_fade_out; /* backlight fade in timing: 0..7 */
-#elif defined(USE_BACKLIGHT_SW_FADING) \
-    || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
     bool backlight_fade_in;
     bool backlight_fade_out;
 #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[] = {
     OFFON_SETTING(0, remote_caption_backlight, LANG_CAPTION_BACKLIGHT,
                   false, "remote caption backlight", NULL),
 #endif
-#endif /* HAVE_BACKLIGHT */
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
     INT_SETTING(F_NO_WRAP, brightness, LANG_BRIGHTNESS,
                 DEFAULT_BRIGHTNESS_SETTING, "brightness",UNIT_INT,
                 MIN_BRIGHTNESS_SETTING, MAX_BRIGHTNESS_SETTING, 1,
                 NULL, NULL, backlight_set_brightness),
 #endif
-#if defined(HAVE_BACKLIGHT_PWM_FADING)  && !defined(SIMULATOR)
     /* backlight fading */
+#if defined(HAVE_BACKLIGHT_FADING_INT_SETTING)
     TABLE_SETTING(F_ALLOW_ARBITRARY_VALS, backlight_fade_in,
                   LANG_BACKLIGHT_FADE_IN, 300, "backlight fade in", "off",
                   UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off,
@@ -689,13 +688,13 @@ const struct settings_list settings[] = {
                   UNIT_MS, formatter_unit_0_is_off, getlang_unit_0_is_off,
                   backlight_set_fade_out, 10,
                   0,100,200,300,500,1000,2000,3000,5000,10000),
-#elif defined(USE_BACKLIGHT_SW_FADING) \
-    || defined(USE_BACKLIGHT_CUSTOM_FADING_BOOL)
+#elif defined(HAVE_BACKLIGHT_FADING_BOOL_SETTING)
     OFFON_SETTING(0, backlight_fade_in, LANG_BACKLIGHT_FADE_IN,
                     true, "backlight fade in", backlight_set_fade_in),
     OFFON_SETTING(0, backlight_fade_out, LANG_BACKLIGHT_FADE_OUT,
                     true, "backlight fade out", backlight_set_fade_out),
 #endif
+#endif /* HAVE_BACKLIGHT */
     INT_SETTING(F_PADTITLE, scroll_speed, LANG_SCROLL_SPEED, 9,"scroll speed",
                 UNIT_INT, 0, 15, 1, NULL, NULL, lcd_scroll_speed),
     INT_SETTING(F_PADTITLE, scroll_delay, LANG_SCROLL_DELAY, 1000,