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/bootbox | |
| parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
| download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.bz2 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/bootbox')
| -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) return 0; } -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING /* bool backlight_get_on_when_charging(void) { @@ -83,12 +83,12 @@ void charging_screen(void) do { -#ifdef HAVE_CHARGE_CTRL - if (charge_state == 1) +#if CONFIG_CHARGING == CHARGING_CONTROL + if (charge_state == CHARGING) msg = "charging"; - else if (charge_state == 2) + else if (charge_state == TOPOFF) msg = "topoff charge"; - else if (charge_state == 3) + else if (charge_state == TRICKLE) msg = "trickle charge"; else msg = "not charging"; @@ -130,7 +130,7 @@ void charging_screen(void) } } while (1); } -#endif /* HAVE_CHARGING */ +#endif /* CONFIG_CHARGING */ /* prompt user to plug USB and fix a problem */ void prompt_usb(const char* msg1, const char* msg2) @@ -172,7 +172,7 @@ void main(void) button_init(); powermgmt_init(); -#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034) +#if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034) if (charger_inserted() #ifdef ATA_POWER_PLAYERSTYLE && !ide_powered() /* relies on probing result from bootloader */ |