diff options
| author | Uwe Freese <thebreaker@rockbox.org> | 2002-12-16 15:02:23 +0000 |
|---|---|---|
| committer | Uwe Freese <thebreaker@rockbox.org> | 2002-12-16 15:02:23 +0000 |
| commit | ae1ba1d5de779ff66d5a86bfb6c5326f3e902ac3 (patch) | |
| tree | cb930eab113ca07cb9449ae9cb7d0a13f465c4b6 | |
| parent | 6ebf5e432aa6291c736bd27f5f3c9d7c7b49eb80 (diff) | |
| download | rockbox-ae1ba1d5de779ff66d5a86bfb6c5326f3e902ac3.zip rockbox-ae1ba1d5de779ff66d5a86bfb6c5326f3e902ac3.tar.gz rockbox-ae1ba1d5de779ff66d5a86bfb6c5326f3e902ac3.tar.bz2 rockbox-ae1ba1d5de779ff66d5a86bfb6c5326f3e902ac3.tar.xz | |
stupid bug, trickle setting in menu didn't work
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3007 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/settings_menu.c | 2 | ||||
| -rw-r--r-- | firmware/powermgmt.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apps/settings_menu.c b/apps/settings_menu.c index fbc1ad1..9e7320e 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -463,7 +463,7 @@ static bool trickle_charge(void) { bool result; result = set_bool( str(LANG_TRICKLE_CHARGE), &global_settings.trickle_charge ); - enable_trickle_charge(result); + enable_trickle_charge(global_settings.trickle_charge); return result; } #endif diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 49c27d9..7dcecb1 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c @@ -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_time = 0; 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 { /* 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_time = 0; 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 */ } } } |