From 72550d94b6688fa2b00bcf5fb759a1b9adfcad34 Mon Sep 17 00:00:00 2001 From: Miika Pekkarinen Date: Tue, 5 Jul 2005 07:09:19 +0000 Subject: More accurate runtime estimate calculation for iriver (still not very accurate with other than 128k mp3 files). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7021 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/powermgmt.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index e32867a188..e4c7d65d45 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -92,18 +92,22 @@ extern charge_state_type charge_state; #endif /* defined(HAVE_CHARGE_CTRL) || (CONFIG_BATTERY == BATT_LIION2200) */ #ifdef HAVE_MMC /* Values for Ondio */ -#define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ -#define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ -#define CURRENT_BACKLIGHT 0 /* no backlight */ +# define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ +# define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ +# define CURRENT_BACKLIGHT 0 /* no backlight */ #else /* Values for HD based jukeboxes */ -#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_MIN_CHG 70 /* minimum charge current */ -#define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ -#define CURRENT_MAX_CHG 350 /* maximum charging current */ -#define MAX_CHG_V 10250 /* anything over 10.25v gives CURRENT_MAX_CHG */ +# ifdef IRIVER_H100 +# define CURRENT_NORMAL 80 +# else +# define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ +# endif /* not IRIVER_H100 */ +# define CURRENT_USB 500 /* usual current in mA in USB mode */ +# define CURRENT_BACKLIGHT 30 /* additional current when backlight is always on */ + +# define CURRENT_MIN_CHG 70 /* minimum charge current */ +# define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ +# define CURRENT_MAX_CHG 350 /* maximum charging current */ +# define MAX_CHG_V 10250 /* anything over 10.25v gives CURRENT_MAX_CHG */ #endif /* HAVE_MMC */ extern unsigned int bat; /* filtered battery voltage, centivolts */ -- cgit v1.2.3