diff options
| author | Michiel Van Der Kolk <not.valid@email.address> | 2005-03-28 00:47:09 +0000 |
|---|---|---|
| committer | Michiel Van Der Kolk <not.valid@email.address> | 2005-03-28 00:47:09 +0000 |
| commit | 9d2531a6372482966e6371db60fe3e50fbe5d91f (patch) | |
| tree | 28b83a5e8a2ef892708f1d9ef6176af24d8d9382 /apps | |
| parent | 6c08b93f6f5c7eb02b542cd48a98c5077776b77d (diff) | |
| download | rockbox-9d2531a6372482966e6371db60fe3e50fbe5d91f.tar.gz rockbox-9d2531a6372482966e6371db60fe3e50fbe5d91f.zip | |
Re-do previous patch, again. xshock's patch undid this.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6229 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/debug_menu.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 74d1cb94fb..c973d27044 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -1250,9 +1250,10 @@ bool view_battery(void) lcd_puts(0, 3, buf); #endif #ifdef HAVE_CHARGE_CTRL - snprintf(buf, 30, "Charging: %s", - charger_enabled ? "yes" : "no"); - lcd_puts(0, 4, buf); + snprintf(buf, 30, "Chgr: %s %s", + charger_inserted() ? "present" : "absent", + charger_enabled ? "on" : "off"); + lcd_puts(0, 3, buf); snprintf(buf, 30, "short delta: %d", short_delta); lcd_puts(0, 5, buf); snprintf(buf, 30, "long delta: %d", long_delta); @@ -1274,7 +1275,7 @@ bool view_battery(void) } break; - case 3: /* remeining time estimation: */ + case 3: /* remaining time estimation: */ lcd_clear_display(); #ifdef HAVE_CHARGE_CTRL @@ -1286,23 +1287,24 @@ bool view_battery(void) snprintf(buf, 30, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level); lcd_puts(0, 2, buf); + + snprintf(buf, 30, "P=%2d I=%2d", pid_p, pid_i); + lcd_puts(0, 3, buf); + + snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); + lcd_puts(0, 4, buf); #endif snprintf(buf, 30, "Last PwrHist: %d.%02d V", power_history[0] / 100, power_history[0] % 100); - lcd_puts(0, 3, buf); - - snprintf(buf, 30, "battery level: %d%%", battery_level()); lcd_puts(0, 5, buf); - snprintf(buf, 30, "Est. remain: %d m", battery_time()); + snprintf(buf, 30, "battery level: %d%%", battery_level()); lcd_puts(0, 6, buf); -#ifdef HAVE_CHARGE_CTRL - snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); + snprintf(buf, 30, "Est. remain: %d m", battery_time()); lcd_puts(0, 7, buf); -#endif break; } |