diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-11-30 10:55:09 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-11-30 10:55:09 +0000 |
commit | c21180fb069345c572b3d529516d04f7d7e97a1f (patch) | |
tree | 3a72613aef03aefc38d9cf2577986b3a068d56e3 | |
parent | 124f8dec6365b3e1e50eca11afe278183842db68 (diff) | |
download | rockbox-c21180fb069345c572b3d529516d04f7d7e97a1f.tar.gz rockbox-c21180fb069345c572b3d529516d04f7d7e97a1f.zip |
Delay reading the first battery level for at least 1 tick. Seems to fix the low battery shutdown problem on 3g. Reenable the low battery shutdown on 3g.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15857 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/export/config-ipod3g.h | 3 | ||||
-rw-r--r-- | firmware/powermgmt.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h index 036ecca324..ed0a557299 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h | |||
@@ -2,9 +2,6 @@ | |||
2 | * This config file is for the Apple iPod 3g | 2 | * This config file is for the Apple iPod 3g |
3 | */ | 3 | */ |
4 | 4 | ||
5 | /* Temp measure until the low batt problem is figured out */ | ||
6 | #define NO_LOW_BATTERY_SHUTDOWN | ||
7 | |||
8 | #define TARGET_TREE /* this target is using the target tree system */ | 5 | #define TARGET_TREE /* this target is using the target tree system */ |
9 | 6 | ||
10 | #define IPOD_ARCH 1 | 7 | #define IPOD_ARCH 1 |
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index 18764591ab..d1efa29dca 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
@@ -797,6 +797,9 @@ static void power_thread(void) | |||
797 | int last_disk_activity = CHARGE_END_LONGD + 1; /* last hdd use x mins ago */ | 797 | int last_disk_activity = CHARGE_END_LONGD + 1; /* last hdd use x mins ago */ |
798 | #endif | 798 | #endif |
799 | 799 | ||
800 | /* Delay reading the first battery level */ | ||
801 | sleep(HZ/100); | ||
802 | |||
800 | /* initialize the voltages for the exponential filter */ | 803 | /* initialize the voltages for the exponential filter */ |
801 | avgbat = battery_adc_voltage() + 15; | 804 | avgbat = battery_adc_voltage() + 15; |
802 | 805 | ||