summaryrefslogtreecommitdiff
path: root/apps/debug_menu.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-12-01 00:33:18 +0000
committerJens Arnold <amiconn@rockbox.org>2004-12-01 00:33:18 +0000
commit303b4abfc5b6e7f1fd85876a2c644a4661d9dd02 (patch)
treede3df45eca3b504a5975526fb3a09ff187566a8f /apps/debug_menu.c
parentbbc593128066d258002bb0a17a09c8dd33c07c46 (diff)
downloadrockbox-303b4abfc5b6e7f1fd85876a2c644a4661d9dd02.zip
rockbox-303b4abfc5b6e7f1fd85876a2c644a4661d9dd02.tar.gz
rockbox-303b4abfc5b6e7f1fd85876a2c644a4661d9dd02.tar.bz2
rockbox-303b4abfc5b6e7f1fd85876a2c644a4661d9dd02.tar.xz
Button driver overhaul: (1) Unified the button driver functions as much as possible (2) Proper #defines for FM recorder button ADC channels (3) Got rid of old port B #defines only valid for recorder (4) button filtering for all models (5) RoLo with ON after panic should now work for FM/V2
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5472 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/debug_menu.c')
-rw-r--r--apps/debug_menu.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 77ebe01..880f545 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -903,9 +903,12 @@ bool view_battery(void)
y = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000;
snprintf(buf, 30, "Battery: %d.%02d V", y / 100, y % 100);
lcd_puts(0, 1, buf);
+#ifdef ADC_EXT_POWER
y = (adc_read(ADC_EXT_POWER) * EXT_SCALE_FACTOR) / 10000;
snprintf(buf, 30, "External: %d.%02d V", y / 100, y % 100);
lcd_puts(0, 2, buf);
+#endif
+#ifdef HAVE_CHARGING
snprintf(buf, 30, "Charger: %s",
charger_inserted() ? "present" : "absent");
lcd_puts(0, 3, buf);
@@ -914,6 +917,7 @@ bool view_battery(void)
charger_enabled ? "yes" : "no");
lcd_puts(0, 4, buf);
#endif
+#endif
y = ( power_history[POWER_HISTORY_LEN-1] * 100
+ power_history[POWER_HISTORY_LEN-2] * 100
- power_history[POWER_HISTORY_LEN-1-CHARGE_END_NEGD+1] * 100