1
0
Fork 0
forked from len0rd/rockbox

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
This commit is contained in:
Nils Wallménius 2007-05-15 21:21:52 +00:00
parent 95b52a0d00
commit 7906ed3427
2 changed files with 13 additions and 12 deletions

View file

@ -66,7 +66,7 @@
/* We can fade the backlight by using PWM */ /* We can fade the backlight by using PWM */
#define HAVE_BACKLIGHT_PWM_FADING #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 #ifndef SIMULATOR
@ -80,8 +80,8 @@
/* Type of mobile power */ /* Type of mobile power */
#define CONFIG_BATTERY BATT_LIPOL1300 #define CONFIG_BATTERY BATT_LIPOL1300
#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ #define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */
#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ #define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */
#define BATTERY_CAPACITY_INC 50 /* capacity increment */ #define BATTERY_CAPACITY_INC 50 /* capacity increment */
#define BATTERY_TYPES_COUNT 1 /* only one type */ #define BATTERY_TYPES_COUNT 1 /* only one type */
#define BATTERY_SCALE_FACTOR 5865 #define BATTERY_SCALE_FACTOR 5865

View file

@ -98,21 +98,22 @@ extern charger_input_state_type charger_input_state;
# define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ # define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */
# define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ # define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */
# define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ # 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 */ # define CURRENT_RECORD 105 /* additional current while recording */
#elif defined(IRIVER_H300_SERIES) #elif defined(IRIVER_H300_SERIES)
# define CURRENT_RECORD 110 # define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery from IriverRuntime wiki page */
#elif defined(HAVE_RECORDING) # 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 */ # define CURRENT_RECORD 35 /* FIXME: this needs adjusting */
#endif #endif
#endif /* Not Archos Ondio */
#define CURRENT_USB 500 /* usual current in mA in USB mode */
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
# define CURRENT_REMOTE 8 /* add. current when H100-remote connected */ # define CURRENT_REMOTE 8 /* add. current when H100-remote connected */
#endif #endif /* HAVE_MMC */
# define CURRENT_MIN_CHG 70 /* minimum charge current */ # define CURRENT_MIN_CHG 70 /* minimum charge current */
# define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */ # define MIN_CHG_V 8500 /* at 8.5v charger voltage get CURRENT_MIN_CHG */