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/powermgmt.h | |
| parent | 8c9e22580e220b793130ed3ac67b9c54e85b3d0f (diff) | |
| download | rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.zip rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.gz rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.bz2 rockbox-0dd1f8ec11f28fe34c93ba97af95eb2be2fef44f.tar.xz | |
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/powermgmt.h')
| -rw-r--r-- | firmware/export/powermgmt.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index 6c31aee..30fe60c 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -28,7 +28,7 @@ #ifndef SIMULATOR -#ifdef HAVE_CHARGE_CTRL +#if CONFIG_CHARGING == CHARGING_CONTROL #define START_TOPOFF_CHG 85 /* Battery % to start at top-off */ #define START_TRICKLE_CHG 95 /* Battery % to start at trickle */ @@ -59,23 +59,21 @@ extern int pid_p; /* PID proportional term */ extern int pid_i; /* PID integral term */ extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */ -#endif /* HAVE_CHARGE_CTRL */ +#endif /* CONFIG_CHARGING == CHARGING_CONTROL */ -#if defined(HAVE_CHARGE_CTRL) || \ - (CONFIG_BATTERY == BATT_LIION2200) || \ - defined(HAVE_CHARGE_STATE) -typedef enum { - DISCHARGING, - CHARGING, - TOPOFF, - TRICKLE +#if CONFIG_CHARGING >= CHARGING_MONITOR +typedef enum { /* sorted by increasing charging current */ + DISCHARGING = 0, + TRICKLE, /* Can occur for CONFIG_CHARGING >= CHARGING_MONITOR */ + TOPOFF, /* Can occur for CONFIG_CHARGING == CHARGING_CONTROL */ + CHARGING /* Can occur for all CONFIG_CHARGING options */ } charge_state_type; /* tells what the charger is doing */ extern charge_state_type charge_state; -#endif /* defined(HAVE_CHARGE_CTRL) || (CONFIG_BATTERY == BATT_LIION2200) */ +#endif /* CONFIG_CHARGING >= CHARGING_MONITOR */ -#ifdef HAVE_CHARGING +#ifdef CONFIG_CHARGING /* * Flag that the charger has been plugged in/removed: this is set for exactly * one time through the power loop when the charger has been plugged in. |