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

1 files changed, 4 insertions, 0 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 77ebe019f8..880f545d52 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