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 /firmware/drivers/button.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 'firmware/drivers/button.c')
-rw-r--r-- | firmware/drivers/button.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c index 6513fb4a3a..216c51ea15 100644 --- a/firmware/drivers/button.c +++ b/firmware/drivers/button.c | |||
@@ -490,7 +490,7 @@ static void button_tick(void) | |||
490 | || btn == BUTTON_RC_STOP | 490 | || btn == BUTTON_RC_STOP |
491 | #endif | 491 | #endif |
492 | ) && | 492 | ) && |
493 | #if defined(HAVE_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) | 493 | #if defined(CONFIG_CHARGING) && !defined(HAVE_POWEROFF_WHILE_CHARGING) |
494 | !charger_inserted() && | 494 | !charger_inserted() && |
495 | #endif | 495 | #endif |
496 | repeat_count > POWEROFF_COUNT) | 496 | repeat_count > POWEROFF_COUNT) |
@@ -1248,7 +1248,7 @@ static int button_read(void) | |||
1248 | backlight_on(); | 1248 | backlight_on(); |
1249 | } | 1249 | } |
1250 | /* TODO: add light handling for the remote */ | 1250 | /* TODO: add light handling for the remote */ |
1251 | 1251 | ||
1252 | hold_button = button_hold(); | 1252 | hold_button = button_hold(); |
1253 | remote_hold_button = remote_button_hold(); | 1253 | remote_hold_button = remote_button_hold(); |
1254 | 1254 | ||