diff options
author | Jörg Hohensohn <hohensoh@rockbox.org> | 2005-03-23 20:53:37 +0000 |
---|---|---|
committer | Jörg Hohensohn <hohensoh@rockbox.org> | 2005-03-23 20:53:37 +0000 |
commit | 3644fa28245d84b7bccc65661ca6640f029c000c (patch) | |
tree | c0fa52d31f60c9ea7d8b660e489ada6b062563e5 /apps/debug_menu.c | |
parent | 9306caae3df85abecc1a7990d73c89c570d37d79 (diff) | |
download | rockbox-3644fa28245d84b7bccc65661ca6640f029c000c.tar.gz rockbox-3644fa28245d84b7bccc65661ca6640f029c000c.zip |
patch # 1159539 from GvB: V1 charging cleanup
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6224 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 1d42cf8312..9d5028af7c 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c | |||
@@ -1247,9 +1247,10 @@ bool view_battery(void) | |||
1247 | lcd_puts(0, 3, buf); | 1247 | lcd_puts(0, 3, buf); |
1248 | #endif | 1248 | #endif |
1249 | #ifdef HAVE_CHARGE_CTRL | 1249 | #ifdef HAVE_CHARGE_CTRL |
1250 | snprintf(buf, 30, "Charging: %s", | 1250 | snprintf(buf, 30, "Chgr: %s %s", |
1251 | charger_enabled ? "yes" : "no"); | 1251 | charger_inserted() ? "present" : "absent", |
1252 | lcd_puts(0, 4, buf); | 1252 | charger_enabled ? "on" : "off"); |
1253 | lcd_puts(0, 3, buf); | ||
1253 | snprintf(buf, 30, "short delta: %d", short_delta); | 1254 | snprintf(buf, 30, "short delta: %d", short_delta); |
1254 | lcd_puts(0, 5, buf); | 1255 | lcd_puts(0, 5, buf); |
1255 | snprintf(buf, 30, "long delta: %d", long_delta); | 1256 | snprintf(buf, 30, "long delta: %d", long_delta); |
@@ -1271,7 +1272,7 @@ bool view_battery(void) | |||
1271 | } | 1272 | } |
1272 | break; | 1273 | break; |
1273 | 1274 | ||
1274 | case 3: /* remeining time estimation: */ | 1275 | case 3: /* remaining time estimation: */ |
1275 | lcd_clear_display(); | 1276 | lcd_clear_display(); |
1276 | 1277 | ||
1277 | #ifdef HAVE_CHARGE_CTRL | 1278 | #ifdef HAVE_CHARGE_CTRL |
@@ -1283,23 +1284,24 @@ bool view_battery(void) | |||
1283 | 1284 | ||
1284 | snprintf(buf, 30, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level); | 1285 | snprintf(buf, 30, "Lvl@cyc st: %d%%", powermgmt_last_cycle_level); |
1285 | lcd_puts(0, 2, buf); | 1286 | lcd_puts(0, 2, buf); |
1287 | |||
1288 | snprintf(buf, 30, "P=%2d I=%2d", pid_p, pid_i); | ||
1289 | lcd_puts(0, 3, buf); | ||
1290 | |||
1291 | snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); | ||
1292 | lcd_puts(0, 4, buf); | ||
1286 | #endif | 1293 | #endif |
1287 | 1294 | ||
1288 | snprintf(buf, 30, "Last PwrHist: %d.%02d V", | 1295 | snprintf(buf, 30, "Last PwrHist: %d.%02d V", |
1289 | power_history[0] / 100, | 1296 | power_history[0] / 100, |
1290 | power_history[0] % 100); | 1297 | power_history[0] % 100); |
1291 | lcd_puts(0, 3, buf); | ||
1292 | |||
1293 | snprintf(buf, 30, "battery level: %d%%", battery_level()); | ||
1294 | lcd_puts(0, 5, buf); | 1298 | lcd_puts(0, 5, buf); |
1295 | 1299 | ||
1296 | snprintf(buf, 30, "Est. remain: %d m", battery_time()); | 1300 | snprintf(buf, 30, "battery level: %d%%", battery_level()); |
1297 | lcd_puts(0, 6, buf); | 1301 | lcd_puts(0, 6, buf); |
1298 | 1302 | ||
1299 | #ifdef HAVE_CHARGE_CTRL | 1303 | snprintf(buf, 30, "Est. remain: %d m", battery_time()); |
1300 | snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec); | ||
1301 | lcd_puts(0, 7, buf); | 1304 | lcd_puts(0, 7, buf); |
1302 | #endif | ||
1303 | break; | 1305 | break; |
1304 | } | 1306 | } |
1305 | 1307 | ||