diff options
author | Thomas Martitz <kugel@rockbox.org> | 2012-01-03 23:44:38 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2012-01-03 23:44:38 +0000 |
commit | c1bd9b0361ba92c29ceef68d74093e70a1a3e481 (patch) | |
tree | 1a42acdf2099b7f5ac06eee11e1d488b388c6d9f /firmware/export/config/ipodmini2g.h | |
parent | 949e6398c89e3c277a4c542f67a5ee788c6f642d (diff) | |
download | rockbox-c1bd9b0361ba92c29ceef68d74093e70a1a3e481.tar.gz rockbox-c1bd9b0361ba92c29ceef68d74093e70a1a3e481.zip |
Rework powermgmt to enable code re-use on appliation and sims.
* Introduce CONFIG_BATTERY_MEASURE define, to allow targets (application)
to break powermgmt.c's assumption about the ability to read battery voltage.
There's now additionally percentage (android) and remaining time measure
(maemo). No measure at all also works (sdl app). If voltage can't be measured,
then battery_level() is king and it'll be used for power_history and runtime
estimation.
* Implement target's API in the simulator, i.e. _battery_voltage(), so it
doesn't need to implement it's own powermgmt.c and other stubs. Now
the sim behaves much more like a native target, although it still
changes the simulated battery voltage quickly,
* Other changes include include renaming battery_adc_voltage() to
_battery_voltage(), for consistency with the new target functions and
making some of the apps code aware that voltage and runtime estimation
is not always available.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31548 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export/config/ipodmini2g.h')
-rw-r--r-- | firmware/export/config/ipodmini2g.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h index c10284e7a4..27edf100ae 100644 --- a/firmware/export/config/ipodmini2g.h +++ b/firmware/export/config/ipodmini2g.h | |||
@@ -142,6 +142,8 @@ | |||
142 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ | 142 | #define BATTERY_CAPACITY_INC 50 /* capacity increment */ |
143 | #define BATTERY_TYPES_COUNT 1 /* only one type */ | 143 | #define BATTERY_TYPES_COUNT 1 /* only one type */ |
144 | 144 | ||
145 | #define CONFIG_BATTERY_MEASURE VOLTAGE_MEASURE | ||
146 | |||
145 | /* define current usage levels */ | 147 | /* define current usage levels */ |
146 | #define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */ | 148 | #define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */ |
147 | #define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */ | 149 | #define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */ |