diff options
Diffstat (limited to 'apps')
44 files changed, 116 insertions, 112 deletions
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index c5c9dad83c..1f890fa8a1 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -72,8 +72,8 @@ PLUGIN_HEADER | |||
72 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 72 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
73 | #define BOUNCE_UP BUTTON_UP | 73 | #define BOUNCE_UP BUTTON_UP |
74 | #define BOUNCE_DOWN BUTTON_DOWN | 74 | #define BOUNCE_DOWN BUTTON_DOWN |
75 | #define BOUNCE_QUIT BUTTON_A | 75 | #define BOUNCE_QUIT BUTTON_POWER |
76 | #define BOUNCE_MODE BUTTON_POWER | 76 | #define BOUNCE_MODE BUTTON_A |
77 | 77 | ||
78 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 78 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
79 | #define BOUNCE_UP BUTTON_SCROLL_UP | 79 | #define BOUNCE_UP BUTTON_SCROLL_UP |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index b434c77e25..2557738984 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -92,7 +92,7 @@ PLUGIN_HEADER | |||
92 | 92 | ||
93 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 93 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
94 | 94 | ||
95 | #define QUIT BUTTON_A | 95 | #define QUIT BUTTON_POWER |
96 | #define LEFT BUTTON_LEFT | 96 | #define LEFT BUTTON_LEFT |
97 | #define RIGHT BUTTON_RIGHT | 97 | #define RIGHT BUTTON_RIGHT |
98 | #define SELECT BUTTON_SELECT | 98 | #define SELECT BUTTON_SELECT |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 775210d7f3..04fd4e00eb 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -169,11 +169,11 @@ PLUGIN_HEADER | |||
169 | 169 | ||
170 | #define CALCULATOR_UP BUTTON_UP | 170 | #define CALCULATOR_UP BUTTON_UP |
171 | #define CALCULATOR_DOWN BUTTON_DOWN | 171 | #define CALCULATOR_DOWN BUTTON_DOWN |
172 | #define CALCULATOR_QUIT BUTTON_A | 172 | #define CALCULATOR_QUIT BUTTON_POWER |
173 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU | 173 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MENU |
174 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) | 174 | #define CALCULATOR_INPUT (BUTTON_MENU | BUTTON_REL) |
175 | #define CALCULATOR_CALC BUTTON_SELECT | 175 | #define CALCULATOR_CALC BUTTON_SELECT |
176 | #define CALCULATOR_CLEAR BUTTON_POWER | 176 | #define CALCULATOR_CLEAR BUTTON_A |
177 | 177 | ||
178 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 178 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
179 | #define CALCULATOR_UP BUTTON_UP | 179 | #define CALCULATOR_UP BUTTON_UP |
diff --git a/apps/plugins/chessbox/chessbox.c b/apps/plugins/chessbox/chessbox.c index 1418aab1d6..f2ae95b4f2 100644 --- a/apps/plugins/chessbox/chessbox.c +++ b/apps/plugins/chessbox/chessbox.c | |||
@@ -126,9 +126,10 @@ PLUGIN_HEADER | |||
126 | #define CB_DOWN BUTTON_DOWN | 126 | #define CB_DOWN BUTTON_DOWN |
127 | #define CB_LEFT BUTTON_LEFT | 127 | #define CB_LEFT BUTTON_LEFT |
128 | #define CB_RIGHT BUTTON_RIGHT | 128 | #define CB_RIGHT BUTTON_RIGHT |
129 | #define CB_PLAY BUTTON_POWER | 129 | #define CB_PLAY BUTTON_A |
130 | #define CB_LEVEL BUTTON_MENU | 130 | #define CB_LEVEL BUTTON_VOL_UP |
131 | #define CB_MENU BUTTON_A | 131 | #define CB_RESTART BUTTON_VOL_DOWN |
132 | #define CB_MENU BUTTON_MENU | ||
132 | 133 | ||
133 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 134 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
134 | #define CB_SELECT BUTTON_REW | 135 | #define CB_SELECT BUTTON_REW |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 086245e75c..f1482df990 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -109,14 +109,14 @@ PLUGIN_HEADER | |||
109 | #define CHC_SETTINGS_CANCEL BUTTON_REC | 109 | #define CHC_SETTINGS_CANCEL BUTTON_REC |
110 | 110 | ||
111 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 111 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
112 | #define CHC_QUIT BUTTON_A | 112 | #define CHC_QUIT BUTTON_POWER |
113 | #define CHC_STARTSTOP BUTTON_SELECT | 113 | #define CHC_STARTSTOP BUTTON_SELECT |
114 | #define CHC_RESET BUTTON_POWER | 114 | #define CHC_RESET BUTTON_A |
115 | #define CHC_MENU BUTTON_MENU | 115 | #define CHC_MENU BUTTON_MENU |
116 | #define CHC_SETTINGS_INC BUTTON_RIGHT | 116 | #define CHC_SETTINGS_INC BUTTON_UP |
117 | #define CHC_SETTINGS_DEC BUTTON_LEFT | 117 | #define CHC_SETTINGS_DEC BUTTON_DOWN |
118 | #define CHC_SETTINGS_OK BUTTON_MENU | 118 | #define CHC_SETTINGS_OK BUTTON_SELECT |
119 | #define CHC_SETTINGS_CANCEL BUTTON_A | 119 | #define CHC_SETTINGS_CANCEL BUTTON_POWER |
120 | 120 | ||
121 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 121 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
122 | #define CHC_QUIT BUTTON_POWER | 122 | #define CHC_QUIT BUTTON_POWER |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index c18da43591..c38a5fd0bb 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1008,12 +1008,16 @@ STATIC void chip8 (void) | |||
1008 | #define CHIP8_KEY8 BUTTON_DOWN | 1008 | #define CHIP8_KEY8 BUTTON_DOWN |
1009 | 1009 | ||
1010 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 1010 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
1011 | #define CHIP8_OFF BUTTON_A | 1011 | #define CHIP8_OFF BUTTON_POWER |
1012 | #define CHIP8_KEY1 BUTTON_MENU | ||
1012 | #define CHIP8_KEY2 BUTTON_UP | 1013 | #define CHIP8_KEY2 BUTTON_UP |
1014 | #define CHIP8_KEY3 BUTTON_VOL_DOWN | ||
1013 | #define CHIP8_KEY4 BUTTON_LEFT | 1015 | #define CHIP8_KEY4 BUTTON_LEFT |
1014 | #define CHIP8_KEY5 BUTTON_MENU | 1016 | #define CHIP8_KEY5 BUTTON_SELECT |
1015 | #define CHIP8_KEY6 BUTTON_RIGHT | 1017 | #define CHIP8_KEY6 BUTTON_RIGHT |
1018 | #define CHIP8_KEY7 BUTTON_VOL_UP | ||
1016 | #define CHIP8_KEY8 BUTTON_DOWN | 1019 | #define CHIP8_KEY8 BUTTON_DOWN |
1020 | #define CHIP8_KEY9 BUTTON_A | ||
1017 | 1021 | ||
1018 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 1022 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
1019 | #define CHIP8_OFF BUTTON_POWER | 1023 | #define CHIP8_OFF BUTTON_POWER |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index bb9e89e2c1..4088d4e94f 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -135,17 +135,16 @@ PLUGIN_HEADER | |||
135 | #define CUBE_HIGHSPEED (BUTTON_REC | BUTTON_REL) | 135 | #define CUBE_HIGHSPEED (BUTTON_REC | BUTTON_REL) |
136 | 136 | ||
137 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 137 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
138 | #define CUBE_QUIT BUTTON_A | 138 | #define CUBE_QUIT BUTTON_POWER |
139 | #define CUBE_X_INC BUTTON_LEFT | 139 | #define CUBE_X_INC BUTTON_LEFT |
140 | #define CUBE_X_DEC BUTTON_RIGHT | 140 | #define CUBE_X_DEC BUTTON_RIGHT |
141 | #define CUBE_Y_INC BUTTON_UP | 141 | #define CUBE_Y_INC BUTTON_UP |
142 | #define CUBE_Y_DEC BUTTON_DOWN | 142 | #define CUBE_Y_DEC BUTTON_DOWN |
143 | #define CUBE_Z_INC (BUTTON_POWER | BUTTON_UP) | 143 | #define CUBE_Z_INC BUTTON_VOL_UP |
144 | #define CUBE_Z_DEC (BUTTON_POWER | BUTTON_DOWN) | 144 | #define CUBE_Z_DEC BUTTON_VOL_DOWN |
145 | #define CUBE_MODE BUTTON_MENU | 145 | #define CUBE_MODE BUTTON_MENU |
146 | #define CUBE_PAUSE_PRE BUTTON_SELECT | 146 | #define CUBE_PAUSE BUTTON_SELECT |
147 | #define CUBE_PAUSE (BUTTON_SELECT | BUTTON_REL) | 147 | #define CUBE_HIGHSPEED BUTTON_A |
148 | #define CUBE_HIGHSPEED (BUTTON_POWER | BUTTON_REL) | ||
149 | 148 | ||
150 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 149 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
151 | #define CUBE_QUIT BUTTON_POWER | 150 | #define CUBE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/demystify.c b/apps/plugins/demystify.c index 1a5dfae412..3fe5966eaa 100644 --- a/apps/plugins/demystify.c +++ b/apps/plugins/demystify.c | |||
@@ -52,7 +52,7 @@ PLUGIN_HEADER | |||
52 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP | 52 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP |
53 | #define DEMYSTIFY_DECREASE_SPEED BUTTON_DOWN | 53 | #define DEMYSTIFY_DECREASE_SPEED BUTTON_DOWN |
54 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 54 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
55 | #define DEMYSTIFY_QUIT BUTTON_A | 55 | #define DEMYSTIFY_QUIT BUTTON_POWER |
56 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT | 56 | #define DEMYSTIFY_ADD_POLYGON BUTTON_RIGHT |
57 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT | 57 | #define DEMYSTIFY_REMOVE_POLYGON BUTTON_LEFT |
58 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP | 58 | #define DEMYSTIFY_INCREASE_SPEED BUTTON_UP |
diff --git a/apps/plugins/dice.c b/apps/plugins/dice.c index 39392f1ac5..1113654230 100644 --- a/apps/plugins/dice.c +++ b/apps/plugins/dice.c | |||
@@ -89,8 +89,8 @@ use stop to exit | |||
89 | #define DICE_BUTTON_SELECT BUTTON_SELECT | 89 | #define DICE_BUTTON_SELECT BUTTON_SELECT |
90 | 90 | ||
91 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 91 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
92 | #define DICE_BUTTON_ON BUTTON_POWER | 92 | #define DICE_BUTTON_ON BUTTON_A |
93 | #define DICE_BUTTON_OFF BUTTON_A | 93 | #define DICE_BUTTON_OFF BUTTON_POWER |
94 | #define DICE_BUTTON_SELECT BUTTON_SELECT | 94 | #define DICE_BUTTON_SELECT BUTTON_SELECT |
95 | 95 | ||
96 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 96 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 172b8bb39b..76b265eca2 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -112,7 +112,7 @@ long reverse (long N) { | |||
112 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 112 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
113 | #define LP_QUIT BUTTON_POWER | 113 | #define LP_QUIT BUTTON_POWER |
114 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 114 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
115 | #define LP_QUIT BUTTON_A | 115 | #define LP_QUIT BUTTON_POWER |
116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 116 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
117 | #define LP_QUIT BUTTON_POWER | 117 | #define LP_QUIT BUTTON_POWER |
118 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 118 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index ca4fb9b830..da2e76fb56 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c | |||
@@ -63,7 +63,7 @@ enum tidy_system | |||
63 | #define TIDY_STOP BUTTON_POWER | 63 | #define TIDY_STOP BUTTON_POWER |
64 | 64 | ||
65 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 65 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
66 | #define TIDY_STOP BUTTON_A | 66 | #define TIDY_STOP BUTTON_POWER |
67 | 67 | ||
68 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 68 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
69 | #define TIDY_STOP BUTTON_POWER | 69 | #define TIDY_STOP BUTTON_POWER |
diff --git a/apps/plugins/fire.c b/apps/plugins/fire.c index 915e9ae1dc..bb921ab91f 100644 --- a/apps/plugins/fire.c +++ b/apps/plugins/fire.c | |||
@@ -88,7 +88,7 @@ static unsigned char draw_buffer[8*LCD_WIDTH]; | |||
88 | #define FIRE_DECREASE_MULT BUTTON_DOWN | 88 | #define FIRE_DECREASE_MULT BUTTON_DOWN |
89 | 89 | ||
90 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 90 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
91 | #define FIRE_QUIT BUTTON_A | 91 | #define FIRE_QUIT BUTTON_POWER |
92 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT | 92 | #define FIRE_SWITCH_FLAMES_TYPE BUTTON_LEFT |
93 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT | 93 | #define FIRE_SWITCH_FLAMES_MOVING BUTTON_RIGHT |
94 | #define FIRE_INCREASE_MULT BUTTON_UP | 94 | #define FIRE_INCREASE_MULT BUTTON_UP |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 9bff0b09a3..3d28e0d000 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -100,11 +100,11 @@ PLUGIN_HEADER | |||
100 | 100 | ||
101 | #define FLIPIT_UP BUTTON_UP | 101 | #define FLIPIT_UP BUTTON_UP |
102 | #define FLIPIT_DOWN BUTTON_DOWN | 102 | #define FLIPIT_DOWN BUTTON_DOWN |
103 | #define FLIPIT_QUIT BUTTON_A | 103 | #define FLIPIT_QUIT BUTTON_POWER |
104 | #define FLIPIT_SHUFFLE (BUTTON_POWER | BUTTON_LEFT) | 104 | #define FLIPIT_SHUFFLE BUTTON_MENU |
105 | #define FLIPIT_SOLVE (BUTTON_POWER | BUTTON_RIGHT) | 105 | #define FLIPIT_SOLVE BUTTON_VOL_UP |
106 | #define FLIPIT_STEP_BY_STEP (BUTTON_POWER | BUTTON_UP) | 106 | #define FLIPIT_STEP_BY_STEP BUTTON_VOL_DOWN |
107 | #define FLIPIT_TOGGLE BUTTON_MENU | 107 | #define FLIPIT_TOGGLE BUTTON_SELECT |
108 | 108 | ||
109 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 109 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
110 | 110 | ||
@@ -510,11 +510,11 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
510 | rb->lcd_putsxy(2, 38, "[PLAY..] solution"); | 510 | rb->lcd_putsxy(2, 38, "[PLAY..] solution"); |
511 | rb->lcd_putsxy(2, 48, "[PLAY] step by step"); | 511 | rb->lcd_putsxy(2, 48, "[PLAY] step by step"); |
512 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 512 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
513 | rb->lcd_putsxy(2, 8, "[A] to stop"); | 513 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); |
514 | rb->lcd_putsxy(2, 18, "[MENU] toggle"); | 514 | rb->lcd_putsxy(2, 18, "[SELECT] toggle"); |
515 | rb->lcd_putsxy(2, 28, "[P-LEFT] shuffle"); | 515 | rb->lcd_putsxy(2, 28, "[MENU] shuffle"); |
516 | rb->lcd_putsxy(2, 38, "[P-RIGHT] solution"); | 516 | rb->lcd_putsxy(2, 38, "[VOL+] solution"); |
517 | rb->lcd_putsxy(2, 48, "[P-UP] step by step"); | 517 | rb->lcd_putsxy(2, 48, "[VOL-] step by step"); |
518 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 518 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
519 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); | 519 | rb->lcd_putsxy(2, 8, "[POWER] to stop"); |
520 | rb->lcd_putsxy(2, 18, "[REW] toggle"); | 520 | rb->lcd_putsxy(2, 18, "[REW] toggle"); |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 5172edbb5e..a99543c069 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -85,7 +85,7 @@ PLUGIN_HEADER | |||
85 | 85 | ||
86 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 86 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
87 | 87 | ||
88 | #define QUIT BUTTON_A | 88 | #define QUIT BUTTON_POWER |
89 | #define LEFT BUTTON_LEFT | 89 | #define LEFT BUTTON_LEFT |
90 | #define RIGHT BUTTON_RIGHT | 90 | #define RIGHT BUTTON_RIGHT |
91 | #define FIRE BUTTON_SELECT | 91 | #define FIRE BUTTON_SELECT |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 975f0cfa34..c6efcbccef 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -92,7 +92,7 @@ PLUGIN_HEADER | |||
92 | #define JEWELS_LEFT BUTTON_LEFT | 92 | #define JEWELS_LEFT BUTTON_LEFT |
93 | #define JEWELS_RIGHT BUTTON_RIGHT | 93 | #define JEWELS_RIGHT BUTTON_RIGHT |
94 | #define JEWELS_SELECT BUTTON_SELECT | 94 | #define JEWELS_SELECT BUTTON_SELECT |
95 | #define JEWELS_CANCEL BUTTON_A | 95 | #define JEWELS_CANCEL BUTTON_POWER |
96 | 96 | ||
97 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 97 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
98 | #define JEWELS_UP BUTTON_UP | 98 | #define JEWELS_UP BUTTON_UP |
@@ -1306,7 +1306,7 @@ static int jewels_main(struct game_context* bj) { | |||
1306 | rb->lcd_puts(0, 8, "Directions to move"); | 1306 | rb->lcd_puts(0, 8, "Directions to move"); |
1307 | rb->lcd_puts(0, 9, "SELECT to select"); | 1307 | rb->lcd_puts(0, 9, "SELECT to select"); |
1308 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1308 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1309 | rb->lcd_puts(0, 11, "A to cancel"); | 1309 | rb->lcd_puts(0, 11, "POWER to cancel"); |
1310 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 1310 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
1311 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | 1311 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); |
1312 | rb->lcd_puts(0, 3, "form connected segments"); | 1312 | rb->lcd_puts(0, 3, "form connected segments"); |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 55eade1228..255b82faae 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -121,9 +121,9 @@ PLUGIN_HEADER | |||
121 | #define JPEG_DOWN BUTTON_DOWN | 121 | #define JPEG_DOWN BUTTON_DOWN |
122 | #define JPEG_LEFT BUTTON_LEFT | 122 | #define JPEG_LEFT BUTTON_LEFT |
123 | #define JPEG_RIGHT BUTTON_RIGHT | 123 | #define JPEG_RIGHT BUTTON_RIGHT |
124 | #define JPEG_MENU BUTTON_A | 124 | #define JPEG_MENU BUTTON_MENU |
125 | #define JPEG_NEXT (BUTTON_POWER | BUTTON_RIGHT) | 125 | #define JPEG_NEXT (BUTTON_A | BUTTON_RIGHT) |
126 | #define JPEG_PREVIOUS (BUTTON_POWER | BUTTON_LEFT) | 126 | #define JPEG_PREVIOUS (BUTTON_A | BUTTON_LEFT) |
127 | 127 | ||
128 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 128 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
129 | #define JPEG_ZOOM_PRE BUTTON_SELECT | 129 | #define JPEG_ZOOM_PRE BUTTON_SELECT |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 408588e6c1..f030e13a51 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -203,7 +203,7 @@ const unsigned char rockbox16x7[] = { | |||
203 | #define LP_DEC_Y BUTTON_DOWN | 203 | #define LP_DEC_Y BUTTON_DOWN |
204 | #define LP_INC_Y BUTTON_UP | 204 | #define LP_INC_Y BUTTON_UP |
205 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 205 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
206 | #define LP_QUIT BUTTON_A | 206 | #define LP_QUIT BUTTON_POWER |
207 | #define LP_DEC_X BUTTON_LEFT | 207 | #define LP_DEC_X BUTTON_LEFT |
208 | #define LP_INC_X BUTTON_RIGHT | 208 | #define LP_INC_X BUTTON_RIGHT |
209 | #define LP_DEC_Y BUTTON_DOWN | 209 | #define LP_DEC_Y BUTTON_DOWN |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 2c538fb37a..fe920cebd4 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -107,17 +107,17 @@ PLUGIN_HEADER | |||
107 | #define MANDELBROT_RESET BUTTON_REC | 107 | #define MANDELBROT_RESET BUTTON_REC |
108 | 108 | ||
109 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 109 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
110 | #define MANDELBROT_QUIT BUTTON_A | 110 | #define MANDELBROT_QUIT BUTTON_POWER |
111 | #define MANDELBROT_UP BUTTON_UP | 111 | #define MANDELBROT_UP BUTTON_UP |
112 | #define MANDELBROT_DOWN BUTTON_DOWN | 112 | #define MANDELBROT_DOWN BUTTON_DOWN |
113 | #define MANDELBROT_LEFT BUTTON_LEFT | 113 | #define MANDELBROT_LEFT BUTTON_LEFT |
114 | #define MANDELBROT_RIGHT BUTTON_RIGHT | 114 | #define MANDELBROT_RIGHT BUTTON_RIGHT |
115 | #define MANDELBROT_ZOOM_IN_PRE BUTTON_MENU | 115 | #define MANDELBROT_ZOOM_IN_PRE BUTTON_SELECT |
116 | #define MANDELBROT_ZOOM_IN (BUTTON_MENU | BUTTON_REL) | 116 | #define MANDELBROT_ZOOM_IN (BUTTON_SELECT | BUTTON_REL) |
117 | #define MANDELBROT_ZOOM_OUT (BUTTON_MENU | BUTTON_REPEAT) | 117 | #define MANDELBROT_ZOOM_OUT (BUTTON_SELECT | BUTTON_REPEAT) |
118 | #define MANDELBROT_MAXITER_INC (BUTTON_POWER | BUTTON_RIGHT) | 118 | #define MANDELBROT_MAXITER_INC BUTTON_VOL_UP |
119 | #define MANDELBROT_MAXITER_DEC (BUTTON_POWER | BUTTON_LEFT) | 119 | #define MANDELBROT_MAXITER_DEC BUTTON_VOL_DOWN |
120 | #define MANDELBROT_RESET BUTTON_SELECT | 120 | #define MANDELBROT_RESET BUTTON_A |
121 | 121 | ||
122 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 122 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
123 | #define MANDELBROT_QUIT BUTTON_POWER | 123 | #define MANDELBROT_QUIT BUTTON_POWER |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index bd76245662..607348e91c 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -107,10 +107,10 @@ static struct plugin_api* rb; | |||
107 | #define MAZEZAM_RIGHT BUTTON_RIGHT | 107 | #define MAZEZAM_RIGHT BUTTON_RIGHT |
108 | #define MAZEZAM_SELECT BUTTON_SELECT | 108 | #define MAZEZAM_SELECT BUTTON_SELECT |
109 | 109 | ||
110 | #define MAZEZAM_RETRY BUTTON_MENU | 110 | #define MAZEZAM_RETRY BUTTON_A |
111 | #define MAZEZAM_RETRY_KEYNAME "[MENU]" | 111 | #define MAZEZAM_RETRY_KEYNAME "[A]" |
112 | #define MAZEZAM_QUIT BUTTON_A | 112 | #define MAZEZAM_QUIT BUTTON_POWER |
113 | #define MAZEZAM_QUIT_KEYNAME "[A]" | 113 | #define MAZEZAM_QUIT_KEYNAME "[POWER]" |
114 | 114 | ||
115 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 115 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
116 | #define MAZEZAM_UP BUTTON_UP | 116 | #define MAZEZAM_UP BUTTON_UP |
diff --git a/apps/plugins/midiplay.c b/apps/plugins/midiplay.c index 3feec0fca7..e586f7b0fe 100644 --- a/apps/plugins/midiplay.c +++ b/apps/plugins/midiplay.c | |||
@@ -51,8 +51,8 @@ PLUGIN_IRAM_DECLARE | |||
51 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 51 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
52 | #define BTN_QUIT BUTTON_POWER | 52 | #define BTN_QUIT BUTTON_POWER |
53 | #define BTN_RIGHT BUTTON_RIGHT | 53 | #define BTN_RIGHT BUTTON_RIGHT |
54 | #define BTN_UP BUTTON_VOL_UP | 54 | #define BTN_UP BUTTON_UP |
55 | #define BTN_DOWN BUTTON_VOL_DOWN | 55 | #define BTN_DOWN BUTTON_DOWN |
56 | 56 | ||
57 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 57 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
58 | #define BTN_QUIT BUTTON_POWER | 58 | #define BTN_QUIT BUTTON_POWER |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 668891fb3d..9dc983e4c1 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -98,9 +98,9 @@ enum minesweeper_status { | |||
98 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 98 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
99 | # define MINESWP_UP BUTTON_UP | 99 | # define MINESWP_UP BUTTON_UP |
100 | # define MINESWP_DOWN BUTTON_DOWN | 100 | # define MINESWP_DOWN BUTTON_DOWN |
101 | # define MINESWP_QUIT BUTTON_A | 101 | # define MINESWP_QUIT BUTTON_POWER |
102 | # define MINESWP_START BUTTON_SELECT | 102 | # define MINESWP_START BUTTON_SELECT |
103 | # define MINESWP_TOGGLE BUTTON_POWER | 103 | # define MINESWP_TOGGLE BUTTON_A |
104 | # define MINESWP_DISCOVER BUTTON_SELECT | 104 | # define MINESWP_DISCOVER BUTTON_SELECT |
105 | # define MINESWP_INFO BUTTON_MENU | 105 | # define MINESWP_INFO BUTTON_MENU |
106 | 106 | ||
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index 4e5928807c..0ccda0eaab 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -86,8 +86,8 @@ PLUGIN_HEADER | |||
86 | #define MOSAIQUE_RESTART BUTTON_PLAY | 86 | #define MOSAIQUE_RESTART BUTTON_PLAY |
87 | 87 | ||
88 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 88 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
89 | #define MOSAIQUE_QUIT BUTTON_A | 89 | #define MOSAIQUE_QUIT BUTTON_POWER |
90 | #define MOSAIQUE_SPEED BUTTON_MENU | 90 | #define MOSAIQUE_SPEED BUTTON_A |
91 | #define MOSAIQUE_RESTART BUTTON_SELECT | 91 | #define MOSAIQUE_RESTART BUTTON_SELECT |
92 | 92 | ||
93 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 93 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index 5f852c43f4..70372933e0 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2339,7 +2339,7 @@ void get_mp3_filename(char *wav_name) | |||
2339 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 2339 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
2340 | #define MP3ENC_PREV BUTTON_UP | 2340 | #define MP3ENC_PREV BUTTON_UP |
2341 | #define MP3ENC_NEXT BUTTON_DOWN | 2341 | #define MP3ENC_NEXT BUTTON_DOWN |
2342 | #define MP3ENC_DONE BUTTON_A | 2342 | #define MP3ENC_DONE BUTTON_POWER |
2343 | #define MP3ENC_SELECT BUTTON_SELECT | 2343 | #define MP3ENC_SELECT BUTTON_SELECT |
2344 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 2344 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
2345 | #define MP3ENC_PREV BUTTON_UP | 2345 | #define MP3ENC_PREV BUTTON_UP |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 5a8a4adc08..5b098dd7b4 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -137,7 +137,7 @@ PLUGIN_IRAM_DECLARE | |||
137 | 137 | ||
138 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 138 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
139 | #define MPEG_MENU BUTTON_MENU | 139 | #define MPEG_MENU BUTTON_MENU |
140 | #define MPEG_STOP BUTTON_A | 140 | #define MPEG_STOP BUTTON_POWER |
141 | #define MPEG_PAUSE BUTTON_SELECT | 141 | #define MPEG_PAUSE BUTTON_SELECT |
142 | #define MPEG_VOLDOWN BUTTON_LEFT | 142 | #define MPEG_VOLDOWN BUTTON_LEFT |
143 | #define MPEG_VOLUP BUTTON_RIGHT | 143 | #define MPEG_VOLUP BUTTON_RIGHT |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index b332dd6de9..1ffe8b770c 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -92,8 +92,8 @@ PLUGIN_HEADER | |||
92 | #define PONG_RIGHT_DOWN BUTTON_PLAY | 92 | #define PONG_RIGHT_DOWN BUTTON_PLAY |
93 | 93 | ||
94 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 94 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
95 | #define PONG_QUIT BUTTON_A | 95 | #define PONG_QUIT BUTTON_POWER |
96 | #define PONG_PAUSE BUTTON_MENU | 96 | #define PONG_PAUSE BUTTON_SELECT |
97 | #define PONG_LEFT_UP BUTTON_UP | 97 | #define PONG_LEFT_UP BUTTON_UP |
98 | #define PONG_LEFT_DOWN BUTTON_DOWN | 98 | #define PONG_LEFT_DOWN BUTTON_DOWN |
99 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 99 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index d5bf701b6f..2484d6eaaa 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -131,15 +131,15 @@ PLUGIN_HEADER | |||
131 | 131 | ||
132 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 132 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
133 | 133 | ||
134 | #define ROCKBLOX_OFF BUTTON_A | 134 | #define ROCKBLOX_OFF BUTTON_POWER |
135 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN | 135 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_VOL_DOWN |
136 | #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP | 136 | #define ROCKBLOX_ROTATE_LEFT BUTTON_VOL_UP |
137 | #define ROCKBLOX_ROTATE BUTTON_UP | 137 | #define ROCKBLOX_ROTATE BUTTON_UP |
138 | #define ROCKBLOX_DOWN BUTTON_DOWN | 138 | #define ROCKBLOX_DOWN BUTTON_DOWN |
139 | #define ROCKBLOX_LEFT BUTTON_LEFT | 139 | #define ROCKBLOX_LEFT BUTTON_LEFT |
140 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 140 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
141 | #define ROCKBLOX_DROP BUTTON_SELECT | 141 | #define ROCKBLOX_DROP BUTTON_SELECT |
142 | #define ROCKBLOX_RESTART BUTTON_MENU | 142 | #define ROCKBLOX_RESTART BUTTON_A |
143 | 143 | ||
144 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD | 144 | #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD |
145 | 145 | ||
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index cefa0e4f9e..6c99a3db18 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -120,7 +120,7 @@ void setoptions (void) | |||
120 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 120 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
121 | options.A=BUTTON_VOL_UP; | 121 | options.A=BUTTON_VOL_UP; |
122 | options.B=BUTTON_VOL_DOWN; | 122 | options.B=BUTTON_VOL_DOWN; |
123 | options.START=BUTTON_POWER; | 123 | options.START=BUTTON_A; |
124 | options.SELECT=BUTTON_SELECT; | 124 | options.SELECT=BUTTON_SELECT; |
125 | options.MENU=BUTTON_MENU; | 125 | options.MENU=BUTTON_MENU; |
126 | 126 | ||
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index a15d7b1141..da8f8052cb 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -71,11 +71,11 @@ PLUGIN_HEADER | |||
71 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 71 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
72 | 72 | ||
73 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 73 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
74 | #define ROCKPAINT_QUIT BUTTON_A | 74 | #define ROCKPAINT_QUIT BUTTON_POWER |
75 | #define ROCKPAINT_DRAW BUTTON_SELECT | 75 | #define ROCKPAINT_DRAW BUTTON_SELECT |
76 | #define ROCKPAINT_MENU BUTTON_MENU | 76 | #define ROCKPAINT_MENU BUTTON_MENU |
77 | #define ROCKPAINT_TOOLBAR BUTTON_POWER | 77 | #define ROCKPAINT_TOOLBAR BUTTON_A |
78 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_POWER | BUTTON_LEFT ) | 78 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_A | BUTTON_LEFT ) |
79 | #define ROCKPAINT_UP BUTTON_UP | 79 | #define ROCKPAINT_UP BUTTON_UP |
80 | #define ROCKPAINT_DOWN BUTTON_DOWN | 80 | #define ROCKPAINT_DOWN BUTTON_DOWN |
81 | #define ROCKPAINT_LEFT BUTTON_LEFT | 81 | #define ROCKPAINT_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index dfc0811506..fa1ee0e443 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -70,11 +70,11 @@ PLUGIN_HEADER | |||
70 | #define PUZZLE_PICTURE BUTTON_PLAY | 70 | #define PUZZLE_PICTURE BUTTON_PLAY |
71 | 71 | ||
72 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 72 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
73 | #define PUZZLE_QUIT BUTTON_A | 73 | #define PUZZLE_QUIT BUTTON_POWER |
74 | #define PUZZLE_UP BUTTON_UP | 74 | #define PUZZLE_UP BUTTON_UP |
75 | #define PUZZLE_DOWN BUTTON_DOWN | 75 | #define PUZZLE_DOWN BUTTON_DOWN |
76 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 76 | #define PUZZLE_SHUFFLE BUTTON_SELECT |
77 | #define PUZZLE_PICTURE BUTTON_POWER | 77 | #define PUZZLE_PICTURE BUTTON_A |
78 | 78 | ||
79 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 79 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
80 | #define PUZZLE_QUIT BUTTON_POWER | 80 | #define PUZZLE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index 96412cbd22..fa357a8418 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -77,7 +77,7 @@ PLUGIN_HEADER | |||
77 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 77 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
78 | 78 | ||
79 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 79 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
80 | #define SNAKE_QUIT BUTTON_A | 80 | #define SNAKE_QUIT BUTTON_POWER |
81 | #define SNAKE_UP BUTTON_UP | 81 | #define SNAKE_UP BUTTON_UP |
82 | #define SNAKE_DOWN BUTTON_DOWN | 82 | #define SNAKE_DOWN BUTTON_DOWN |
83 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 83 | #define SNAKE_PLAYPAUSE BUTTON_SELECT |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 786f54d239..2a2665cab3 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -222,7 +222,7 @@ PLUGIN_HEADER | |||
222 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 222 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
223 | #define SNAKE2_UP BUTTON_UP | 223 | #define SNAKE2_UP BUTTON_UP |
224 | #define SNAKE2_DOWN BUTTON_DOWN | 224 | #define SNAKE2_DOWN BUTTON_DOWN |
225 | #define SNAKE2_QUIT BUTTON_A | 225 | #define SNAKE2_QUIT BUTTON_POWER |
226 | #define SNAKE2_LEVEL_UP BUTTON_UP | 226 | #define SNAKE2_LEVEL_UP BUTTON_UP |
227 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN | 227 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN |
228 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT | 228 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 555389019a..87422c1013 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -44,7 +44,7 @@ PLUGIN_HEADER | |||
44 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 44 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
45 | #define SNOW_QUIT BUTTON_POWER | 45 | #define SNOW_QUIT BUTTON_POWER |
46 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 46 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
47 | #define SNOW_QUIT BUTTON_A | 47 | #define SNOW_QUIT BUTTON_POWER |
48 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 48 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
49 | #define SNOW_QUIT BUTTON_POWER | 49 | #define SNOW_QUIT BUTTON_POWER |
50 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 50 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index d9c3e64a03..40a2f549ad 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -136,11 +136,11 @@ enum { | |||
136 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 136 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
137 | #define SOKOBAN_UP BUTTON_UP | 137 | #define SOKOBAN_UP BUTTON_UP |
138 | #define SOKOBAN_DOWN BUTTON_DOWN | 138 | #define SOKOBAN_DOWN BUTTON_DOWN |
139 | #define SOKOBAN_QUIT BUTTON_A | 139 | #define SOKOBAN_QUIT BUTTON_POWER |
140 | #define SOKOBAN_UNDO BUTTON_SELECT | 140 | #define SOKOBAN_UNDO BUTTON_SELECT |
141 | #define SOKOBAN_REDO BUTTON_POWER | 141 | #define SOKOBAN_REDO BUTTON_A |
142 | #define SOKOBAN_LEVEL_UP (BUTTON_MENU | BUTTON_UP) | 142 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP |
143 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_DOWN) | 143 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN |
144 | #define SOKOBAN_LEVEL_REPEAT BUTTON_MENU | 144 | #define SOKOBAN_LEVEL_REPEAT BUTTON_MENU |
145 | 145 | ||
146 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 146 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
@@ -967,12 +967,12 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
967 | rb->lcd_putsxy(3, 26, "[REC] Down a Level"); | 967 | rb->lcd_putsxy(3, 26, "[REC] Down a Level"); |
968 | rb->lcd_putsxy(3, 36, "[PLAY] Up Level"); | 968 | rb->lcd_putsxy(3, 36, "[PLAY] Up Level"); |
969 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 969 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
970 | rb->lcd_putsxy(3, 6, "[A] Quit"); | 970 | rb->lcd_putsxy(3, 6, "[POWER] Quit"); |
971 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); | 971 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); |
972 | rb->lcd_putsxy(3, 26, "[POWER] Redo"); | 972 | rb->lcd_putsxy(3, 26, "[A] Redo"); |
973 | rb->lcd_putsxy(3, 36, "[MENU+DOWN] Down a Level"); | 973 | rb->lcd_putsxy(3, 36, "[VOL-] Down a Level"); |
974 | rb->lcd_putsxy(3, 46, "[MENU] Restart Level"); | 974 | rb->lcd_putsxy(3, 46, "[MENU] Restart Level"); |
975 | rb->lcd_putsxy(3, 56, "[MENU+UP] Up Level"); | 975 | rb->lcd_putsxy(3, 56, "[VOL+] Up Level"); |
976 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 976 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
977 | rb->lcd_putsxy(3, 6, "[POWER] Quit"); | 977 | rb->lcd_putsxy(3, 6, "[POWER] Quit"); |
978 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); | 978 | rb->lcd_putsxy(3, 16, "[SELECT] Undo"); |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 9dbeaebfa4..0b5b9a5fa9 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -177,7 +177,7 @@ static struct plugin_api* rb; | |||
177 | # define HK_REM2STACK "REC" | 177 | # define HK_REM2STACK "REC" |
178 | 178 | ||
179 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 179 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
180 | # define SOL_QUIT BUTTON_A | 180 | # define SOL_QUIT BUTTON_POWER |
181 | # define SOL_UP BUTTON_UP | 181 | # define SOL_UP BUTTON_UP |
182 | # define SOL_DOWN BUTTON_DOWN | 182 | # define SOL_DOWN BUTTON_DOWN |
183 | # define SOL_LEFT BUTTON_LEFT | 183 | # define SOL_LEFT BUTTON_LEFT |
@@ -185,14 +185,14 @@ static struct plugin_api* rb; | |||
185 | # define SOL_MOVE_PRE BUTTON_SELECT | 185 | # define SOL_MOVE_PRE BUTTON_SELECT |
186 | # define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) | 186 | # define SOL_MOVE (BUTTON_SELECT | BUTTON_REL) |
187 | # define SOL_DRAW BUTTON_MENU | 187 | # define SOL_DRAW BUTTON_MENU |
188 | # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_POWER) | 188 | # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_A) |
189 | # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) | 189 | # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) |
190 | # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_POWER) | 190 | # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_A) |
191 | # define HK_MOVE "SELECT" | 191 | # define HK_MOVE "SELECT" |
192 | # define HK_DRAW "MENU" | 192 | # define HK_DRAW "MENU" |
193 | # define HK_REM2CUR "POWER+LEFT" | 193 | # define HK_REM2CUR "A+LEFT" |
194 | # define HK_CUR2STACK "SELECT.." | 194 | # define HK_CUR2STACK "SELECT.." |
195 | # define HK_REM2STACK "POWER+RIGHT" | 195 | # define HK_REM2STACK "A+RIGHT" |
196 | 196 | ||
197 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 197 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
198 | # define SOL_QUIT BUTTON_POWER | 198 | # define SOL_QUIT BUTTON_POWER |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 74e65d8185..47be0cd6fe 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -107,8 +107,8 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
107 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) | 107 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) |
108 | 108 | ||
109 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 109 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
110 | #define AST_PAUSE BUTTON_POWER | 110 | #define AST_PAUSE BUTTON_A |
111 | #define AST_QUIT BUTTON_A | 111 | #define AST_QUIT BUTTON_POWER |
112 | #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT | 112 | #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT |
113 | #define AST_THRUST BUTTON_UP | 113 | #define AST_THRUST BUTTON_UP |
114 | #define AST_HYPERSPACE BUTTON_DOWN | 114 | #define AST_HYPERSPACE BUTTON_DOWN |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 071a0bb284..56cbe8c75d 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -134,14 +134,14 @@ PLUGIN_HEADER | |||
134 | 134 | ||
135 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 135 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
136 | 136 | ||
137 | #define STAR_QUIT BUTTON_A | 137 | #define STAR_QUIT BUTTON_POWER |
138 | #define STAR_UP BUTTON_UP | 138 | #define STAR_UP BUTTON_UP |
139 | #define STAR_DOWN BUTTON_DOWN | 139 | #define STAR_DOWN BUTTON_DOWN |
140 | #define STAR_TOGGLE_CONTROL BUTTON_MENU | 140 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
141 | #define STAR_LEVEL_UP (BUTTON_POWER | BUTTON_UP) | 141 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
142 | #define STAR_LEVEL_DOWN (BUTTON_POWER | BUTTON_DOWN) | 142 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
143 | #define STAR_LEVEL_REPEAT (BUTTON_POWER | BUTTON_RIGHT) | 143 | #define STAR_LEVEL_REPEAT BUTTON_A |
144 | #define STAR_MENU_RUN BUTTON_RIGHT | 144 | #define STAR_MENU_RUN BUTTON_SELECT |
145 | 145 | ||
146 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 146 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
147 | 147 | ||
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 586c8ae97d..a89ea236b9 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -46,7 +46,7 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
46 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | 46 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT |
47 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | 47 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT |
48 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 48 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
49 | #define STARFIELD_QUIT BUTTON_A | 49 | #define STARFIELD_QUIT BUTTON_POWER |
50 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 50 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
51 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | 51 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN |
52 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | 52 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index 5b6e76cb81..0f52954abf 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -50,7 +50,7 @@ static bool abort; | |||
50 | #define STATS_STOP_REMOTE BUTTON_RC_PLAY | 50 | #define STATS_STOP_REMOTE BUTTON_RC_PLAY |
51 | 51 | ||
52 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 52 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
53 | #define STATS_STOP BUTTON_A | 53 | #define STATS_STOP BUTTON_POWER |
54 | 54 | ||
55 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 55 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
56 | #define STATS_STOP BUTTON_POWER | 56 | #define STATS_STOP BUTTON_POWER |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index a2dd647e90..9a66103429 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -93,9 +93,9 @@ PLUGIN_HEADER | |||
93 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 93 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
94 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 94 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
95 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 95 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
96 | #define STOPWATCH_QUIT BUTTON_A | 96 | #define STOPWATCH_QUIT BUTTON_POWER |
97 | #define STOPWATCH_START_STOP BUTTON_SELECT | 97 | #define STOPWATCH_START_STOP BUTTON_SELECT |
98 | #define STOPWATCH_RESET_TIMER BUTTON_POWER | 98 | #define STOPWATCH_RESET_TIMER BUTTON_A |
99 | #define STOPWATCH_LAP_TIMER BUTTON_MENU | 99 | #define STOPWATCH_LAP_TIMER BUTTON_MENU |
100 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 100 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
101 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 101 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 94fae58d9a..f850fcf327 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -91,14 +91,14 @@ | |||
91 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 91 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
92 | 92 | ||
93 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 93 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
94 | #define SUDOKU_BUTTON_QUIT BUTTON_A | 94 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
95 | #define SUDOKU_BUTTON_UP BUTTON_UP | 95 | #define SUDOKU_BUTTON_UP BUTTON_UP |
96 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 96 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
97 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 97 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
98 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 98 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
99 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | 99 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT |
100 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 100 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
101 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_POWER | 101 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_A |
102 | 102 | ||
103 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) | 103 | #elif (CONFIG_KEYPAD == IRIVER_H10_PAD) |
104 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 104 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index fff64d4b7f..275cea326e 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -86,8 +86,8 @@ PLUGIN_HEADER | |||
86 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 86 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
87 | #define VUMETER_QUIT BUTTON_POWER | 87 | #define VUMETER_QUIT BUTTON_POWER |
88 | #define VUMETER_HELP BUTTON_A | 88 | #define VUMETER_HELP BUTTON_A |
89 | #define VUMETER_MENU BUTTON_SELECT | 89 | #define VUMETER_MENU BUTTON_MENU |
90 | #define VUMETER_MENU_EXIT BUTTON_SELECT | 90 | #define VUMETER_MENU_EXIT BUTTON_MENU |
91 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | 91 | #define VUMETER_MENU_EXIT2 BUTTON_POWER |
92 | #define VUMETER_LEFT BUTTON_LEFT | 92 | #define VUMETER_LEFT BUTTON_LEFT |
93 | #define VUMETER_RIGHT BUTTON_RIGHT | 93 | #define VUMETER_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 828bba3359..c4607cd618 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -139,8 +139,8 @@ PLUGIN_HEADER | |||
139 | #define BTN_DIR_LEFT BUTTON_LEFT | 139 | #define BTN_DIR_LEFT BUTTON_LEFT |
140 | #define BTN_DIR_RIGHT BUTTON_RIGHT | 140 | #define BTN_DIR_RIGHT BUTTON_RIGHT |
141 | #define BTN_STARTPAUSE BUTTON_SELECT | 141 | #define BTN_STARTPAUSE BUTTON_SELECT |
142 | #define BTN_QUIT BUTTON_A | 142 | #define BTN_QUIT BUTTON_POWER |
143 | #define BTN_STOPRESET BUTTON_POWER | 143 | #define BTN_STOPRESET BUTTON_A |
144 | 144 | ||
145 | #define PLAYERS_TEXT "Up/Down" | 145 | #define PLAYERS_TEXT "Up/Down" |
146 | #define WORMS_TEXT "Left/Right" | 146 | #define WORMS_TEXT "Left/Right" |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 49e730d2b2..51f89d2466 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -68,13 +68,13 @@ PLUGIN_HEADER | |||
68 | 68 | ||
69 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) | 69 | #elif (CONFIG_KEYPAD == GIGABEAT_PAD) |
70 | 70 | ||
71 | #define QUIT BUTTON_A | 71 | #define QUIT BUTTON_POWER |
72 | #define LEFT BUTTON_LEFT | 72 | #define LEFT BUTTON_LEFT |
73 | #define RIGHT BUTTON_RIGHT | 73 | #define RIGHT BUTTON_RIGHT |
74 | #define SELECT BUTTON_SELECT | 74 | #define SELECT BUTTON_SELECT |
75 | #define UP BUTTON_UP | 75 | #define UP BUTTON_UP |
76 | #define DOWN BUTTON_DOWN | 76 | #define DOWN BUTTON_DOWN |
77 | #define PAUSE BUTTON_MENU | 77 | #define PAUSE BUTTON_A |
78 | 78 | ||
79 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) | 79 | #elif (CONFIG_KEYPAD == SANSA_E200_PAD) |
80 | 80 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index 9bfcf5c4b0..39cbaa9f6f 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -82,7 +82,7 @@ | |||
82 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 82 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
83 | 83 | ||
84 | #define KBD_SELECT BUTTON_SELECT | 84 | #define KBD_SELECT BUTTON_SELECT |
85 | #define KBD_ABORT BUTTON_A | 85 | #define KBD_ABORT BUTTON_POWER |
86 | #define KBD_LEFT BUTTON_LEFT | 86 | #define KBD_LEFT BUTTON_LEFT |
87 | #define KBD_RIGHT BUTTON_RIGHT | 87 | #define KBD_RIGHT BUTTON_RIGHT |
88 | #define KBD_UP BUTTON_UP | 88 | #define KBD_UP BUTTON_UP |