diff options
| author | Heikki Hannikainen <hessuh@rockbox.org> | 2002-08-07 11:22:26 +0000 |
|---|---|---|
| committer | Heikki Hannikainen <hessuh@rockbox.org> | 2002-08-07 11:22:26 +0000 |
| commit | 39243bceed2e988791b9654ed0fca2ab0806bb9f (patch) | |
| tree | fe40f6dbac1545260cfefff1c84c3f237698d8c0 | |
| parent | 9dbd5eddd075746fb37d816a90ad23a2099fd2ee (diff) | |
| download | rockbox-39243bceed2e988791b9654ed0fca2ab0806bb9f.zip rockbox-39243bceed2e988791b9654ed0fca2ab0806bb9f.tar.gz rockbox-39243bceed2e988791b9654ed0fca2ab0806bb9f.tar.bz2 rockbox-39243bceed2e988791b9654ed0fca2ab0806bb9f.tar.xz | |
Made battery_level() use the power history table to get an average battery level over the last 3 minutes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1585 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/drivers/power.c | 29 | ||||
| -rw-r--r-- | firmware/drivers/power.h | 13 |
2 files changed, 0 insertions, 42 deletions
diff --git a/firmware/drivers/power.c b/firmware/drivers/power.c index 559509f..4a45041 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c @@ -37,29 +37,6 @@ bool charger_inserted(void) #endif } -/* Returns battery level in percent */ -int battery_level(void) -{ - int level; - - level = adc_read(ADC_UNREG_POWER); - if(level < 0) - level = 0; - - if(level > BATTERY_LEVEL_FULL) - level = BATTERY_LEVEL_FULL; - - if(level < BATTERY_LEVEL_EMPTY) - level = BATTERY_LEVEL_EMPTY; - - return ((level-BATTERY_LEVEL_EMPTY) * 100) / BATTERY_RANGE; -} - -bool battery_level_safe(void) -{ - return adc_read(ADC_UNREG_POWER) > BATTERY_LEVEL_DANGEROUS; -} - void charger_enable(bool on) { #ifdef HAVE_CHARGE_CTRL @@ -105,12 +82,6 @@ bool charger_inserted(void) return false; } -/* Returns battery level in percent */ -int battery_level(void) -{ - return 100; -} - void charger_enable(bool on) { on = on; diff --git a/firmware/drivers/power.h b/firmware/drivers/power.h index fe7d443..f4e7a0b 100644 --- a/firmware/drivers/power.h +++ b/firmware/drivers/power.h @@ -19,13 +19,6 @@ #ifndef _POWER_H_ #define _POWER_H_ -#define BATTERY_LEVEL_SHUTDOWN (4500000 / BATTERY_SCALE_FACTOR) /* 4.5V */ -#define BATTERY_LEVEL_EMPTY (4650000 / BATTERY_SCALE_FACTOR) /* 4.65V */ -#define BATTERY_LEVEL_DANGEROUS (4750000 / BATTERY_SCALE_FACTOR) /* 4.75V */ -#define BATTERY_LEVEL_FULL (5200000 / BATTERY_SCALE_FACTOR) /* 5.2V */ - -#define BATTERY_RANGE (BATTERY_LEVEL_FULL - BATTERY_LEVEL_EMPTY) - #ifdef HAVE_CHARGE_CTRL extern bool charger_enabled; #endif @@ -35,10 +28,4 @@ void charger_enable(bool on); void ide_power_enable(bool on); void power_off(void); -/* Returns battery level in percent */ -int battery_level(void); - -/* Tells if the battery level is safe for disk writes */ -bool battery_level_safe(void); - #endif |