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/plugin.h | |
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/plugin.h')
-rw-r--r-- | apps/plugin.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index de8f267ec8..b4990b8fb6 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -421,9 +421,9 @@ struct plugin_api { | |||
421 | #ifndef SIMULATOR | 421 | #ifndef SIMULATOR |
422 | unsigned int (*battery_voltage)(void); | 422 | unsigned int (*battery_voltage)(void); |
423 | #endif | 423 | #endif |
424 | #ifdef HAVE_CHARGING | 424 | #ifdef CONFIG_CHARGING |
425 | bool (*charger_inserted)(void); | 425 | bool (*charger_inserted)(void); |
426 | # ifdef HAVE_CHARGE_STATE | 426 | # if CONFIG_CHARGING == CHARGING_MONITOR |
427 | bool (*charging_state)(void); | 427 | bool (*charging_state)(void); |
428 | # endif | 428 | # endif |
429 | #endif | 429 | #endif |