diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-05-13 07:41:12 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-05-13 07:41:12 +0000 |
commit | d9b94b6a0cb675236e5dd61af991c45647862795 (patch) | |
tree | 360251ba7923a0ff2717b7384d4f4e64cd900530 /apps | |
parent | 736a399bc438e730b219c067a77f0176ddeeec3e (diff) | |
download | rockbox-d9b94b6a0cb675236e5dd61af991c45647862795.tar.gz rockbox-d9b94b6a0cb675236e5dd61af991c45647862795.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/battery_bench.c | 15 |
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 | |||
32 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 | 32 | #define THREAD_STACK_SIZE DEFAULT_STACK_SIZE + 0x200 |
33 | 33 | ||
34 | #if CONFIG_KEYPAD == RECORDER_PAD | 34 | #if CONFIG_KEYPAD == RECORDER_PAD |
35 | |||
35 | #define BATTERY_ON BUTTON_PLAY | 36 | #define BATTERY_ON BUTTON_PLAY |
37 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
38 | |||
36 | #define BATTERY_OFF BUTTON_OFF | 39 | #define BATTERY_OFF BUTTON_OFF |
40 | #define BATTERY_RC_OFF BUTTON_RC_STOP | ||
37 | 41 | ||
38 | #elif CONFIG_KEYPAD == ONDIO_PAD | 42 | #elif CONFIG_KEYPAD == ONDIO_PAD |
43 | |||
39 | #define BATTERY_ON BUTTON_RIGHT | 44 | #define BATTERY_ON BUTTON_RIGHT |
40 | #define BATTERY_OFF BUTTON_OFF | 45 | #define BATTERY_OFF BUTTON_OFF |
41 | 46 | ||
42 | #elif CONFIG_KEYPAD == PLAYER_PAD | 47 | #elif CONFIG_KEYPAD == PLAYER_PAD |
43 | #define BATTERY_ON BUTTON_ON | 48 | |
49 | #define BATTERY_ON BUTTON_PLAY | ||
50 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
51 | |||
44 | #define BATTERY_OFF BUTTON_STOP | 52 | #define BATTERY_OFF BUTTON_STOP |
53 | #define BATTERY_RC_OFF BUTTON_RC_STOP | ||
45 | 54 | ||
46 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 55 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
47 | (CONFIG_KEYPAD == IRIVER_H300_PAD) | 56 | (CONFIG_KEYPAD == IRIVER_H300_PAD) |
@@ -359,8 +368,8 @@ int main(void) | |||
359 | #endif | 368 | #endif |
360 | 369 | ||
361 | #else | 370 | #else |
362 | rb->lcd_puts_scroll(0, 1, "Batt.Bench."); | 371 | rb->lcd_puts_scroll(0, 0, "Batt.Bench."); |
363 | rb->lcd_puts_scroll(0, 2, "PLAY/STOP"); | 372 | rb->lcd_puts_scroll(0, 1, "PLAY/STOP"); |
364 | #endif | 373 | #endif |
365 | 374 | ||
366 | do | 375 | do |