diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/main.c | 2 | ||||
-rw-r--r-- | apps/screens.c | 4 | ||||
-rw-r--r-- | apps/settings.c | 4 | ||||
-rw-r--r-- | apps/settings_menu.c | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/apps/main.c b/apps/main.c index 01202a9184..536a181845 100644 --- a/apps/main.c +++ b/apps/main.c | |||
@@ -151,7 +151,7 @@ void init(void) | |||
151 | 151 | ||
152 | powermgmt_init(); | 152 | powermgmt_init(); |
153 | 153 | ||
154 | #ifdef HAVE_BATTERIES | 154 | #ifdef HAVE_CHARGING |
155 | if (coldstart && charger_inserted() && !global_settings.car_adapter_mode) | 155 | if (coldstart && charger_inserted() && !global_settings.car_adapter_mode) |
156 | { | 156 | { |
157 | rc = charging_screen(); /* display a "charging" screen */ | 157 | rc = charging_screen(); /* display a "charging" screen */ |
diff --git a/apps/screens.c b/apps/screens.c index 64382cc0ed..b31067ad27 100644 --- a/apps/screens.c +++ b/apps/screens.c | |||
@@ -231,7 +231,7 @@ void charging_display_info(bool animate) | |||
231 | } | 231 | } |
232 | #endif | 232 | #endif |
233 | 233 | ||
234 | #ifdef HAVE_BATTERIES | 234 | #ifdef HAVE_CHARGING |
235 | /* blocks while charging, returns on event: | 235 | /* blocks while charging, returns on event: |
236 | 1 if charger cable was removed | 236 | 1 if charger cable was removed |
237 | 2 if Off/Stop key was pressed | 237 | 2 if Off/Stop key was pressed |
@@ -283,7 +283,7 @@ int charging_screen(void) | |||
283 | 283 | ||
284 | return rc; | 284 | return rc; |
285 | } | 285 | } |
286 | #endif /* HAVE_BATTERIES */ | 286 | #endif /* HAVE_CHARGING */ |
287 | 287 | ||
288 | 288 | ||
289 | #if CONFIG_KEYPAD == RECORDER_PAD | 289 | #if CONFIG_KEYPAD == RECORDER_PAD |
diff --git a/apps/settings.c b/apps/settings.c index 3b6a048def..2765ae8e52 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -224,7 +224,9 @@ static const struct bit_entry rtc_bits[] = | |||
224 | #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE | 224 | #elif CONFIG_BATTERY == BATT_3AAA_ALKALINE |
225 | {12, S_O(battery_capacity), 1000, "battery capacity", NULL }, | 225 | {12, S_O(battery_capacity), 1000, "battery capacity", NULL }, |
226 | #endif | 226 | #endif |
227 | #ifdef HAVE_CHARGING | ||
227 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, | 228 | {1, S_O(car_adapter_mode), false, "car adapter mode", off_on }, |
229 | #endif | ||
228 | 230 | ||
229 | /* new stuff to be added here */ | 231 | /* new stuff to be added here */ |
230 | /* If values are just added to the end, no need to bump the version. */ | 232 | /* If values are just added to the end, no need to bump the version. */ |
@@ -281,7 +283,7 @@ static const struct bit_entry hd_bits[] = | |||
281 | {1, S_O(browse_current), false, "follow playlist", off_on }, | 283 | {1, S_O(browse_current), false, "follow playlist", off_on }, |
282 | /* playlist */ | 284 | /* playlist */ |
283 | {1, S_O(playlist_viewer_icons), true, "playlist viewer icons", off_on }, | 285 | {1, S_O(playlist_viewer_icons), true, "playlist viewer icons", off_on }, |
284 | {1, S_O(playlist_viewer_indices), true, | 286 | {1, S_O(playlist_viewer_indices), true, |
285 | "playlist viewer indices", off_on }, | 287 | "playlist viewer indices", off_on }, |
286 | {1, S_O(playlist_viewer_track_display), 0, | 288 | {1, S_O(playlist_viewer_track_display), 0, |
287 | "playlist viewer track display", "track name,full path" }, | 289 | "playlist viewer track display", "track name,full path" }, |
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 61d2519662..2579d7b4dc 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c | |||
@@ -58,6 +58,7 @@ void dac_line_in(bool enable); | |||
58 | /* This flag is set by dirbrowse() if a new language is loaded */ | 58 | /* This flag is set by dirbrowse() if a new language is loaded */ |
59 | bool language_changed; | 59 | bool language_changed; |
60 | 60 | ||
61 | #ifdef HAVE_CHARGING | ||
61 | static bool car_adapter_mode(void) | 62 | static bool car_adapter_mode(void) |
62 | { | 63 | { |
63 | return set_bool_options( str(LANG_CAR_ADAPTER_MODE), | 64 | return set_bool_options( str(LANG_CAR_ADAPTER_MODE), |
@@ -66,6 +67,7 @@ static bool car_adapter_mode(void) | |||
66 | STR(LANG_SET_BOOL_NO), | 67 | STR(LANG_SET_BOOL_NO), |
67 | set_car_adapter_mode); | 68 | set_car_adapter_mode); |
68 | } | 69 | } |
70 | #endif | ||
69 | 71 | ||
70 | static bool contrast(void) | 72 | static bool contrast(void) |
71 | { | 73 | { |
@@ -1351,7 +1353,9 @@ static bool system_settings_menu(void) | |||
1351 | #if CONFIG_HWCODEC == MAS3507D | 1353 | #if CONFIG_HWCODEC == MAS3507D |
1352 | { ID2P(LANG_LINE_IN), line_in }, | 1354 | { ID2P(LANG_LINE_IN), line_in }, |
1353 | #endif | 1355 | #endif |
1356 | #ifdef HAVE_CHARGING | ||
1354 | { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, | 1357 | { ID2P(LANG_CAR_ADAPTER_MODE), car_adapter_mode }, |
1358 | #endif | ||
1355 | { ID2P(LANG_MANAGE_MENU), manage_settings_menu }, | 1359 | { ID2P(LANG_MANAGE_MENU), manage_settings_menu }, |
1356 | }; | 1360 | }; |
1357 | 1361 | ||