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 /flash | |
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 'flash')
-rw-r--r-- | flash/bootbox/main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/flash/bootbox/main.c b/flash/bootbox/main.c index ef215c092b..4f5efdd7c6 100644 --- a/flash/bootbox/main.c +++ b/flash/bootbox/main.c | |||
@@ -65,7 +65,7 @@ int show_logo(void) | |||
65 | return 0; | 65 | return 0; |
66 | } | 66 | } |
67 | 67 | ||
68 | #ifdef HAVE_CHARGING | 68 | #ifdef CONFIG_CHARGING |
69 | /* | 69 | /* |
70 | bool backlight_get_on_when_charging(void) | 70 | bool backlight_get_on_when_charging(void) |
71 | { | 71 | { |
@@ -83,12 +83,12 @@ void charging_screen(void) | |||
83 | 83 | ||
84 | do | 84 | do |
85 | { | 85 | { |
86 | #ifdef HAVE_CHARGE_CTRL | 86 | #if CONFIG_CHARGING == CHARGING_CONTROL |
87 | if (charge_state == 1) | 87 | if (charge_state == CHARGING) |
88 | msg = "charging"; | 88 | msg = "charging"; |
89 | else if (charge_state == 2) | 89 | else if (charge_state == TOPOFF) |
90 | msg = "topoff charge"; | 90 | msg = "topoff charge"; |
91 | else if (charge_state == 3) | 91 | else if (charge_state == TRICKLE) |
92 | msg = "trickle charge"; | 92 | msg = "trickle charge"; |
93 | else | 93 | else |
94 | msg = "not charging"; | 94 | msg = "not charging"; |
@@ -130,7 +130,7 @@ void charging_screen(void) | |||
130 | } | 130 | } |
131 | } while (1); | 131 | } while (1); |
132 | } | 132 | } |
133 | #endif /* HAVE_CHARGING */ | 133 | #endif /* CONFIG_CHARGING */ |
134 | 134 | ||
135 | /* prompt user to plug USB and fix a problem */ | 135 | /* prompt user to plug USB and fix a problem */ |
136 | void prompt_usb(const char* msg1, const char* msg2) | 136 | void prompt_usb(const char* msg1, const char* msg2) |
@@ -172,7 +172,7 @@ void main(void) | |||
172 | button_init(); | 172 | button_init(); |
173 | powermgmt_init(); | 173 | powermgmt_init(); |
174 | 174 | ||
175 | #if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) | 175 | #if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034) |
176 | if (charger_inserted() | 176 | if (charger_inserted() |
177 | #ifdef ATA_POWER_PLAYERSTYLE | 177 | #ifdef ATA_POWER_PLAYERSTYLE |
178 | && !ide_powered() /* relies on probing result from bootloader */ | 178 | && !ide_powered() /* relies on probing result from bootloader */ |