diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-06-06 22:23:52 +0000 |
commit | 0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f (patch) | |
tree | e3e77d4e6b25b82c82b3570cd8c4a988c7788e66 /apps/main_menu.c | |
parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip |
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
Diffstat (limited to 'apps/main_menu.c')
-rw-r--r-- | apps/main_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
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) | |||
169 | #endif | 169 | #endif |
170 | lcd_puts_scroll(0, y++, (unsigned char *)s); | 170 | lcd_puts_scroll(0, y++, (unsigned char *)s); |
171 | 171 | ||
172 | #ifdef HAVE_CHARGE_CTRL | 172 | #if CONFIG_CHARGING == CHARGING_CONTROL |
173 | if (charge_state == 1) | 173 | if (charge_state == CHARGING) |
174 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_CHARGE)); | 174 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_CHARGE)); |
175 | else if (charge_state == 2) | 175 | else if (charge_state == TOPOFF) |
176 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TOPOFF_CHARGE)); | 176 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TOPOFF_CHARGE)); |
177 | else if (charge_state == 3) | 177 | else if (charge_state == TRICKLE) |
178 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TRICKLE_CHARGE)); | 178 | snprintf(s, sizeof(s), (char *)str(LANG_BATTERY_TRICKLE_CHARGE)); |
179 | else | 179 | else |
180 | #endif | 180 | #endif |