diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2007-08-17 06:45:18 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2007-08-17 06:45:18 +0000 |
| commit | 0fac492c3da8b46ad1cf5a668e5d851c63443a94 (patch) | |
| tree | 95fb6637601a4b3c730f4aec1d2e7e7ab78e208b /bootloader | |
| parent | 12706e4b1d4ce65df441dcf6e2b160657ea3fa38 (diff) | |
| download | rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.zip rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.tar.gz rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.tar.bz2 rockbox-0fac492c3da8b46ad1cf5a668e5d851c63443a94.tar.xz | |
First step of powermanagement rework: * Move target specific stuff into target tree, starting with battery voltage tables and voltage reading. (This revealed some incorrect percent_to_voltage_charging mappings). * Voltage reading on 1st gen ipods is now correct. * Clean up obsolete config #defines.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14375 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'bootloader')
| -rw-r--r-- | bootloader/iaudio_x5.c | 10 | ||||
| -rw-r--r-- | bootloader/iriver_h300.c | 10 | ||||
| -rw-r--r-- | bootloader/main.c | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/bootloader/iaudio_x5.c b/bootloader/iaudio_x5.c index a484bfa..11c5528 100644 --- a/bootloader/iaudio_x5.c +++ b/bootloader/iaudio_x5.c @@ -104,13 +104,11 @@ void shutdown(void) /* Print the battery voltage (and a warning message). */ void check_battery(void) { - int adc_battery, battery_voltage, batt_int, batt_frac; + int battery_voltage, batt_int, batt_frac; - adc_battery = adc_read(ADC_BATTERY); - - battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; + battery_voltage = battery_adc_voltage(); + batt_int = battery_voltage / 1000; + batt_frac = (battery_voltage % 1000) / 10; printf("Batt: %d.%02dV", batt_int, batt_frac); diff --git a/bootloader/iriver_h300.c b/bootloader/iriver_h300.c index 32950a5..dab3693 100644 --- a/bootloader/iriver_h300.c +++ b/bootloader/iriver_h300.c @@ -109,13 +109,11 @@ void shutdown(void) /* Print the battery voltage (and a warning message). */ void check_battery(void) { - int adc_battery, battery_voltage, batt_int, batt_frac; + int battery_voltage, batt_int, batt_frac; - adc_battery = adc_read(ADC_BATTERY); - - battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; + battery_voltage = battery_adc_voltage(); + batt_int = battery_voltage / 1000; + batt_frac = (battery_voltage % 1000) / 10; printf("Batt: %d.%02dV", batt_int, batt_frac); diff --git a/bootloader/main.c b/bootloader/main.c index d78b4ad..afaef69 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -167,13 +167,11 @@ void shutdown(void) /* Print the battery voltage (and a warning message). */ void check_battery(void) { - int adc_battery, battery_voltage, batt_int, batt_frac; + int battery_voltage, batt_int, batt_frac; - adc_battery = adc_read(ADC_BATTERY); - - battery_voltage = (adc_battery * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; + battery_voltage = battery_adc_voltage(); + batt_int = battery_voltage / 1000; + batt_frac = (battery_voltage % 1000) / 10; printf("Batt: %d.%02dV", batt_int, batt_frac); |