summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/settings.h2
-rw-r--r--apps/settings_menu.c4
-rw-r--r--uisimulator/common/stubs.c5
3 files changed, 5 insertions, 6 deletions
diff --git a/apps/settings.h b/apps/settings.h
index eed0b61c20..437f0937dd 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -64,9 +64,7 @@ struct user_settings
64 int contrast; /* lcd contrast: 0-100 0=low 100=high */ 64 int contrast; /* lcd contrast: 0-100 0=low 100=high */
65 int poweroff; /* power off timer */ 65 int poweroff; /* power off timer */
66 int backlight_timeout; /* backlight off timeout: 0-18 0=never,1=always,then according to timeout_values[] */ 66 int backlight_timeout; /* backlight off timeout: 0-18 0=never,1=always,then according to timeout_values[] */
67#ifdef HAVE_CHARGE_CTRL
68 bool backlight_on_when_charging; 67 bool backlight_on_when_charging;
69#endif
70 bool discharge; /* maintain charge of at least: false = 90%, true = 10% */ 68 bool discharge; /* maintain charge of at least: false = 90%, true = 10% */
71 69
72 /* resume settings */ 70 /* resume settings */
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 4e521bca84..3b83e18fe4 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -144,7 +144,6 @@ static bool resume(void)
144 names, 3, NULL ); 144 names, 3, NULL );
145} 145}
146 146
147#ifdef HAVE_CHARGE_CTRL
148static bool backlight_on_when_charging(void) 147static bool backlight_on_when_charging(void)
149{ 148{
150 bool result = set_bool(str(LANG_BACKLIGHT_ON_WHEN_CHARGING), 149 bool result = set_bool(str(LANG_BACKLIGHT_ON_WHEN_CHARGING),
@@ -152,7 +151,6 @@ static bool backlight_on_when_charging(void)
152 backlight_set_on_when_charging(global_settings.backlight_on_when_charging); 151 backlight_set_on_when_charging(global_settings.backlight_on_when_charging);
153 return result; 152 return result;
154} 153}
155#endif
156 154
157static bool backlight_timer(void) 155static bool backlight_timer(void)
158{ 156{
@@ -387,9 +385,7 @@ static bool display_settings_menu(void)
387 struct menu_items items[] = { 385 struct menu_items items[] = {
388 { str(LANG_SCROLL_MENU), scroll_speed }, 386 { str(LANG_SCROLL_MENU), scroll_speed },
389 { str(LANG_BACKLIGHT), backlight_timer }, 387 { str(LANG_BACKLIGHT), backlight_timer },
390#ifdef HAVE_CHARGE_CTRL
391 { str(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging }, 388 { str(LANG_BACKLIGHT_ON_WHEN_CHARGING), backlight_on_when_charging },
392#endif
393 { str(LANG_CONTRAST), contrast }, 389 { str(LANG_CONTRAST), contrast },
394#ifdef HAVE_LCD_BITMAP 390#ifdef HAVE_LCD_BITMAP
395 { str(LANG_PM_MENU), peak_meter_menu }, 391 { str(LANG_PM_MENU), peak_meter_menu },
diff --git a/uisimulator/common/stubs.c b/uisimulator/common/stubs.c
index 98e1f75182..c0fc6953e6 100644
--- a/uisimulator/common/stubs.c
+++ b/uisimulator/common/stubs.c
@@ -128,3 +128,8 @@ void backlight_set_timeout(int seconds)
128{ 128{
129 (void)seconds; 129 (void)seconds;
130} 130}
131
132void backlight_set_on_when_charging(bool beep)
133{
134 (void)beep;
135}