forked from len0rd/rockbox
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
This commit is contained in:
parent
8c9e22580e
commit
0dd1f8ec11
43 changed files with 300 additions and 350 deletions
|
@ -228,7 +228,7 @@ void init(void)
|
|||
{
|
||||
int rc;
|
||||
bool mounted = false;
|
||||
#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034)
|
||||
#if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034)
|
||||
/* if nobody initialized ATA before, I consider this a cold start */
|
||||
bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */
|
||||
#endif
|
||||
|
@ -295,7 +295,7 @@ void init(void)
|
|||
screen_access_init();
|
||||
gui_syncstatusbar_init(&statusbars);
|
||||
|
||||
#if defined(HAVE_CHARGING) && (CONFIG_CPU == SH7034)
|
||||
#if defined(CONFIG_CHARGING) && (CONFIG_CPU == SH7034)
|
||||
if (coldstart && charger_inserted()
|
||||
&& !global_settings.car_adapter_mode
|
||||
#ifdef ATA_POWER_PLAYERSTYLE
|
||||
|
@ -433,7 +433,7 @@ void init(void)
|
|||
}
|
||||
#endif /* #ifdef AUTOROCK */
|
||||
|
||||
#ifdef HAVE_CHARGING
|
||||
#ifdef CONFIG_CHARGING
|
||||
car_adapter_mode_init();
|
||||
#endif
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue