summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-12-03 14:33:20 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-12-03 14:33:20 +0000
commit040816d173a633f13601204e4c66401d9468cc8a (patch)
treed18866c250aa1356aa2170364a1bd5aa88286ba6
parentf09c5f4c63e51cc05a9737d3d82dac90054a3b5e (diff)
downloadrockbox-040816d173a633f13601204e4c66401d9468cc8a.zip
rockbox-040816d173a633f13601204e4c66401d9468cc8a.tar.gz
rockbox-040816d173a633f13601204e4c66401d9468cc8a.tar.bz2
rockbox-040816d173a633f13601204e4c66401d9468cc8a.tar.xz
Fixed build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2914 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/debug_menu.c2
-rw-r--r--firmware/powermgmt.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 772e932..571ab09 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -820,7 +820,7 @@ bool view_battery(void)
snprintf(buf, 30, "resulting act.lev: %d%%", battery_level());
lcd_puts(0, 5, buf);
- snprintf(buf, 30, "Est. remaining: %d m", powermgmt_est_runningtime_min);
+ snprintf(buf, 30, "Est. remaining: %d m", battery_time());
lcd_puts(0, 6, buf);
#ifdef HAVE_CHARGE_CTRL
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 0db7511..3ccb57f 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -68,10 +68,12 @@ static int percent_to_volt_nocharge[11] = /* voltages (centivolt) of 0%, 10%, ..
450, 481, 491, 497, 503, 507, 512, 514, 517, 528, 560
};
+#ifdef HAVE_CHARGE_CTRL
static int percent_to_volt_charge[11] = /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */
{
476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585
};
+#endif
int battery_lazyness[20] = /* how does the battery react when plugging in/out the charger */
{