From 34351e8251348ae5cb35d8b98cc4095406268335 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Wed, 4 Dec 2002 11:25:56 +0000 Subject: Moved runtime-reset-when-charger-connected to status.c git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2925 a1c6a512-1295-4272-9138-f99709370657 --- apps/settings.c | 11 +++-------- apps/status.c | 2 ++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'apps') diff --git a/apps/settings.c b/apps/settings.c index 3bfbd9670f..cd838b9627 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -349,14 +349,9 @@ int settings_save( void ) { static long lasttime = 0; - /* reset counter if charger is inserted */ - if ( charger_inserted() ) { - global_settings.runtime = 0; - } - else { - global_settings.runtime += (current_tick - lasttime) / HZ; - lasttime = current_tick; - } + global_settings.runtime += (current_tick - lasttime) / HZ; + lasttime = current_tick; + if ( global_settings.runtime > global_settings.topruntime ) global_settings.topruntime = global_settings.runtime; diff --git a/apps/status.c b/apps/status.c index 31d2cbe2cf..8e4a2c9b08 100644 --- a/apps/status.c +++ b/apps/status.c @@ -137,6 +137,7 @@ void status_draw(void) } if(charger_inserted()) { + global_settings.runtime = 0; if(TIME_AFTER(current_tick, switch_tick)) { lcd_icon(ICON_BATTERY, true); @@ -202,6 +203,7 @@ void status_draw(void) battery_state = true; plug_state = true; if(charger_enabled) { /* animate battery if charging */ + global_settings.runtime = 0; battlevel = battery_charge_step * 34; /* 34 for a better look */ battlevel = battlevel > 100 ? 100 : battlevel; if(TIME_AFTER(current_tick, switch_tick)) { -- cgit v1.2.3