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

stupid bug, trickle setting in menu didn't work

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3007 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Uwe Freese 2002-12-16 15:02:23 +00:00
parent 6ebf5e432a
commit ae1ba1d5de
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/settings_menu.c
View file

@ -463,7 +463,7 @@ static bool trickle_charge(void)
{ {
bool result; bool result;
result = set_bool( str(LANG_TRICKLE_CHARGE), &global_settings.trickle_charge ); result = set_bool( str(LANG_TRICKLE_CHARGE), &global_settings.trickle_charge );
enable_trickle_charge(result); enable_trickle_charge(global_settings.trickle_charge);
return result; return result;
} }
#endif #endif

4
firmware/powermgmt.c
View file

@ -422,6 +422,8 @@ static void power_thread(void)
trickle_sec = CURRENT_NORMAL * 60 / CURRENT_CHARGING; /* first guess, maybe consider if LED backlight is on, disk is active,... */ trickle_sec = CURRENT_NORMAL * 60 / CURRENT_CHARGING; /* first guess, maybe consider if LED backlight is on, disk is active,... */
trickle_time = 0; trickle_time = 0;
charge_state = 2; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */ charge_state = 2; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */
} else {
charge_state = 0; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */
} }
} else { } else {
/* if we didn't disable the charger in the previous test, check for low positive delta */ /* if we didn't disable the charger in the previous test, check for low positive delta */
@ -444,6 +446,8 @@ static void power_thread(void)
trickle_sec = CURRENT_NORMAL * 60 / CURRENT_CHARGING; /* first guess, maybe consider if LED backlight is on, disk is active,... */ trickle_sec = CURRENT_NORMAL * 60 / CURRENT_CHARGING; /* first guess, maybe consider if LED backlight is on, disk is active,... */
trickle_time = 0; trickle_time = 0;
charge_state = 2; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */ charge_state = 2; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */
} else {
charge_state = 0; /* 0: decharging/charger off, 1: charge, 2: top-off, 3: trickle */
} }
} }
} }