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.tar.gz rockbox-39243bceed2e988791b9654ed0fca2ab0806bb9f.zip |
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 559509fa67..4a45041325 100644 --- a/firmware/drivers/power.c +++ b/firmware/drivers/power.c | |||
@@ -37,29 +37,6 @@ bool charger_inserted(void) | |||
37 | #endif | 37 | #endif |
38 | } | 38 | } |
39 | 39 | ||
40 | /* Returns battery level in percent */ | ||
41 | int battery_level(void) | ||
42 | { | ||
43 | int level; | ||
44 | |||
45 | level = adc_read(ADC_UNREG_POWER); | ||
46 | if(level < 0) | ||
47 | level = 0; | ||
48 | |||
49 | if(level > BATTERY_LEVEL_FULL) | ||
50 | level = BATTERY_LEVEL_FULL; | ||
51 | |||
52 | if(level < BATTERY_LEVEL_EMPTY) | ||
53 | level = BATTERY_LEVEL_EMPTY; | ||
54 | |||
55 | return ((level-BATTERY_LEVEL_EMPTY) * 100) / BATTERY_RANGE; | ||
56 | } | ||
57 | |||
58 | bool battery_level_safe(void) | ||
59 | { | ||
60 | return adc_read(ADC_UNREG_POWER) > BATTERY_LEVEL_DANGEROUS; | ||
61 | } | ||
62 | |||
63 | void charger_enable(bool on) | 40 | void charger_enable(bool on) |
64 | { | 41 | { |
65 | #ifdef HAVE_CHARGE_CTRL | 42 | #ifdef HAVE_CHARGE_CTRL |
@@ -105,12 +82,6 @@ bool charger_inserted(void) | |||
105 | return false; | 82 | return false; |
106 | } | 83 | } |
107 | 84 | ||
108 | /* Returns battery level in percent */ | ||
109 | int battery_level(void) | ||
110 | { | ||
111 | return 100; | ||
112 | } | ||
113 | |||
114 | void charger_enable(bool on) | 85 | void charger_enable(bool on) |
115 | { | 86 | { |
116 | on = on; | 87 | on = on; |
diff --git a/firmware/drivers/power.h b/firmware/drivers/power.h index fe7d443bef..f4e7a0b990 100644 --- a/firmware/drivers/power.h +++ b/firmware/drivers/power.h | |||
@@ -19,13 +19,6 @@ | |||
19 | #ifndef _POWER_H_ | 19 | #ifndef _POWER_H_ |
20 | #define _POWER_H_ | 20 | #define _POWER_H_ |
21 | 21 | ||
22 | #define BATTERY_LEVEL_SHUTDOWN (4500000 / BATTERY_SCALE_FACTOR) /* 4.5V */ | ||
23 | #define BATTERY_LEVEL_EMPTY (4650000 / BATTERY_SCALE_FACTOR) /* 4.65V */ | ||
24 | #define BATTERY_LEVEL_DANGEROUS (4750000 / BATTERY_SCALE_FACTOR) /* 4.75V */ | ||
25 | #define BATTERY_LEVEL_FULL (5200000 / BATTERY_SCALE_FACTOR) /* 5.2V */ | ||
26 | |||
27 | #define BATTERY_RANGE (BATTERY_LEVEL_FULL - BATTERY_LEVEL_EMPTY) | ||
28 | |||
29 | #ifdef HAVE_CHARGE_CTRL | 22 | #ifdef HAVE_CHARGE_CTRL |
30 | extern bool charger_enabled; | 23 | extern bool charger_enabled; |
31 | #endif | 24 | #endif |
@@ -35,10 +28,4 @@ void charger_enable(bool on); | |||
35 | void ide_power_enable(bool on); | 28 | void ide_power_enable(bool on); |
36 | void power_off(void); | 29 | void power_off(void); |
37 | 30 | ||
38 | /* Returns battery level in percent */ | ||
39 | int battery_level(void); | ||
40 | |||
41 | /* Tells if the battery level is safe for disk writes */ | ||
42 | bool battery_level_safe(void); | ||
43 | |||
44 | #endif | 31 | #endif |