From 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Tue, 6 Jun 2006 22:23:52 +0000 Subject: Work-in-progress rework of charging status reading & display: * Changed several charging related HAVE_* macros into one multi-value CONFIG_CHARGING. * Always use proper macros for charging states. * Battery symbol charging animation now starts from current level on all targets with charging. Two-colour animation kept for non-b&w targets. Round down fill level while charging as before, but round to nearest pixel value for discharging on all targets. * Charging anim fixed on player. * Some code cleanup. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10080 a1c6a512-1295-4272-9138-f99709370657 --- apps/main_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'apps/main_menu.c') diff --git a/apps/main_menu.c b/apps/main_menu.c index e6c2bb76c2..eb94498c7e 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -169,12 +169,12 @@ bool show_info(void) #endif lcd_puts_scroll(0, y++, (unsigned char *)s); -#ifdef HAVE_CHARGE_CTRL - if (charge_state == 1) +#if CONFIG_CHARGING == CHARGING_CONTROL + if (charge_state == CHARGING) snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_CHARGE)); - else if (charge_state == 2) + else if (charge_state == TOPOFF) snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TOPOFF_CHARGE)); - else if (charge_state == 3) + else if (charge_state == TRICKLE) snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TRICKLE_CHARGE)); else #endif -- cgit v1.2.3