From 1cf6fa07d5b336cd82cb0586f47b69cc92a13b7c Mon Sep 17 00:00:00 2001 From: Markus Braun Date: Mon, 12 Aug 2002 12:31:36 +0000 Subject: 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 --- apps/status.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'apps/status.c') 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) statusbar_wipe(); #ifdef HAVE_CHARGE_CTRL if(charger_inserted()) { - battery_state=true; + battery_state = true; if(!charger_enabled) - plug_state=true; + plug_state = true; else if(TIME_AFTER(current_tick, switch_tick)) { - plug_state=!plug_state; - switch_tick=current_tick+HZ; + plug_state = !plug_state; + switch_tick = current_tick + HZ; } } else { plug_state=false; - if(battlevel > (BATTERY_LEVEL_DANGEROUS-BATTERY_LEVEL_EMPTY)*100/BATTERY_RANGE) - battery_state=true; + if(battlevel > battery_level_safe()) + battery_state = true; else if(TIME_AFTER(current_tick, switch_tick)) { - switch_tick=current_tick+HZ; - battery_state=!battery_state; + switch_tick = current_tick+HZ; + battery_state =! battery_state; } } - if(battery_state) statusbar_icon_battery(battlevel,plug_state); + if(battery_state) statusbar_icon_battery(battlevel, plug_state); #else - statusbar_icon_battery(battlevel,false); + statusbar_icon_battery(battlevel, false); #endif statusbar_icon_volume(volume); - statusbar_icon_play_state(current_mode+Icon_Play); + statusbar_icon_play_state(current_mode + Icon_Play); if (global_settings.loop_playlist) statusbar_icon_play_mode(Icon_Repeat); else statusbar_icon_play_mode(Icon_Normal); - if(global_settings.playlist_shuffle) statusbar_icon_shuffle(); - if (keys_locked) statusbar_icon_lock(); + if(global_settings.playlist_shuffle) + statusbar_icon_shuffle(); + if (keys_locked) + statusbar_icon_lock(); #ifdef HAVE_RTC statusbar_time(); #endif -- cgit v1.2.3