Battery benchmark: * Don't crash on player. * Map remote buttons for recorder & player.

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

1 files changed, 12 insertions, 3 deletions

diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c
index 918853c9ab..552be8a1ac 100644
--- a/apps/plugins/battery_bench.c
+++ b/apps/plugins/battery_bench.c
@@ -32,16 +32,25 @@ PLUGIN_HEADER
 #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 
 
 #if CONFIG_KEYPAD == RECORDER_PAD
+
 #define BATTERY_ON BUTTON_PLAY
+#define BATTERY_RC_ON BUTTON_RC_PLAY
+
 #define BATTERY_OFF BUTTON_OFF
+#define BATTERY_RC_OFF BUTTON_RC_STOP
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
+
 #define BATTERY_ON BUTTON_RIGHT
 #define BATTERY_OFF BUTTON_OFF
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
-#define BATTERY_ON BUTTON_ON
+
+#define BATTERY_ON BUTTON_PLAY
+#define BATTERY_RC_ON BUTTON_RC_PLAY
+
 #define BATTERY_OFF BUTTON_STOP
+#define BATTERY_RC_OFF BUTTON_RC_STOP
 
 #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \
       (CONFIG_KEYPAD == IRIVER_H300_PAD)
@@ -359,8 +368,8 @@ int main(void)
 #endif
     
 #else
-    rb->lcd_puts_scroll(0, 1, "Batt.Bench.");
-    rb->lcd_puts_scroll(0, 2, "PLAY/STOP");
+    rb->lcd_puts_scroll(0, 0, "Batt.Bench.");
+    rb->lcd_puts_scroll(0, 1, "PLAY/STOP");
 #endif
     
     do