diff options
Diffstat (limited to 'apps/menus/main_menu.c')
-rw-r--r-- | apps/menus/main_menu.c | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index ee60b37497..7f94571226 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -264,21 +264,10 @@ static const char* info_getname(int selected_item, void *data, | |||
264 | return str(LANG_BATTERY_CHARGE); | 264 | return str(LANG_BATTERY_CHARGE); |
265 | else | 265 | else |
266 | #elif CONFIG_CHARGING >= CHARGING_MONITOR | 266 | #elif CONFIG_CHARGING >= CHARGING_MONITOR |
267 | #ifdef ARCHOS_RECORDER | ||
268 | /* Report the particular algorithm state */ | ||
269 | if (charge_state == CHARGING) | ||
270 | return str(LANG_BATTERY_CHARGE); | ||
271 | else if (charge_state == TOPOFF) | ||
272 | return str(LANG_BATTERY_TOPOFF_CHARGE); | ||
273 | else if (charge_state == TRICKLE) | ||
274 | return str(LANG_BATTERY_TRICKLE_CHARGE); | ||
275 | else | ||
276 | #else /* !ARCHOS_RECORDER */ | ||
277 | /* Go by what power management reports */ | 267 | /* Go by what power management reports */ |
278 | if (charging_state()) | 268 | if (charging_state()) |
279 | return str(LANG_BATTERY_CHARGE); | 269 | return str(LANG_BATTERY_CHARGE); |
280 | else | 270 | else |
281 | #endif /* ARCHOS_RECORDER */ | ||
282 | #endif /* CONFIG_CHARGING = */ | 271 | #endif /* CONFIG_CHARGING = */ |
283 | if (battery_level() >= 0) | 272 | if (battery_level() >= 0) |
284 | snprintf(buffer, buffer_len, str(LANG_BATTERY_TIME), | 273 | snprintf(buffer, buffer_len, str(LANG_BATTERY_TIME), |
@@ -394,24 +383,6 @@ static int info_speak_item(int selected_item, void * data) | |||
394 | } | 383 | } |
395 | else | 384 | else |
396 | #elif CONFIG_CHARGING >= CHARGING_MONITOR | 385 | #elif CONFIG_CHARGING >= CHARGING_MONITOR |
397 | #ifdef ARCHOS_RECORDER | ||
398 | /* Report the particular algorithm state */ | ||
399 | if (charge_state == CHARGING) | ||
400 | { | ||
401 | talk_id(LANG_BATTERY_CHARGE, true); | ||
402 | if (battery_level() >= 0) | ||
403 | talk_value(battery_level(), UNIT_PERCENT, true); | ||
404 | } | ||
405 | else if (charge_state == TOPOFF) | ||
406 | talk_id(LANG_BATTERY_TOPOFF_CHARGE, true); | ||
407 | else if (charge_state == TRICKLE) | ||
408 | { | ||
409 | talk_id(LANG_BATTERY_TRICKLE_CHARGE, true); | ||
410 | if (battery_level() >= 0) | ||
411 | talk_value(battery_level(), UNIT_PERCENT, true); | ||
412 | } | ||
413 | else | ||
414 | #else /* !ARCHOS_RECORDER */ | ||
415 | /* Go by what power management reports */ | 386 | /* Go by what power management reports */ |
416 | if (charging_state()) | 387 | if (charging_state()) |
417 | { | 388 | { |
@@ -420,7 +391,6 @@ static int info_speak_item(int selected_item, void * data) | |||
420 | talk_value(battery_level(), UNIT_PERCENT, true); | 391 | talk_value(battery_level(), UNIT_PERCENT, true); |
421 | } | 392 | } |
422 | else | 393 | else |
423 | #endif /* ARCHOS_RECORDER */ | ||
424 | #endif /* CONFIG_CHARGING = */ | 394 | #endif /* CONFIG_CHARGING = */ |
425 | if (battery_level() >= 0) | 395 | if (battery_level() >= 0) |
426 | { | 396 | { |