diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/settings.c | 11 | ||||
-rw-r--r-- | apps/status.c | 2 |
2 files changed, 5 insertions, 8 deletions
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 ) | |||
349 | { | 349 | { |
350 | static long lasttime = 0; | 350 | static long lasttime = 0; |
351 | 351 | ||
352 | /* reset counter if charger is inserted */ | 352 | global_settings.runtime += (current_tick - lasttime) / HZ; |
353 | if ( charger_inserted() ) { | 353 | lasttime = current_tick; |
354 | global_settings.runtime = 0; | 354 | |
355 | } | ||
356 | else { | ||
357 | global_settings.runtime += (current_tick - lasttime) / HZ; | ||
358 | lasttime = current_tick; | ||
359 | } | ||
360 | if ( global_settings.runtime > global_settings.topruntime ) | 355 | if ( global_settings.runtime > global_settings.topruntime ) |
361 | global_settings.topruntime = global_settings.runtime; | 356 | global_settings.topruntime = global_settings.runtime; |
362 | 357 | ||
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) | |||
137 | } | 137 | } |
138 | if(charger_inserted()) | 138 | if(charger_inserted()) |
139 | { | 139 | { |
140 | global_settings.runtime = 0; | ||
140 | if(TIME_AFTER(current_tick, switch_tick)) | 141 | if(TIME_AFTER(current_tick, switch_tick)) |
141 | { | 142 | { |
142 | lcd_icon(ICON_BATTERY, true); | 143 | lcd_icon(ICON_BATTERY, true); |
@@ -202,6 +203,7 @@ void status_draw(void) | |||
202 | battery_state = true; | 203 | battery_state = true; |
203 | plug_state = true; | 204 | plug_state = true; |
204 | if(charger_enabled) { /* animate battery if charging */ | 205 | if(charger_enabled) { /* animate battery if charging */ |
206 | global_settings.runtime = 0; | ||
205 | battlevel = battery_charge_step * 34; /* 34 for a better look */ | 207 | battlevel = battery_charge_step * 34; /* 34 for a better look */ |
206 | battlevel = battlevel > 100 ? 100 : battlevel; | 208 | battlevel = battlevel > 100 ? 100 : battlevel; |
207 | if(TIME_AFTER(current_tick, switch_tick)) { | 209 | if(TIME_AFTER(current_tick, switch_tick)) { |