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/debug_menu.c | |
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/debug_menu.c')
-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) | |||
1250 | lcd_puts(0, 3, buf); | 1250 | lcd_puts(0, 3, buf); |
1251 | #endif | 1251 | #endif |
1252 | #ifdef HAVE_CHARGE_CTRL | 1252 | #ifdef HAVE_CHARGE_CTRL |
1253 | snprintf(buf, 30, "Charging: %s", | 1253 | snprintf(buf, 30, "Chgr: %s %s", |
1254 | charger_enabled ? "yes" : "no"); | 1254 | charger_inserted() ? "present" : "absent", |
1255 | lcd_puts(0, 4, buf); | 1255 | charger_enabled ? "on" : "off"); |
1256 | lcd_puts(0, 3, buf); | ||
1256 | snprintf(buf, 30, "short delta: %d", short_delta); | 1257 | snprintf(buf, 30, "short delta: %d", short_delta); |
1257 | lcd_puts(0, 5, buf); | 1258 | lcd_puts(0, 5, buf); |
1258 | snprintf(buf, 30, "long delta: %d", long_delta); | 1259 | snprintf(buf, 30, "long delta: %d", long_delta); |
@@ -1274,7 +1275,7 @@ bool view_battery(void) | |||
1274 | } | 1275 | } |
1275 | break; | 1276 | break; |
1276 | 1277 | ||
1277 | case 3: /* remeining time estimation: */ | 1278 | case 3: /* remaining time estimation: */ |
1278 | lcd_clear_display(); | 1279 | lcd_clear_display(); |
1279 | 1280 | ||
1280 | #ifdef HAVE_CHARGE_CTRL | 1281 | #ifdef HAVE_CHARGE_CTRL |
@@ -1286,23 +1287,24 @@ bool view_battery(void) | |||
1286 | 1287 | ||
1287 | snprintf(buf, 30, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level); | 1288 | snprintf(buf, 30, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level); |
1288 | lcd_puts(0, 2, buf); | 1289 | lcd_puts(0, 2, buf); |
1290 | |||
1291 | snprintf(buf, 30, "P=%2d I=%2d", pid_p, pid_i); | ||
1292 | lcd_puts(0, 3, buf); | ||
1293 | |||
1294 | snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); | ||
1295 | lcd_puts(0, 4, buf); | ||
1289 | #endif | 1296 | #endif |
1290 | 1297 | ||
1291 | snprintf(buf, 30, "Last PwrHist: %d.%02d V", | 1298 | snprintf(buf, 30, "Last PwrHist: %d.%02d V", |
1292 | power_history[0] / 100, | 1299 | power_history[0] / 100, |
1293 | power_history[0] % 100); | 1300 | power_history[0] % 100); |
1294 | lcd_puts(0, 3, buf); | ||
1295 | |||
1296 | snprintf(buf, 30, "battery level: %d%%", battery_level()); | ||
1297 | lcd_puts(0, 5, buf); | 1301 | lcd_puts(0, 5, buf); |
1298 | 1302 | ||
1299 | snprintf(buf, 30, "Est. remain: %d m", battery_time()); | 1303 | snprintf(buf, 30, "battery level: %d%%", battery_level()); |
1300 | lcd_puts(0, 6, buf); | 1304 | lcd_puts(0, 6, buf); |
1301 | 1305 | ||
1302 | #ifdef HAVE_CHARGE_CTRL | 1306 | snprintf(buf, 30, "Est. remain: %d m", battery_time()); |
1303 | snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); | ||
1304 | lcd_puts(0, 7, buf); | 1307 | lcd_puts(0, 7, buf); |
1305 | #endif | ||
1306 | break; | 1308 | break; |
1307 | } | 1309 | } |
1308 | 1310 | ||