Basic battery monitoring for ipod 5g, should work on other ipods as well, but needs testing and stuff. Also improved the RTC driver and moved it to where it belongs, and interrupt protected a bunch of possibly broken i2c. Also start preparing code for ipod charge monitoring. Note: on the 5g, this takes up enough processor time to increase skippiness noticeably in WPS.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8911 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 1 deletions

diff --git a/apps/screens.c b/apps/screens.c
index 634d5cf8d1..d01d2acb41 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -300,6 +300,11 @@ void charging_display_info(bool animate)
    2 if Off/Stop key was pressed
    3 if On key was pressed
    4 if USB was connected */
+#if (CONFIG_KEYPAD==IPOD_3G_PAD) || (CONFIG_KEYPAD==IPOD_4G_PAD)
+# define CHARGE_SCREEN_RESUME BUTTON_SELECT
+#else
+# define CHARGE_SCREEN_RESUME BUTTON_ON
+#endif
 int charging_screen(void)
 {
     unsigned int button;
@@ -325,7 +330,7 @@ int charging_screen(void)
         gui_syncstatusbar_draw(&statusbars, false);
         charging_display_info(true);
         button = button_get_w_tmo(HZ/3);
-        if (button == BUTTON_ON)
+        if (button == CHARGE_SCREEN_RESUME)
             rc = 2;
         else if (usb_detect())
             rc = 3;