summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorBarry Wardell <rockbox@barrywardell.net>2006-09-23 17:47:54 +0000
committerBarry Wardell <rockbox@barrywardell.net>2006-09-23 17:47:54 +0000
commit5a79b4e015366fa2ee7c06cf29b3237275db369a (patch)
treec69b042757caec05b46146c96db2c934a0e68438 /apps
parent193611367ab739c284be26060f707776804757b9 (diff)
downloadrockbox-5a79b4e015366fa2ee7c06cf29b3237275db369a.zip
rockbox-5a79b4e015366fa2ee7c06cf29b3237275db369a.tar.gz
rockbox-5a79b4e015366fa2ee7c06cf29b3237275db369a.tar.bz2
rockbox-5a79b4e015366fa2ee7c06cf29b3237275db369a.tar.xz
Add ADC to I/O ports debug menu on H10. Fix battery level reading empty when starting up on H10. Calibrated battery for H10 20GB.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11036 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/debug_menu.c12
-rw-r--r--apps/main.c2
2 files changed, 12 insertions, 2 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 00e7f55..af1b812 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1123,7 +1123,17 @@ bool dbg_ports(void)
lcd_puts(0, line++, buf);
snprintf(buf, sizeof(buf), "GPIO_F: %02x GPIO_L: %02x", gpio_f, gpio_l);
lcd_puts(0, line++, buf);
-
+#if defined(IRIVER_H10) || defined(IRIVER_H10_5GB)
+ line++;
+ snprintf(buf, sizeof(buf), "ADC_BATTERY: %02x", adc_read(ADC_BATTERY));
+ lcd_puts(0, line++, buf);
+ snprintf(buf, sizeof(buf), "ADC_UNKNOWN_1: %02x", adc_read(ADC_UNKNOWN_1));
+ lcd_puts(0, line++, buf);
+ snprintf(buf, sizeof(buf), "ADC_UNKNOWN_2: %02x", adc_read(ADC_UNKNOWN_2));
+ lcd_puts(0, line++, buf);
+ snprintf(buf, sizeof(buf), "ADC_SCROLLPAD: %02x", adc_read(ADC_SCROLLPAD));
+ lcd_puts(0, line++, buf);
+#endif
lcd_update();
if (action_userabort(HZ/10))
return false;
diff --git a/apps/main.c b/apps/main.c
index 90bd13e..2ceb24d 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -417,7 +417,7 @@ void init(void)
settings_calc_config_sector();
-#if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD)
+#if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IRIVER_H10_PAD)
#ifdef SETTINGS_RESET
/* Reset settings if holding the rec button. */
if ((button_status() & SETTINGS_RESET) == SETTINGS_RESET)