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

1 files changed, 2 insertions, 2 deletions

diff --git a/apps/tree.c b/apps/tree.c
index 35cefb163d..72e7bc4504 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -644,7 +644,7 @@ static bool dirbrowse(void)
                         if (!global_settings.party_mode)
                             audio_stop();
                     }
-#if defined(HAVE_CHARGING) && \
+#if defined(CONFIG_CHARGING) && \
     (CONFIG_KEYPAD == RECORDER_PAD) && !defined(HAVE_SW_POWEROFF)
                     else {
                         if (!charger_inserted()) {
@@ -658,7 +658,7 @@ static bool dirbrowse(void)
 #endif
                 }
                 break;
-#if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
+#if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING)
             case TREE_OFF | BUTTON_REPEAT:
                 if (charger_inserted()) {
                     charging_splash();