diff options
-rw-r--r-- | apps/plugins/battery_bench.c | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index a938fea1ba..b76c279c90 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -35,23 +35,25 @@ PLUGIN_HEADER | |||
35 | 35 | ||
36 | #define BATTERY_ON BUTTON_PLAY | 36 | #define BATTERY_ON BUTTON_PLAY |
37 | #define BATTERY_OFF BUTTON_OFF | 37 | #define BATTERY_OFF BUTTON_OFF |
38 | #define BATTERY_ON_TXT "PLAY - start" | ||
39 | #define BATTERY_OFF_TXT "OFF - quit" | ||
38 | 40 | ||
39 | #if BUTTON_REMOTE != 0 | ||
40 | #define BATTERY_RC_ON BUTTON_RC_PLAY | 41 | #define BATTERY_RC_ON BUTTON_RC_PLAY |
41 | #define BATTERY_RC_OFF BUTTON_RC_STOP | 42 | #define BATTERY_RC_OFF BUTTON_RC_STOP |
42 | #endif | ||
43 | 43 | ||
44 | #elif CONFIG_KEYPAD == ONDIO_PAD | 44 | #elif CONFIG_KEYPAD == ONDIO_PAD |
45 | 45 | ||
46 | #define BATTERY_ON BUTTON_RIGHT | 46 | #define BATTERY_ON BUTTON_RIGHT |
47 | #define BATTERY_OFF BUTTON_OFF | 47 | #define BATTERY_OFF BUTTON_OFF |
48 | #define BATTERY_ON_TXT "RIGHT - start" | ||
49 | #define BATTERY_OFF_TXT "OFF - quit" | ||
48 | 50 | ||
49 | #elif CONFIG_KEYPAD == PLAYER_PAD | 51 | #elif CONFIG_KEYPAD == PLAYER_PAD |
50 | 52 | ||
51 | #define BATTERY_ON BUTTON_PLAY | 53 | #define BATTERY_ON BUTTON_PLAY |
52 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
53 | |||
54 | #define BATTERY_OFF BUTTON_STOP | 54 | #define BATTERY_OFF BUTTON_STOP |
55 | |||
56 | #define BATTERY_RC_ON BUTTON_RC_PLAY | ||
55 | #define BATTERY_RC_OFF BUTTON_RC_STOP | 57 | #define BATTERY_RC_OFF BUTTON_RC_STOP |
56 | 58 | ||
57 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ | 59 | #elif (CONFIG_KEYPAD == IRIVER_H100_PAD) || \ |
@@ -63,37 +65,52 @@ PLUGIN_HEADER | |||
63 | #define BATTERY_OFF BUTTON_OFF | 65 | #define BATTERY_OFF BUTTON_OFF |
64 | #define BATTERY_RC_OFF BUTTON_RC_STOP | 66 | #define BATTERY_RC_OFF BUTTON_RC_STOP |
65 | 67 | ||
68 | #define BATTERY_ON_TXT "PLAY - start" | ||
69 | #define BATTERY_OFF_TXT "STOP - quit" | ||
70 | |||
66 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ | 71 | #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \ |
67 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ | 72 | (CONFIG_KEYPAD == IPOD_3G_PAD) || \ |
68 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) | 73 | (CONFIG_KEYPAD == IPOD_1G2G_PAD) |
69 | 74 | ||
70 | #define BATTERY_ON BUTTON_PLAY | 75 | #define BATTERY_ON BUTTON_PLAY |
71 | #define BATTERY_OFF BUTTON_MENU | 76 | #define BATTERY_OFF BUTTON_MENU |
77 | #define BATTERY_ON_TXT "PLAY - start" | ||
78 | #define BATTERY_OFF_TXT "MENU - quit" | ||
72 | 79 | ||
73 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 80 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
74 | 81 | ||
75 | #define BATTERY_ON BUTTON_SELECT | 82 | #define BATTERY_ON BUTTON_SELECT |
76 | #define BATTERY_OFF BUTTON_PLAY | 83 | #define BATTERY_OFF BUTTON_POWER |
84 | #define BATTERY_ON_TXT "SELECT - start" | ||
85 | #define BATTERY_OFF_TXT "POWER - quit" | ||
77 | 86 | ||
78 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 87 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
79 | 88 | ||
80 | #define BATTERY_ON BUTTON_SELECT | 89 | #define BATTERY_ON BUTTON_SELECT |
81 | #define BATTERY_OFF BUTTON_PLAY | 90 | #define BATTERY_OFF BUTTON_PLAY |
91 | #define BATTERY_ON_TXT "SELECT - start" | ||
92 | #define BATTERY_OFF_TXT "PLAY - quit" | ||
82 | 93 | ||
83 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ | 94 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \ |
84 | (CONFIG_KEYPAD == SANSA_C200_PAD) | 95 | (CONFIG_KEYPAD == SANSA_C200_PAD) |
85 | #define BATTERY_ON BUTTON_SELECT | 96 | #define BATTERY_ON BUTTON_SELECT |
86 | #define BATTERY_OFF BUTTON_POWER | 97 | #define BATTERY_OFF BUTTON_POWER |
98 | #define BATTERY_ON_TXT "SELECT - start" | ||
99 | #define BATTERY_OFF_TXT "POWER - quit" | ||
87 | 100 | ||
88 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 101 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
89 | 102 | ||
90 | #define BATTERY_ON BUTTON_PLAY | 103 | #define BATTERY_ON BUTTON_PLAY |
91 | #define BATTERY_OFF BUTTON_POWER | 104 | #define BATTERY_OFF BUTTON_POWER |
105 | #define BATTERY_ON_TXT "PLAY - start" | ||
106 | #define BATTERY_OFF_TXT "POWER - quit" | ||
92 | 107 | ||
93 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 108 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
94 | 109 | ||
95 | #define BATTERY_ON BUTTON_SELECT | 110 | #define BATTERY_ON BUTTON_SELECT |
96 | #define BATTERY_OFF BUTTON_POWER | 111 | #define BATTERY_OFF BUTTON_POWER |
112 | #define BATTERY_ON_TXT "SELECT - start" | ||
113 | #define BATTERY_OFF_TXT "POWER - quit" | ||
97 | 114 | ||
98 | #endif | 115 | #endif |
99 | 116 | ||
@@ -376,7 +393,7 @@ int main(void) | |||
376 | #ifdef HAVE_LCD_BITMAP | 393 | #ifdef HAVE_LCD_BITMAP |
377 | int i; | 394 | int i; |
378 | const char *msgs[] = { "Battery Benchmark","Check file", BATTERY_LOG, | 395 | const char *msgs[] = { "Battery Benchmark","Check file", BATTERY_LOG, |
379 | "for more info", "PLAY - start", "OFF - quit" }; | 396 | "for more info", BATTERY_ON_TXT, BATTERY_OFF_TXT }; |
380 | #endif | 397 | #endif |
381 | rb->lcd_clear_display(); | 398 | rb->lcd_clear_display(); |
382 | 399 | ||