From 430a354dfe1e1391530ce29e586d7217f8fd1aa2 Mon Sep 17 00:00:00 2001 From: Uwe Freese Date: Thu, 9 Jan 2003 20:16:37 +0000 Subject: better estimated running time for usb mode git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3047 a1c6a512-1295-4272-9138-f99709370657 --- firmware/powermgmt.c | 4 ++-- firmware/powermgmt.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 59d1a2fe7b..e640fdde06 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -368,14 +368,14 @@ static void power_thread(void) if (charge_state == 1) powermgmt_est_runningtime_min = (100 - battery_level()) * battery_capacity / 100 * 60 / CURRENT_CHARGING; else { - current = CURRENT_NORMAL; + current = usb_inserted() ? CURRENT_USB : CURRENT_NORMAL; if ((backlight_get_timeout() == 1) || (charger_inserted() && backlight_get_on_when_charging())) /* LED always on or LED on when charger connected */ current += CURRENT_BACKLIGHT; powermgmt_est_runningtime_min = battery_level() * battery_capacity / 100 * 60 / current; } #else - current = CURRENT_NORMAL; + current = usb_inserted() ? CURRENT_USB : CURRENT_NORMAL; if (backlight_get_timeout() == 1) /* LED always on */ current += CURRENT_BACKLIGHT; powermgmt_est_runningtime_min = battery_level() * battery_capacity / 100 * 60 / current; diff --git a/firmware/powermgmt.h b/firmware/powermgmt.h index b9686119c0..f4c772e221 100644 --- a/firmware/powermgmt.h +++ b/firmware/powermgmt.h @@ -66,6 +66,7 @@ extern int charge_state; /* tells what the charger is doing (for info di #endif /* HAVE_CHARGE_CTRL */ #define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ +#define CURRENT_USB 500 /* usual current in mA in USB mode */ #define CURRENT_BACKLIGHT 30 /* additional current when backlight is always on */ #define CURRENT_CHARGING 300 /* charging current */ -- cgit v1.2.3