diff options
| author | Robert Kukla <roolku@rockbox.org> | 2008-03-11 09:38:12 +0000 |
|---|---|---|
| committer | Robert Kukla <roolku@rockbox.org> | 2008-03-11 09:38:12 +0000 |
| commit | 6a6c820f5f27b7e0d64a7c3e0cd546db7385bb49 (patch) | |
| tree | a0e8998dffcf75f2ee096f565c6caa5521f89dd2 /firmware/target/arm/olympus/mrobe-100 | |
| parent | c194b388fa04b2a89f361eea45e14f2796402306 (diff) | |
| download | rockbox-6a6c820f5f27b7e0d64a7c3e0cd546db7385bb49.tar.gz rockbox-6a6c820f5f27b7e0d64a7c3e0cd546db7385bb49.zip | |
m:robe 100 - remove ugly workaround for false initial voltage readings and wait until readings have settled instead
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16626 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/olympus/mrobe-100')
| -rw-r--r-- | firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c b/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c index 4bb60c3014..71781182fa 100644 --- a/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c +++ b/firmware/target/arm/olympus/mrobe-100/powermgmt-mr100.c @@ -22,9 +22,6 @@ #include "adc.h" #include "powermgmt.h" -/* FIXME: All voltages copied from H10/Tatung Elio. This will need changing - proper power management. */ - const unsigned short battery_level_dangerous[BATTERY_TYPES_COUNT] = { 3450 @@ -61,7 +58,5 @@ const unsigned short percent_to_volt_charge[11] = /* Returns battery voltage from ADC [millivolts] */ unsigned int battery_adc_voltage(void) { - /* work around the inital (false) high readout */ - int readout=adc_read(ADC_UNREG_POWER); - return (readout>700) ? 3480 : (readout * BATTERY_SCALE_FACTOR) >> 10; + return (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) >> 10; } |