From 7906ed34272e1781f94e3b863be71a6d7d5811cc Mon Sep 17 00:00:00 2001 From: Nils Wallménius Date: Tue, 15 May 2007 21:21:52 +0000 Subject: Make it possible to select the correct battery capacity on ipod video, default is the 30GB models 400mAh, discharge curve and runtime estimation is still no calibrated. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13395 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-ipodvideo.h | 6 +++--- firmware/export/powermgmt.h | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h index e10a7f9e55..b5318d755c 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -66,7 +66,7 @@ /* We can fade the backlight by using PWM */ #define HAVE_BACKLIGHT_PWM_FADING -#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */ +#define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */ #ifndef SIMULATOR @@ -80,8 +80,8 @@ /* Type of mobile power */ #define CONFIG_BATTERY BATT_LIPOL1300 -#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ +#define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */ +#define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ #define BATTERY_CAPACITY_INC 50 /* capacity increment */ #define BATTERY_TYPES_COUNT 1 /* only one type */ #define BATTERY_SCALE_FACTOR 5865 diff --git a/firmware/export/powermgmt.h b/firmware/export/powermgmt.h index fc7a0de171..b8e8b580d1 100644 --- a/firmware/export/powermgmt.h +++ b/firmware/export/powermgmt.h @@ -98,21 +98,22 @@ extern charger_input_state_type charger_input_state; # define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ # define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ # define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ -#else -# define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ -# define CURRENT_BACKLIGHT 30 /* additional current when backlight always on */ -#endif /* not IRIVER_H100_SERIES */ -#define CURRENT_USB 500 /* usual current in mA in USB mode */ -#ifdef IRIVER_H100_SERIES # define CURRENT_RECORD 105 /* additional current while recording */ #elif defined(IRIVER_H300_SERIES) -# define CURRENT_RECORD 110 -#elif defined(HAVE_RECORDING) +# define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery from IriverRuntime wiki page */ +# define CURRENT_BACKLIGHT 23 /* FIXME: This needs to be measured, copied from H100 */ +# define CURRENT_RECORD 110 /* additional current while recording */ +#else /* Not iriver H1x0, H3x0, nor Archos Ondio */ +# define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ +# define CURRENT_BACKLIGHT 30 /* additional current when backlight always on */ +#if defined(HAVE_RECORDING) # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ #endif +#endif /* Not Archos Ondio */ +#define CURRENT_USB 500 /* usual current in mA in USB mode */ #ifdef HAVE_REMOTE_LCD # define CURRENT_REMOTE 8 /* add. current when H100-remote connected */ -#endif +#endif /* HAVE_MMC */ # define CURRENT_MIN_CHG 70 /* minimum charge current */ # define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ -- cgit v1.2.3