diff options
author | Markus Braun <markus.braun@krawel.de> | 2002-08-12 12:31:36 +0000 |
---|---|---|
committer | Markus Braun <markus.braun@krawel.de> | 2002-08-12 12:31:36 +0000 |
commit | 1cf6fa07d5b336cd82cb0586f47b69cc92a13b7c (patch) | |
tree | 4fcd3e06d7e13cdbc2868f2484cd6617aba54fe2 /apps | |
parent | cccb8d0a644e40e03665ab68342fc73296a0f7a4 (diff) | |
download | rockbox-1cf6fa07d5b336cd82cb0586f47b69cc92a13b7c.tar.gz rockbox-1cf6fa07d5b336cd82cb0586f47b69cc92a13b7c.zip |
now uses battery_level_safe() to determine when to blink
inserted "free" spaces
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1684 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/status.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/apps/status.c b/apps/status.c index 9744cd51ea..f3d3a1a861 100644 --- a/apps/status.c +++ b/apps/status.c | |||
@@ -134,37 +134,39 @@ void status_draw(void) | |||
134 | statusbar_wipe(); | 134 | statusbar_wipe(); |
135 | #ifdef HAVE_CHARGE_CTRL | 135 | #ifdef HAVE_CHARGE_CTRL |
136 | if(charger_inserted()) { | 136 | if(charger_inserted()) { |
137 | battery_state=true; | 137 | battery_state = true; |
138 | if(!charger_enabled) | 138 | if(!charger_enabled) |
139 | plug_state=true; | 139 | plug_state = true; |
140 | else if(TIME_AFTER(current_tick, switch_tick)) { | 140 | else if(TIME_AFTER(current_tick, switch_tick)) { |
141 | plug_state=!plug_state; | 141 | plug_state = !plug_state; |
142 | switch_tick=current_tick+HZ; | 142 | switch_tick = current_tick + HZ; |
143 | } | 143 | } |
144 | } | 144 | } |
145 | else { | 145 | else { |
146 | plug_state=false; | 146 | plug_state=false; |
147 | if(battlevel > (BATTERY_LEVEL_DANGEROUS-BATTERY_LEVEL_EMPTY)*100/BATTERY_RANGE) | 147 | if(battlevel > battery_level_safe()) |
148 | battery_state=true; | 148 | battery_state = true; |
149 | else | 149 | else |
150 | if(TIME_AFTER(current_tick, switch_tick)) { | 150 | if(TIME_AFTER(current_tick, switch_tick)) { |
151 | switch_tick=current_tick+HZ; | 151 | switch_tick = current_tick+HZ; |
152 | battery_state=!battery_state; | 152 | battery_state =! battery_state; |
153 | } | 153 | } |
154 | } | 154 | } |
155 | 155 | ||
156 | if(battery_state) statusbar_icon_battery(battlevel,plug_state); | 156 | if(battery_state) statusbar_icon_battery(battlevel, plug_state); |
157 | #else | 157 | #else |
158 | statusbar_icon_battery(battlevel,false); | 158 | statusbar_icon_battery(battlevel, false); |
159 | #endif | 159 | #endif |
160 | statusbar_icon_volume(volume); | 160 | statusbar_icon_volume(volume); |
161 | statusbar_icon_play_state(current_mode+Icon_Play); | 161 | statusbar_icon_play_state(current_mode + Icon_Play); |
162 | if (global_settings.loop_playlist) | 162 | if (global_settings.loop_playlist) |
163 | statusbar_icon_play_mode(Icon_Repeat); | 163 | statusbar_icon_play_mode(Icon_Repeat); |
164 | else | 164 | else |
165 | statusbar_icon_play_mode(Icon_Normal); | 165 | statusbar_icon_play_mode(Icon_Normal); |
166 | if(global_settings.playlist_shuffle) statusbar_icon_shuffle(); | 166 | if(global_settings.playlist_shuffle) |
167 | if (keys_locked) statusbar_icon_lock(); | 167 | statusbar_icon_shuffle(); |
168 | if (keys_locked) | ||
169 | statusbar_icon_lock(); | ||
168 | #ifdef HAVE_RTC | 170 | #ifdef HAVE_RTC |
169 | statusbar_time(); | 171 | statusbar_time(); |
170 | #endif | 172 | #endif |