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 /apps/settings_list.c | |
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 'apps/settings_list.c')
-rw-r--r-- | apps/settings_list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index c9003bb8f3..dff5ed26f4 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -838,7 +838,7 @@ const struct settings_list settings[] = { | |||
838 | NULL, NULL, NULL), | 838 | NULL, NULL, NULL), |
839 | /* use this setting for user code even if there's no exchangable battery | 839 | /* use this setting for user code even if there's no exchangable battery |
840 | * support enabled */ | 840 | * support enabled */ |
841 | #ifdef BATTERY_CAPACITY_DEFAULT | 841 | #if BATTERY_CAPACITY_DEFAULT > 0 |
842 | /* define min/max/inc for this file if there's only one battery */ | 842 | /* define min/max/inc for this file if there's only one battery */ |
843 | #ifndef BATTERY_CAPACITY_MIN | 843 | #ifndef BATTERY_CAPACITY_MIN |
844 | #define BATTERY_CAPACITY_MIN BATTERY_CAPACITY_DEFAULT | 844 | #define BATTERY_CAPACITY_MIN BATTERY_CAPACITY_DEFAULT |