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/export/config.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 'firmware/export/config.h')
-rw-r--r-- | firmware/export/config.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index d919b8b4f6..910aeca4eb 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -68,6 +68,11 @@ | |||
68 | #define BATT_3AAA 1000 /* Ondio */ | 68 | #define BATT_3AAA 1000 /* Ondio */ |
69 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ | 69 | #define BATT_LIPOL1300 1300 /* the type used in iRiver h1x0 models */ |
70 | 70 | ||
71 | /* CONFIG_CHARGING */ | ||
72 | #define CHARGING_SIMPLE 1 /* Simple, hardware controlled charging */ | ||
73 | #define CHARGING_MONITOR 2 /* Hardware controlled charging with monitoring */ | ||
74 | #define CHARGING_CONTROL 3 /* Software controlled charging */ | ||
75 | |||
71 | /* CONFIG_LCD */ | 76 | /* CONFIG_LCD */ |
72 | #define LCD_GMINI100 0 | 77 | #define LCD_GMINI100 0 |
73 | #define LCD_SSD1815 1 /* as used by Archos Recorders and Ondios */ | 78 | #define LCD_SSD1815 1 /* as used by Archos Recorders and Ondios */ |