devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

battery capacity setting function

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2997 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Uwe Freese 2002-12-14 22:46:00 +00:00
parent e2a6aee661
commit c29b538440
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
firmware/powermgmt.c
View file

@ -79,12 +79,18 @@ int powermgmt_last_cycle_level = 0; /* which level had the batteries at
bool trickle_charge_enabled = true; bool trickle_charge_enabled = true;
int trickle_sec = 0; /* how many seconds should the charger be enabled per minute for trickle charging? */ int trickle_sec = 0; /* how many seconds should the charger be enabled per minute for trickle charging? */
int charge_state = 0; /* at the beginning, the charger does nothing */ int charge_state = 0; /* at the beginning, the charger does nothing */
int battery_capacity = 1800; /* only a default value */
static int percent_to_volt_charge[11] = /* voltages (centivolt) of 0%, 10%, ... 100% when charging enabled */ 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 476, 544, 551, 556, 561, 564, 566, 576, 582, 584, 585
}; };
void set_battery_capacity(int capacity)
{
battery_capacity = capacity;
}
void enable_trickle_charge(bool on) void enable_trickle_charge(bool on)
{ {
trickle_charge_enabled = on; trickle_charge_enabled = on;
@ -345,22 +351,22 @@ static void power_thread(void)
/* so consider it because there's the battery lazyness inside the the battery_level */ /* so consider it because there's the battery lazyness inside the the battery_level */
if (powermgmt_last_cycle_startstop_min < 20) { if (powermgmt_last_cycle_startstop_min < 20) {
i = (100 - battery_lazyness[powermgmt_last_cycle_startstop_min]) * 30 / 100 ; /* 0..30 */ i = (100 - battery_lazyness[powermgmt_last_cycle_startstop_min]) * 30 / 100 ; /* 0..30 */
powermgmt_est_runningtime_min = (100 - battery_level()) * BATTERY_CAPACITY / 100 * (100 + i) / 100 * 60 / CURRENT_CHARGING; powermgmt_est_runningtime_min = (100 - battery_level()) * battery_capacity / 100 * (100 + i) / 100 * 60 / CURRENT_CHARGING;
} else { } else {
powermgmt_est_runningtime_min = (100 - battery_level()) * BATTERY_CAPACITY / 100 * 60 / CURRENT_CHARGING; powermgmt_est_runningtime_min = (100 - battery_level()) * battery_capacity / 100 * 60 / CURRENT_CHARGING;
} }
else { else {
current = CURRENT_NORMAL; current = CURRENT_NORMAL;
if ((backlight_get_timeout() == 1) || (charger_inserted() && backlight_get_on_when_charging())) if ((backlight_get_timeout() == 1) || (charger_inserted() && backlight_get_on_when_charging()))
/* LED always on or LED on when charger connected */ /* LED always on or LED on when charger connected */
current += CURRENT_BACKLIGHT; current += CURRENT_BACKLIGHT;
powermgmt_est_runningtime_min = battery_level() * BATTERY_CAPACITY / 100 * 60 / current; powermgmt_est_runningtime_min = battery_level() * battery_capacity / 100 * 60 / current;
} }
#else #else
current = CURRENT_NORMAL; current = CURRENT_NORMAL;
if (backlight_get_timeout() == 1) /* LED always on */ if (backlight_get_timeout() == 1) /* LED always on */
current += CURRENT_BACKLIGHT; current += CURRENT_BACKLIGHT;
powermgmt_est_runningtime_min = battery_level() * BATTERY_CAPACITY / 100 * 60 / current; powermgmt_est_runningtime_min = battery_level() * battery_capacity / 100 * 60 / current;
#endif #endif
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL
@ -479,7 +485,7 @@ static void power_thread(void)
} else { } else {
/* calculate max charge time depending on current battery level */ /* calculate max charge time depending on current battery level */
/* take 35% more because battery level is not linear */ /* take 35% more because battery level is not linear */
i = CHARGE_MAX_TIME_1500 * BATTERY_CAPACITY / 1500; i = CHARGE_MAX_TIME_1500 * battery_capacity / 1500;
charge_max_time_now = i * (100 + 35 - battery_level()) / 100; charge_max_time_now = i * (100 + 35 - battery_level()) / 100;
if (charge_max_time_now > i) { if (charge_max_time_now > i) {
charge_max_time_now = i; charge_max_time_now = i;
@ -542,7 +548,7 @@ void power_init(void)
flickering during the first minute of execution */ flickering during the first minute of execution */
power_history[POWER_HISTORY_LEN-1] = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000; power_history[POWER_HISTORY_LEN-1] = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000;
/* calculate the remaining time to that the info screen displays something useful */ /* calculate the remaining time to that the info screen displays something useful */
powermgmt_est_runningtime_min = battery_level() * BATTERY_CAPACITY / 100 * 60 / CURRENT_NORMAL; powermgmt_est_runningtime_min = battery_level() * battery_capacity / 100 * 60 / CURRENT_NORMAL;
#ifdef HAVE_CHARGE_CTRL #ifdef HAVE_CHARGE_CTRL
snprintf(power_message, POWER_MESSAGE_LEN, "Powermgmt started"); snprintf(power_message, POWER_MESSAGE_LEN, "Powermgmt started");

2
firmware/powermgmt.h
View file

@ -59,12 +59,12 @@ extern int powermgmt_last_cycle_level; /* which level had the batteries
extern int battery_lazyness[20]; /* how does the battery react when plugging in/out the charger */ extern int battery_lazyness[20]; /* how does the battery react when plugging in/out the charger */
void enable_trickle_charge(bool on); void enable_trickle_charge(bool on);
void set_battery_capacity(int capacity); /* set local battery capacity value */
extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */ extern int trickle_sec; /* trickle charge: How many seconds per minute are we charging actually? */
extern int charge_state; /* tells what the charger is doing (for info display): 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */ extern int charge_state; /* tells what the charger is doing (for info display): 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */
#endif /* HAVE_CHARGE_CTRL */ #endif /* HAVE_CHARGE_CTRL */
#define BATTERY_CAPACITY 1800 /* battery capacity in mAh for runtime estimation */
#define CURRENT_NORMAL 145 /* usual current in mA when using the AJB including some disk/backlight/... activity */ #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 is always on */ #define CURRENT_BACKLIGHT 30 /* additional current when backlight is always on */
#define CURRENT_CHARGING 300 /* charging current */ #define CURRENT_CHARGING 300 /* charging current */