diff options
Diffstat (limited to 'apps/plugins')
57 files changed, 515 insertions, 5 deletions
diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES index 4f782dc455..a274622722 100644 --- a/apps/plugins/SOURCES +++ b/apps/plugins/SOURCES | |||
@@ -1,5 +1,3 @@ | |||
1 | #if !defined(COWON_D2) | ||
2 | |||
3 | /* plugins common to all models */ | 1 | /* plugins common to all models */ |
4 | battery_bench.c | 2 | battery_bench.c |
5 | chessclock.c | 3 | chessclock.c |
@@ -149,4 +147,3 @@ invadrox.c | |||
149 | superdom.c | 147 | superdom.c |
150 | #endif | 148 | #endif |
151 | #endif /* m:robe 500 */ | 149 | #endif /* m:robe 500 */ |
152 | #endif /* COWON_D2 */ | ||
diff --git a/apps/plugins/SUBDIRS b/apps/plugins/SUBDIRS index b82c6ad172..9bda7c2715 100644 --- a/apps/plugins/SUBDIRS +++ b/apps/plugins/SUBDIRS | |||
@@ -1,4 +1,4 @@ | |||
1 | #if !defined(IRIVER_IFP7XX_SERIES) && !defined(COWON_D2) && !defined(GIGABEAT_S) | 1 | #if !defined(IRIVER_IFP7XX_SERIES) && !defined(GIGABEAT_S) |
2 | 2 | ||
3 | /* For all targets */ | 3 | /* For all targets */ |
4 | shortcuts | 4 | shortcuts |
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 6b52a4d489..ad45d6562d 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c | |||
@@ -144,6 +144,13 @@ PLUGIN_HEADER | |||
144 | #define BATTERY_ON_TXT "PLAY - start" | 144 | #define BATTERY_ON_TXT "PLAY - start" |
145 | #define BATTERY_OFF_TXT "REC - quit" | 145 | #define BATTERY_OFF_TXT "REC - quit" |
146 | 146 | ||
147 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
148 | |||
149 | #define BATTERY_ON BUTTON_MENU | ||
150 | #define BATTERY_OFF BUTTON_POWER | ||
151 | #define BATTERY_ON_TXT "MENU - start" | ||
152 | #define BATTERY_OFF_TXT "POWER - quit" | ||
153 | |||
147 | #else | 154 | #else |
148 | #error No keymap defined! | 155 | #error No keymap defined! |
149 | #endif | 156 | #endif |
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index fc2f542077..f69ca1e6b0 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -250,6 +250,21 @@ PLUGIN_HEADER | |||
250 | #define BJACK_RIGHT BUTTON_RC_FF | 250 | #define BJACK_RIGHT BUTTON_RC_FF |
251 | #define BJACK_LEFT BUTTON_RC_REW | 251 | #define BJACK_LEFT BUTTON_RC_REW |
252 | 252 | ||
253 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
254 | #define BJACK_START BUTTON_SELECT | ||
255 | #define BJACK_QUIT BUTTON_POWER | ||
256 | #define BJACK_MAX BUTTON_PLUS | ||
257 | #define BJACK_MIN BUTTON_MINUS | ||
258 | #define BJACK_HIT BUTTON_SELECT | ||
259 | #define BJACK_STAY BUTTON_MENU | ||
260 | #define BJACK_DOUBLEDOWN (BUTTON_DOWN|BUTTON_MENU) | ||
261 | #define BJACK_SCORES (BUTTON_SELECT|BUTTON_MENU) | ||
262 | #define BJACK_RESUME (BUTTON_SELECT|BUTTON_PLUS) | ||
263 | #define BJACK_UP BUTTON_UP | ||
264 | #define BJACK_DOWN BUTTON_DOWN | ||
265 | #define BJACK_RIGHT BUTTON_RIGHT | ||
266 | #define BJACK_LEFT BUTTON_LEFT | ||
267 | |||
253 | #else | 268 | #else |
254 | #error No keymap defined! | 269 | #error No keymap defined! |
255 | #endif | 270 | #endif |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 8216a396e9..2400325032 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -138,6 +138,14 @@ PLUGIN_HEADER | |||
138 | #define BOUNCE_QUIT BUTTON_RC_REC | 138 | #define BOUNCE_QUIT BUTTON_RC_REC |
139 | #define BOUNCE_MODE BUTTON_RC_MODE | 139 | #define BOUNCE_MODE BUTTON_RC_MODE |
140 | 140 | ||
141 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
142 | #define BOUNCE_LEFT BUTTON_LEFT | ||
143 | #define BOUNCE_RIGHT BUTTON_RIGHT | ||
144 | #define BOUNCE_UP BUTTON_UP | ||
145 | #define BOUNCE_DOWN BUTTON_DOWN | ||
146 | #define BOUNCE_QUIT BUTTON_POWER | ||
147 | #define BOUNCE_MODE BUTTON_MENU | ||
148 | |||
141 | #else | 149 | #else |
142 | #error No keymap defined! | 150 | #error No keymap defined! |
143 | #endif | 151 | #endif |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index d376ad20d0..bae8dededf 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -164,6 +164,15 @@ PLUGIN_HEADER | |||
164 | 164 | ||
165 | #define RC_QUIT BUTTON_REC | 165 | #define RC_QUIT BUTTON_REC |
166 | 166 | ||
167 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
168 | |||
169 | #define QUIT BUTTON_POWER | ||
170 | #define LEFT BUTTON_LEFT | ||
171 | #define RIGHT BUTTON_RIGHT | ||
172 | #define SELECT BUTTON_SELECT | ||
173 | #define UP BUTTON_UP | ||
174 | #define DOWN BUTTON_DOWN | ||
175 | |||
167 | #else | 176 | #else |
168 | #error No keymap defined! | 177 | #error No keymap defined! |
169 | #endif | 178 | #endif |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 53be78fdd9..1cb1ee915d 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -249,6 +249,18 @@ PLUGIN_HEADER | |||
249 | 249 | ||
250 | #define CALCULATOR_RC_QUIT BUTTON_REC | 250 | #define CALCULATOR_RC_QUIT BUTTON_REC |
251 | 251 | ||
252 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
253 | |||
254 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
255 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
256 | #define CALCULATOR_UP BUTTON_UP | ||
257 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
258 | #define CALCULATOR_QUIT BUTTON_POWER | ||
259 | #define CALCULATOR_INPUT_CALC_PRE BUTTON_MINUS | ||
260 | #define CALCULATOR_INPUT BUTTON_PLUS | ||
261 | #define CALCULATOR_CALC BUTTON_SELECT | ||
262 | #define CALCULATOR_CLEAR BUTTON_MENU | ||
263 | |||
252 | #else | 264 | #else |
253 | #error No keymap defined! | 265 | #error No keymap defined! |
254 | #endif | 266 | #endif |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 59760ec7b3..a6b647b034 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -247,6 +247,22 @@ | |||
247 | 247 | ||
248 | #define CB_RC_QUIT BUTTON_REC | 248 | #define CB_RC_QUIT BUTTON_REC |
249 | 249 | ||
250 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
251 | #define CB_SELECT BUTTON_SELECT | ||
252 | #define CB_UP BUTTON_UP | ||
253 | #define CB_DOWN BUTTON_DOWN | ||
254 | #define CB_LEFT BUTTON_LEFT | ||
255 | #define CB_RIGHT BUTTON_RIGHT | ||
256 | #define CB_PLAY BUTTON_MENU | ||
257 | #define CB_LEVEL BUTTON_PLUS | ||
258 | #define CB_RESTART (BUTTON_SELECT | BUTTON_MENU) | ||
259 | #define CB_MENU BUTTON_POWER | ||
260 | |||
261 | #define CB_SCROLL_UP (BUTTON_UP|BUTTON_MENU) | ||
262 | #define CB_SCROLL_DOWN (BUTTON_DOWN|BUTTON_MENU) | ||
263 | #define CB_SCROLL_LEFT (BUTTON_LEFT|BUTTON_MENU) | ||
264 | #define CB_SCROLL_RIGHT (BUTTON_RIGHT|BUTTON_MENU) | ||
265 | |||
250 | #else | 266 | #else |
251 | #error No keymap defined! | 267 | #error No keymap defined! |
252 | #endif | 268 | #endif |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 7d16c7c629..34eeb6b0db 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -180,6 +180,16 @@ PLUGIN_HEADER | |||
180 | #define CHC_SETTINGS_OK BUTTON_RC_PLAY | 180 | #define CHC_SETTINGS_OK BUTTON_RC_PLAY |
181 | #define CHC_SETTINGS_CANCEL BUTTON_RC_REC | 181 | #define CHC_SETTINGS_CANCEL BUTTON_RC_REC |
182 | 182 | ||
183 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
184 | #define CHC_QUIT BUTTON_POWER | ||
185 | #define CHC_STARTSTOP BUTTON_SELECT | ||
186 | #define CHC_RESET (BUTTON_SELECT|BUTTON_MENU) | ||
187 | #define CHC_MENU BUTTON_MENU | ||
188 | #define CHC_SETTINGS_INC BUTTON_UP | ||
189 | #define CHC_SETTINGS_DEC BUTTON_DOWN | ||
190 | #define CHC_SETTINGS_OK BUTTON_SELECT | ||
191 | #define CHC_SETTINGS_CANCEL BUTTON_POWER | ||
192 | |||
183 | #else | 193 | #else |
184 | #error No keymap defined! | 194 | #error No keymap defined! |
185 | #endif | 195 | #endif |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 5fbf1be7fb..7e6fda0bbc 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1077,6 +1077,14 @@ STATIC void chip8 (void) | |||
1077 | #define CHIP8_KEY6 BUTTON_RC_FF | 1077 | #define CHIP8_KEY6 BUTTON_RC_FF |
1078 | #define CHIP8_KEY8 BUTTON_RC_VOL_DOWN | 1078 | #define CHIP8_KEY8 BUTTON_RC_VOL_DOWN |
1079 | 1079 | ||
1080 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
1081 | #define CHIP8_OFF BUTTON_POWER | ||
1082 | #define CHIP8_KEY2 BUTTON_DOWN | ||
1083 | #define CHIP8_KEY4 BUTTON_LEFT | ||
1084 | #define CHIP8_KEY5 BUTTON_SELECT | ||
1085 | #define CHIP8_KEY6 BUTTON_RIGHT | ||
1086 | #define CHIP8_KEY8 BUTTON_UP | ||
1087 | |||
1080 | #else | 1088 | #else |
1081 | #error No keymap defined! | 1089 | #error No keymap defined! |
1082 | #endif | 1090 | #endif |
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index 02cc2ffd92..f359023678 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -103,6 +103,12 @@ Still To do: | |||
103 | #define ACTION2 BUTTON_RC_MODE | 103 | #define ACTION2 BUTTON_RC_MODE |
104 | #define ACTIONTEXT "PLAY" | 104 | #define ACTIONTEXT "PLAY" |
105 | 105 | ||
106 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
107 | #define QUIT BUTTON_POWER | ||
108 | #define ACTION BUTTON_UP | ||
109 | #define ACTION2 BUTTON_MENU | ||
110 | #define ACTIONTEXT "UP" | ||
111 | |||
106 | #else | 112 | #else |
107 | #error No keymap defined! | 113 | #error No keymap defined! |
108 | #endif | 114 | #endif |
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 96d95fc4d0..78a0015713 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -241,6 +241,19 @@ PLUGIN_HEADER | |||
241 | #define CUBE_PAUSE BUTTON_RC_PLAY | 241 | #define CUBE_PAUSE BUTTON_RC_PLAY |
242 | #define CUBE_HIGHSPEED BUTTON_RC_MENU | 242 | #define CUBE_HIGHSPEED BUTTON_RC_MENU |
243 | 243 | ||
244 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
245 | #define CUBE_QUIT BUTTON_POWER | ||
246 | #define CUBE_X_INC BUTTON_RIGHT | ||
247 | #define CUBE_X_DEC BUTTON_LEFT | ||
248 | #define CUBE_Y_INC BUTTON_UP | ||
249 | #define CUBE_Y_DEC BUTTON_DOWN | ||
250 | #define CUBE_Z_INC BUTTON_PLUS | ||
251 | #define CUBE_Z_DEC BUTTON_MINUS | ||
252 | #define CUBE_MODE BUTTON_MENU | ||
253 | #define CUBE_PAUSE_PRE BUTTON_SELECT | ||
254 | #define CUBE_PAUSE (BUTTON_MINUS | BUTTON_REL) | ||
255 | #define CUBE_HIGHSPEED (BUTTON_PLUS | BUTTON_REL) | ||
256 | |||
244 | #else | 257 | #else |
245 | #error No keymap defined! | 258 | #error No keymap defined! |
246 | #endif | 259 | #endif |
diff --git a/apps/plugins/dict.c b/apps/plugins/dict.c index 159d1c669f..a149f0089a 100644 --- a/apps/plugins/dict.c +++ b/apps/plugins/dict.c | |||
@@ -127,6 +127,8 @@ long reverse (long N) { | |||
127 | #define LP_QUIT BUTTON_BACK | 127 | #define LP_QUIT BUTTON_BACK |
128 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 128 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
129 | #define LP_QUIT BUTTON_RC_REC | 129 | #define LP_QUIT BUTTON_RC_REC |
130 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
131 | #define LP_QUIT BUTTON_POWER | ||
130 | #else | 132 | #else |
131 | #define LP_QUIT BUTTON_OFF | 133 | #define LP_QUIT BUTTON_OFF |
132 | #endif | 134 | #endif |
diff --git a/apps/plugins/disktidy.c b/apps/plugins/disktidy.c index 3bf8f3507d..b32dce2737 100644 --- a/apps/plugins/disktidy.c +++ b/apps/plugins/disktidy.c | |||
@@ -82,6 +82,9 @@ enum tidy_system | |||
82 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 82 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
83 | #define TIDY_STOP BUTTON_RC_REC | 83 | #define TIDY_STOP BUTTON_RC_REC |
84 | 84 | ||
85 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
86 | #define TIDY_STOP BUTTON_POWER | ||
87 | |||
85 | #else | 88 | #else |
86 | #error No keymap defined! | 89 | #error No keymap defined! |
87 | #endif | 90 | #endif |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index e6cc272808..bc0f204d3b 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -235,6 +235,16 @@ void I_ShutdownGraphics(void) | |||
235 | #define DOOMBUTTON_ESC BUTTON_OFF | 235 | #define DOOMBUTTON_ESC BUTTON_OFF |
236 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 236 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
237 | #define DOOMBUTTON_WEAPON BUTTON_ON | 237 | #define DOOMBUTTON_WEAPON BUTTON_ON |
238 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
239 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
240 | #define DOOMBUTTON_UP BUTTON_UP | ||
241 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
242 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
243 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
244 | #define DOOMBUTTON_OPEN BUTTON_PLUS | ||
245 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
246 | #define DOOMBUTTON_ENTER BUTTON_MENU | ||
247 | #define DOOMBUTTON_WEAPON BUTTON_MINUS | ||
238 | #else | 248 | #else |
239 | #error Keymap not defined! | 249 | #error Keymap not defined! |
240 | #endif | 250 | #endif |
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c index 68fe2ebe25..3af9bdf39d 100644 --- a/apps/plugins/fireworks.c +++ b/apps/plugins/fireworks.c | |||
@@ -69,7 +69,9 @@ static struct plugin_api* rb; | |||
69 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 69 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
70 | #define BTN_MENU BUTTON_RC_REC | 70 | #define BTN_MENU BUTTON_RC_REC |
71 | #define BTN_FIRE BUTTON_RC_PLAY | 71 | #define BTN_FIRE BUTTON_RC_PLAY |
72 | 72 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | |
73 | #define BTN_MENU BUTTON_MENU | ||
74 | #define BTN_FIRE BUTTON_SELECT | ||
73 | #else | 75 | #else |
74 | #error No keymap defined! | 76 | #error No keymap defined! |
75 | #endif | 77 | #endif |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 831cc857ec..37e49af68e 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -189,6 +189,19 @@ PLUGIN_HEADER | |||
189 | 189 | ||
190 | #define FLIPIT_RC_QUIT BUTTON_REC | 190 | #define FLIPIT_RC_QUIT BUTTON_REC |
191 | 191 | ||
192 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
193 | |||
194 | #define FLIPIT_LEFT BUTTON_LEFT | ||
195 | #define FLIPIT_RIGHT BUTTON_RIGHT | ||
196 | #define FLIPIT_UP BUTTON_UP | ||
197 | #define FLIPIT_DOWN BUTTON_DOWN | ||
198 | #define FLIPIT_QUIT BUTTON_POWER | ||
199 | #define FLIPIT_SHUFFLE (BUTTON_LEFT|BUTTON_MENU) | ||
200 | #define FLIPIT_SOLVE (BUTTON_RIGHT|BUTTON_MENU) | ||
201 | #define FLIPIT_STEP_BY_STEP BUTTON_MINUS | ||
202 | #define FLIPIT_TOGGLE_PRE BUTTON_PLUS | ||
203 | #define FLIPIT_TOGGLE BUTTON_SELECT | ||
204 | |||
192 | #else | 205 | #else |
193 | #error No keymap defined! | 206 | #error No keymap defined! |
194 | #endif | 207 | #endif |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index 8f5c0bf5a3..d7439ee19e 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -114,6 +114,13 @@ PLUGIN_HEADER | |||
114 | #define RIGHT BUTTON_RIGHT | 114 | #define RIGHT BUTTON_RIGHT |
115 | #define FIRE BUTTON_SELECT | 115 | #define FIRE BUTTON_SELECT |
116 | 116 | ||
117 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
118 | |||
119 | #define QUIT BUTTON_POWER | ||
120 | #define LEFT BUTTON_MINUS | ||
121 | #define RIGHT BUTTON_PLUS | ||
122 | #define FIRE BUTTON_MENU | ||
123 | |||
117 | #else | 124 | #else |
118 | #error INVADROX: Unsupported keypad | 125 | #error INVADROX: Unsupported keypad |
119 | #endif | 126 | #endif |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 5579c194e8..08807d7225 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -138,6 +138,14 @@ PLUGIN_HEADER | |||
138 | 138 | ||
139 | #define JEWELS_RC_CANCEL BUTTON_REC | 139 | #define JEWELS_RC_CANCEL BUTTON_REC |
140 | 140 | ||
141 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
142 | #define JEWELS_UP BUTTON_UP | ||
143 | #define JEWELS_DOWN BUTTON_DOWN | ||
144 | #define JEWELS_LEFT BUTTON_LEFT | ||
145 | #define JEWELS_RIGHT BUTTON_RIGHT | ||
146 | #define JEWELS_SELECT BUTTON_SELECT | ||
147 | #define JEWELS_CANCEL BUTTON_POWER | ||
148 | |||
141 | #else | 149 | #else |
142 | #error No keymap defined! | 150 | #error No keymap defined! |
143 | #endif | 151 | #endif |
diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index ad0ce6c857..e2c1b4861b 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c | |||
@@ -198,6 +198,17 @@ PLUGIN_HEADER | |||
198 | #define JPEG_NEXT (BUTTON_DISPLAY | BUTTON_RIGHT) | 198 | #define JPEG_NEXT (BUTTON_DISPLAY | BUTTON_RIGHT) |
199 | #define JPEG_PREVIOUS (BUTTON_DISPLAY | BUTTON_LEFT) | 199 | #define JPEG_PREVIOUS (BUTTON_DISPLAY | BUTTON_LEFT) |
200 | 200 | ||
201 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
202 | #define JPEG_ZOOM_IN BUTTON_PLUS | ||
203 | #define JPEG_ZOOM_OUT BUTTON_MINUS | ||
204 | #define JPEG_UP BUTTON_UP | ||
205 | #define JPEG_DOWN BUTTON_DOWN | ||
206 | #define JPEG_LEFT BUTTON_LEFT | ||
207 | #define JPEG_RIGHT BUTTON_RIGHT | ||
208 | #define JPEG_MENU BUTTON_MENU | ||
209 | #define JPEG_NEXT (BUTTON_SELECT|BUTTON_PLUS) | ||
210 | #define JPEG_PREVIOUS (BUTTON_SELECT|BUTTON_MINUS) | ||
211 | |||
201 | #else | 212 | #else |
202 | #error No keymap defined! | 213 | #error No keymap defined! |
203 | #endif | 214 | #endif |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index 9b33108fcb..7a1a746d4a 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -136,6 +136,13 @@ const unsigned char rockbox16x7[] = { | |||
136 | #define LP_DEC_Y BUTTON_RC_VOL_DOWN | 136 | #define LP_DEC_Y BUTTON_RC_VOL_DOWN |
137 | #define LP_INC_Y BUTTON_RC_VOL_UP | 137 | #define LP_INC_Y BUTTON_RC_VOL_UP |
138 | 138 | ||
139 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
140 | #define LP_QUIT BUTTON_POWER | ||
141 | #define LP_DEC_X BUTTON_LEFT | ||
142 | #define LP_INC_X BUTTON_RIGHT | ||
143 | #define LP_DEC_Y BUTTON_DOWN | ||
144 | #define LP_INC_Y BUTTON_UP | ||
145 | |||
139 | #else | 146 | #else |
140 | #define LP_QUIT BUTTON_OFF | 147 | #define LP_QUIT BUTTON_OFF |
141 | #define LP_DEC_X BUTTON_LEFT | 148 | #define LP_DEC_X BUTTON_LEFT |
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c index 4c5e7d7458..26ec3e4ab9 100644 --- a/apps/plugins/mandelbrot.c +++ b/apps/plugins/mandelbrot.c | |||
@@ -202,6 +202,20 @@ PLUGIN_HEADER | |||
202 | #define MANDELBROT_MAXITER_DEC BUTTON_PLAY | 202 | #define MANDELBROT_MAXITER_DEC BUTTON_PLAY |
203 | #define MANDELBROT_RESET BUTTON_DISPLAY | 203 | #define MANDELBROT_RESET BUTTON_DISPLAY |
204 | 204 | ||
205 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
206 | #define MANDELBROT_QUIT BUTTON_POWER | ||
207 | #define MANDELBROT_UP BUTTON_UP | ||
208 | #define MANDELBROT_DOWN BUTTON_DOWN | ||
209 | #define MANDELBROT_LEFT BUTTON_LEFT | ||
210 | #define MANDELBROT_RIGHT BUTTON_RIGHT | ||
211 | #define MANDELBROT_ZOOM_IN_PRE BUTTON_SELECT | ||
212 | #define MANDELBROT_ZOOM_IN (BUTTON_SELECT | BUTTON_PLUS) | ||
213 | #define MANDELBROT_ZOOM_OUT_PRE BUTTON_SELECT | ||
214 | #define MANDELBROT_ZOOM_OUT (BUTTON_SELECT | BUTTON_MINUS) | ||
215 | #define MANDELBROT_MAXITER_INC BUTTON_PLUS | ||
216 | #define MANDELBROT_MAXITER_DEC BUTTON_MINUS | ||
217 | #define MANDELBROT_RESET BUTTON_MENU | ||
218 | |||
205 | #else | 219 | #else |
206 | #error No keymap defined! | 220 | #error No keymap defined! |
207 | #endif | 221 | #endif |
diff --git a/apps/plugins/matrix.c b/apps/plugins/matrix.c index 19763b6005..c445867d62 100644 --- a/apps/plugins/matrix.c +++ b/apps/plugins/matrix.c | |||
@@ -95,6 +95,11 @@ extern const fb_data matrix_normal[]; | |||
95 | #define MATRIX_SLEEP_MORE BUTTON_RC_VOL_UP | 95 | #define MATRIX_SLEEP_MORE BUTTON_RC_VOL_UP |
96 | #define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN | 96 | #define MATRIX_SLEEP_LESS BUTTON_RC_VOL_DOWN |
97 | #define MATRIX_PAUSE BUTTON_RC_PLAY | 97 | #define MATRIX_PAUSE BUTTON_RC_PLAY |
98 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
99 | #define MATRIX_EXIT BUTTON_POWER | ||
100 | #define MATRIX_SLEEP_MORE BUTTON_PLUS | ||
101 | #define MATRIX_SLEEP_LESS BUTTON_MINUS | ||
102 | #define MATRIX_PAUSE BUTTON_MENU | ||
98 | #else | 103 | #else |
99 | #error Unsupported keypad | 104 | #error Unsupported keypad |
100 | #endif | 105 | #endif |
diff --git a/apps/plugins/mazezam.c b/apps/plugins/mazezam.c index 69997af9c3..dac73473ce 100644 --- a/apps/plugins/mazezam.c +++ b/apps/plugins/mazezam.c | |||
@@ -177,6 +177,18 @@ MEM_FUNCTION_WRAPPERS(rb); | |||
177 | #define MAZEZAM_QUIT BUTTON_RC_REC | 177 | #define MAZEZAM_QUIT BUTTON_RC_REC |
178 | #define MAZEZAM_QUIT_KEYNAME "[REC]" | 178 | #define MAZEZAM_QUIT_KEYNAME "[REC]" |
179 | 179 | ||
180 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
181 | #define MAZEZAM_UP BUTTON_UP | ||
182 | #define MAZEZAM_DOWN BUTTON_DOWN | ||
183 | #define MAZEZAM_LEFT BUTTON_LEFT | ||
184 | #define MAZEZAM_RIGHT BUTTON_RIGHT | ||
185 | #define MAZEZAM_SELECT BUTTON_SELECT | ||
186 | |||
187 | #define MAZEZAM_RETRY BUTTON_SELECT | ||
188 | #define MAZEZAM_RETRY_KEYNAME "[PLAY]" | ||
189 | #define MAZEZAM_QUIT BUTTON_POWER | ||
190 | #define MAZEZAM_QUIT_KEYNAME "[POWER]" | ||
191 | |||
180 | #else | 192 | #else |
181 | #error No keymap defined! | 193 | #error No keymap defined! |
182 | #endif | 194 | #endif |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index c5865beb09..84bfe30034 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -135,6 +135,15 @@ PLUGIN_IRAM_DECLARE | |||
135 | #define BTN_PLAY BUTTON_RC_PLAY | 135 | #define BTN_PLAY BUTTON_RC_PLAY |
136 | 136 | ||
137 | 137 | ||
138 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
139 | #define BTN_QUIT BUTTON_POWER | ||
140 | #define BTN_RIGHT BUTTON_RIGHT | ||
141 | #define BTN_LEFT BUTTON_LEFT | ||
142 | #define BTN_UP BUTTON_UP | ||
143 | #define BTN_DOWN BUTTON_DOWN | ||
144 | #define BTN_PLAY BUTTON_SELECT | ||
145 | |||
146 | |||
138 | #else | 147 | #else |
139 | #error No keymap defined! | 148 | #error No keymap defined! |
140 | #endif | 149 | #endif |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index afe7a39320..0f3de2fb74 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -183,6 +183,16 @@ enum minesweeper_status { | |||
183 | # define MINESWP_DISCOVER BUTTON_RC_PLAY | 183 | # define MINESWP_DISCOVER BUTTON_RC_PLAY |
184 | # define MINESWP_INFO BUTTON_RC_MENU | 184 | # define MINESWP_INFO BUTTON_RC_MENU |
185 | 185 | ||
186 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
187 | # define MINESWP_LEFT BUTTON_LEFT | ||
188 | # define MINESWP_RIGHT BUTTON_RIGHT | ||
189 | # define MINESWP_UP BUTTON_UP | ||
190 | # define MINESWP_DOWN BUTTON_DOWN | ||
191 | # define MINESWP_QUIT BUTTON_POWER | ||
192 | # define MINESWP_TOGGLE BUTTON_SELECT | ||
193 | # define MINESWP_DISCOVER BUTTON_MENU | ||
194 | # define MINESWP_INFO (BUTTON_MENU | BUTTON_SELECT) | ||
195 | |||
186 | #else | 196 | #else |
187 | #error No keymap defined! | 197 | #error No keymap defined! |
188 | #endif | 198 | #endif |
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c index bd1eade7f0..8163685366 100644 --- a/apps/plugins/mosaique.c +++ b/apps/plugins/mosaique.c | |||
@@ -122,6 +122,11 @@ PLUGIN_HEADER | |||
122 | #define MOSAIQUE_SPEED BUTTON_RC_MENU | 122 | #define MOSAIQUE_SPEED BUTTON_RC_MENU |
123 | #define MOSAIQUE_RESTART BUTTON_RC_PLAY | 123 | #define MOSAIQUE_RESTART BUTTON_RC_PLAY |
124 | 124 | ||
125 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
126 | #define MOSAIQUE_QUIT BUTTON_POWER | ||
127 | #define MOSAIQUE_SPEED BUTTON_RIGHT | ||
128 | #define MOSAIQUE_RESTART BUTTON_MENU | ||
129 | |||
125 | #else | 130 | #else |
126 | #error No keymap defined! | 131 | #error No keymap defined! |
127 | #endif | 132 | #endif |
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c index d0f4412087..2f7a9905aa 100644 --- a/apps/plugins/mp3_encoder.c +++ b/apps/plugins/mp3_encoder.c | |||
@@ -2332,6 +2332,11 @@ void get_mp3_filename(char *wav_name) | |||
2332 | #define MP3ENC_NEXT BUTTON_RC_VOL_DOWN | 2332 | #define MP3ENC_NEXT BUTTON_RC_VOL_DOWN |
2333 | #define MP3ENC_DONE BUTTON_RC_REC | 2333 | #define MP3ENC_DONE BUTTON_RC_REC |
2334 | #define MP3ENC_SELECT BUTTON_RC_FF | 2334 | #define MP3ENC_SELECT BUTTON_RC_FF |
2335 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
2336 | #define MP3ENC_PREV BUTTON_UP | ||
2337 | #define MP3ENC_NEXT BUTTON_DOWN | ||
2338 | #define MP3ENC_DONE BUTTON_POWER | ||
2339 | #define MP3ENC_SELECT BUTTON_SELECT | ||
2335 | #else | 2340 | #else |
2336 | #error No keymap defined! | 2341 | #error No keymap defined! |
2337 | #endif | 2342 | #endif |
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c index 8e4f16a484..7dfdd36927 100644 --- a/apps/plugins/mpegplayer/mpeg_settings.c +++ b/apps/plugins/mpegplayer/mpeg_settings.c | |||
@@ -102,6 +102,16 @@ struct mpeg_settings settings; | |||
102 | #define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY | 102 | #define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY |
103 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 103 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
104 | 104 | ||
105 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
106 | #define MPEG_START_TIME_SELECT BUTTON_SELECT | ||
107 | #define MPEG_START_TIME_SCROLL_UP BUTTON_PLUS | ||
108 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_MINUS | ||
109 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | ||
110 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | ||
111 | #define MPEG_START_TIME_UP BUTTON_UP | ||
112 | #define MPEG_START_TIME_DOWN BUTTON_DOWN | ||
113 | #define MPEG_START_TIME_EXIT BUTTON_POWER | ||
114 | |||
105 | #else | 115 | #else |
106 | #error No keymap defined! | 116 | #error No keymap defined! |
107 | #endif | 117 | #endif |
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c index 5a1f22392c..d068fd8254 100644 --- a/apps/plugins/mpegplayer/mpegplayer.c +++ b/apps/plugins/mpegplayer/mpegplayer.c | |||
@@ -202,6 +202,15 @@ PLUGIN_IRAM_DECLARE | |||
202 | #define MPEG_RW BUTTON_LEFT | 202 | #define MPEG_RW BUTTON_LEFT |
203 | #define MPEG_FF BUTTON_RIGHT | 203 | #define MPEG_FF BUTTON_RIGHT |
204 | 204 | ||
205 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
206 | #define MPEG_MENU BUTTON_MENU | ||
207 | #define MPEG_STOP BUTTON_POWER | ||
208 | #define MPEG_PAUSE BUTTON_SELECT | ||
209 | #define MPEG_VOLDOWN BUTTON_MINUS | ||
210 | #define MPEG_VOLUP BUTTON_PLUS | ||
211 | #define MPEG_RW BUTTON_LEFT | ||
212 | #define MPEG_FF BUTTON_RIGHT | ||
213 | |||
205 | #else | 214 | #else |
206 | #error No keymap defined! | 215 | #error No keymap defined! |
207 | #endif | 216 | #endif |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 6b816aebe7..d576c81d88 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -181,6 +181,19 @@ PLUGIN_HEADER | |||
181 | #define OSCILLOSCOPE_VOL_UP BUTTON_RC_VOL_UP | 181 | #define OSCILLOSCOPE_VOL_UP BUTTON_RC_VOL_UP |
182 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_RC_VOL_DOWN | 182 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_RC_VOL_DOWN |
183 | 183 | ||
184 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
185 | #define OSCILLOSCOPE_QUIT BUTTON_POWER | ||
186 | #define OSCILLOSCOPE_DRAWMODE_PRE (BUTTON_LEFT | BUTTON_MENU) | ||
187 | #define OSCILLOSCOPE_DRAWMODE (BUTTON_RIGHT | BUTTON_MENU) | ||
188 | #define OSCILLOSCOPE_ADVMODE (BUTTON_SELECT|BUTTON_MENU) | ||
189 | #define OSCILLOSCOPE_ORIENTATION_PRE (BUTTON_UP | BUTTON_MENU) | ||
190 | #define OSCILLOSCOPE_ORIENTATION (BUTTON_DOWN | BUTTON_MENU) | ||
191 | #define OSCILLOSCOPE_PAUSE BUTTON_SELECT | ||
192 | #define OSCILLOSCOPE_SPEED_UP BUTTON_UP | ||
193 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_DOWN | ||
194 | #define OSCILLOSCOPE_VOL_UP BUTTON_PLUS | ||
195 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_MINUS | ||
196 | |||
184 | #else | 197 | #else |
185 | #error No keymap defined! | 198 | #error No keymap defined! |
186 | #endif | 199 | #endif |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index ea9fd3c0ef..d316b70e71 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -130,6 +130,18 @@ | |||
130 | #define PACMAN_COIN (BUTTON_RC_MODE | BUTTON_RC_DOWN) | 130 | #define PACMAN_COIN (BUTTON_RC_MODE | BUTTON_RC_DOWN) |
131 | #define PACMAN_MENU BUTTON_POWER | 131 | #define PACMAN_MENU BUTTON_POWER |
132 | 132 | ||
133 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
134 | |||
135 | #define PACMAN_UP BUTTON_UP | ||
136 | #define PACMAN_DOWN BUTTON_DOWN | ||
137 | #define PACMAN_LEFT BUTTON_LEFT | ||
138 | #define PACMAN_RIGHT BUTTON_RIGHT | ||
139 | #define PACMAN_1UP BUTTON_MINUS | ||
140 | #define PACMAN_2UP BUTTON_PLUS | ||
141 | #define PACMAN_COIN_PRE BUTTON_SELECT | ||
142 | #define PACMAN_COIN (BUTTON_MENU | BUTTON_SELECT) | ||
143 | #define PACMAN_MENU BUTTON_MENU | ||
144 | |||
133 | #else | 145 | #else |
134 | 146 | ||
135 | #error Keymap not defined! | 147 | #error Keymap not defined! |
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c index b54e6a9ed2..d5c1ef427f 100644 --- a/apps/plugins/plasma.c +++ b/apps/plugins/plasma.c | |||
@@ -86,6 +86,10 @@ static int plasma_frequency; | |||
86 | #define PLASMA_QUIT BUTTON_POWER | 86 | #define PLASMA_QUIT BUTTON_POWER |
87 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 87 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
88 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 88 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
89 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
90 | #define PLASMA_QUIT BUTTON_POWER | ||
91 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | ||
92 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | ||
89 | #else | 93 | #else |
90 | #define PLASMA_QUIT BUTTON_OFF | 94 | #define PLASMA_QUIT BUTTON_OFF |
91 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 95 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
@@ -111,6 +115,8 @@ static int plasma_frequency; | |||
111 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 115 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
112 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 116 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
113 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | 117 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
118 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
119 | #define PLASMA_REGEN_COLORS BUTTON_SELECT | ||
114 | #endif | 120 | #endif |
115 | #endif | 121 | #endif |
116 | 122 | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 707f107d3b..b1e53d3dcc 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -146,6 +146,13 @@ PLUGIN_HEADER | |||
146 | #define PONG_RIGHT_UP BUTTON_VOL_UP | 146 | #define PONG_RIGHT_UP BUTTON_VOL_UP |
147 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 147 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
148 | 148 | ||
149 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
150 | #define PONG_QUIT BUTTON_POWER | ||
151 | #define PONG_LEFT_UP BUTTON_UP | ||
152 | #define PONG_LEFT_DOWN BUTTON_DOWN | ||
153 | #define PONG_RIGHT_UP BUTTON_LEFT | ||
154 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | ||
155 | |||
149 | #else | 156 | #else |
150 | #error No keymap defined! | 157 | #error No keymap defined! |
151 | #endif | 158 | #endif |
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h index de2286e5df..185c2923ca 100644 --- a/apps/plugins/reversi/reversi-gui.h +++ b/apps/plugins/reversi/reversi-gui.h | |||
@@ -132,6 +132,15 @@ | |||
132 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_RC_PLAY | 132 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_RC_PLAY |
133 | #define REVERSI_BUTTON_MENU BUTTON_RC_MENU | 133 | #define REVERSI_BUTTON_MENU BUTTON_RC_MENU |
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
136 | #define REVERSI_QUIT BUTTON_POWER | ||
137 | #define REVERSI_BUTTON_UP BUTTON_UP | ||
138 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | ||
139 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | ||
140 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | ||
141 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT | ||
142 | #define REVERSI_BUTTON_MENU BUTTON_MENU | ||
143 | |||
135 | #else | 144 | #else |
136 | #error No keymap defined! | 145 | #error No keymap defined! |
137 | #endif | 146 | #endif |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index f0bdd2a510..82fb758dee 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -211,6 +211,16 @@ PLUGIN_HEADER | |||
211 | #define ROCKBLOX_DROP BUTTON_RC_PLAY | 211 | #define ROCKBLOX_DROP BUTTON_RC_PLAY |
212 | #define ROCKBLOX_RESTART BUTTON_RC_MODE | 212 | #define ROCKBLOX_RESTART BUTTON_RC_MODE |
213 | 213 | ||
214 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
215 | #define ROCKBLOX_OFF BUTTON_POWER | ||
216 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_PLUS | ||
217 | #define ROCKBLOX_ROTATE_LEFT BUTTON_MINUS | ||
218 | #define ROCKBLOX_DOWN BUTTON_DOWN | ||
219 | #define ROCKBLOX_LEFT BUTTON_LEFT | ||
220 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | ||
221 | #define ROCKBLOX_DROP BUTTON_SELECT | ||
222 | #define ROCKBLOX_RESTART BUTTON_MENU | ||
223 | |||
214 | #else | 224 | #else |
215 | #error No keymap defined! | 225 | #error No keymap defined! |
216 | #endif | 226 | #endif |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 4ccfdbf872..2583fa3376 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -197,6 +197,15 @@ static void setoptions (void) | |||
197 | options.START=BUTTON_RC_HEART; | 197 | options.START=BUTTON_RC_HEART; |
198 | options.SELECT=BUTTON_RC_MODE; | 198 | options.SELECT=BUTTON_RC_MODE; |
199 | options.MENU=BUTTON_POWER; | 199 | options.MENU=BUTTON_POWER; |
200 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
201 | options.UP=BUTTON_UP; | ||
202 | options.DOWN=BUTTON_DOWN; | ||
203 | |||
204 | options.A=BUTTON_LEFT; | ||
205 | options.B=BUTTON_RIGHT; | ||
206 | options.START=BUTTON_PLUS; | ||
207 | options.SELECT=BUTTON_SELECT; | ||
208 | options.MENU=BUTTON_MENU; | ||
200 | #else | 209 | #else |
201 | #error No Keymap Defined! | 210 | #error No Keymap Defined! |
202 | #endif | 211 | #endif |
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index 2b37a97dd8..7d5b5cbaa8 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c | |||
@@ -116,6 +116,17 @@ PLUGIN_HEADER | |||
116 | #define ROCKPAINT_LEFT BUTTON_LEFT | 116 | #define ROCKPAINT_LEFT BUTTON_LEFT |
117 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | 117 | #define ROCKPAINT_RIGHT BUTTON_RIGHT |
118 | 118 | ||
119 | #elif ( CONFIG_KEYPAD == COWOND2_PAD ) | ||
120 | #define ROCKPAINT_QUIT BUTTON_POWER | ||
121 | #define ROCKPAINT_DRAW BUTTON_SELECT | ||
122 | #define ROCKPAINT_MENU BUTTON_MENU | ||
123 | #define ROCKPAINT_TOOLBAR BUTTON_PLUS | ||
124 | #define ROCKPAINT_TOOLBAR2 BUTTON_MINUS | ||
125 | #define ROCKPAINT_UP BUTTON_UP | ||
126 | #define ROCKPAINT_DOWN BUTTON_DOWN | ||
127 | #define ROCKPAINT_LEFT BUTTON_LEFT | ||
128 | #define ROCKPAINT_RIGHT BUTTON_RIGHT | ||
129 | |||
119 | #else | 130 | #else |
120 | #error "Please define keys for this keypad" | 131 | #error "Please define keys for this keypad" |
121 | #endif | 132 | #endif |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 8d57ede13c..00dd00e965 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -138,6 +138,15 @@ PLUGIN_HEADER | |||
138 | #define PUZZLE_SHUFFLE BUTTON_RC_MODE | 138 | #define PUZZLE_SHUFFLE BUTTON_RC_MODE |
139 | #define PUZZLE_PICTURE BUTTON_RC_MENU | 139 | #define PUZZLE_PICTURE BUTTON_RC_MENU |
140 | 140 | ||
141 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
142 | #define PUZZLE_QUIT BUTTON_POWER | ||
143 | #define PUZZLE_LEFT BUTTON_LEFT | ||
144 | #define PUZZLE_RIGHT BUTTON_RIGHT | ||
145 | #define PUZZLE_UP BUTTON_UP | ||
146 | #define PUZZLE_DOWN BUTTON_DOWN | ||
147 | #define PUZZLE_SHUFFLE BUTTON_MENU | ||
148 | #define PUZZLE_PICTURE BUTTON_SELECT | ||
149 | |||
141 | #else | 150 | #else |
142 | #error No keymap defined! | 151 | #error No keymap defined! |
143 | #endif | 152 | #endif |
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index f414761ae3..51d5f5a9e8 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -140,6 +140,14 @@ PLUGIN_HEADER | |||
140 | 140 | ||
141 | #define SNAKE_RC_QUIT BUTTON_REC | 141 | #define SNAKE_RC_QUIT BUTTON_REC |
142 | 142 | ||
143 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
144 | #define SNAKE_QUIT BUTTON_POWER | ||
145 | #define SNAKE_LEFT BUTTON_LEFT | ||
146 | #define SNAKE_RIGHT BUTTON_RIGHT | ||
147 | #define SNAKE_UP BUTTON_UP | ||
148 | #define SNAKE_DOWN BUTTON_DOWN | ||
149 | #define SNAKE_PLAYPAUSE BUTTON_MENU | ||
150 | |||
143 | #else | 151 | #else |
144 | #error No keymap defined! | 152 | #error No keymap defined! |
145 | #endif | 153 | #endif |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 07e3991c3b..0c2b88868c 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -288,6 +288,20 @@ PLUGIN_HEADER | |||
288 | #define SNAKE2_PLAYPAUSE BUTTON_RC_PLAY | 288 | #define SNAKE2_PLAYPAUSE BUTTON_RC_PLAY |
289 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 289 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
290 | 290 | ||
291 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
292 | #define SNAKE2_LEFT BUTTON_LEFT | ||
293 | #define SNAKE2_RIGHT BUTTON_RIGHT | ||
294 | #define SNAKE2_UP BUTTON_UP | ||
295 | #define SNAKE2_DOWN BUTTON_DOWN | ||
296 | #define SNAKE2_QUIT BUTTON_POWER | ||
297 | #define SNAKE2_LEVEL_UP BUTTON_UP | ||
298 | #define SNAKE2_LEVEL_DOWN BUTTON_DOWN | ||
299 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT | ||
300 | #define SNAKE2_MAZE_LAST BUTTON_LEFT | ||
301 | #define SNAKE2_SELECT_TYPE BUTTON_MENU | ||
302 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | ||
303 | #define SNAKE2_PLAYPAUSE_TEXT "Select" | ||
304 | |||
291 | #else | 305 | #else |
292 | #error No keymap defined! | 306 | #error No keymap defined! |
293 | #endif | 307 | #endif |
diff --git a/apps/plugins/snow.c b/apps/plugins/snow.c index 43a7d00cd5..6550050646 100644 --- a/apps/plugins/snow.c +++ b/apps/plugins/snow.c | |||
@@ -60,6 +60,8 @@ PLUGIN_HEADER | |||
60 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 60 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
61 | #define SNOW_QUIT BUTTON_REC | 61 | #define SNOW_QUIT BUTTON_REC |
62 | #define SNOW_RC_QUIT BUTTON_RC_REC | 62 | #define SNOW_RC_QUIT BUTTON_RC_REC |
63 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
64 | #define SNOW_QUIT BUTTON_POWER | ||
63 | #else | 65 | #else |
64 | #define SNOW_QUIT BUTTON_OFF | 66 | #define SNOW_QUIT BUTTON_OFF |
65 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) | 67 | #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD) |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index d665a0a622..d4e33f163c 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -277,6 +277,22 @@ extern const fb_data sokoban_tiles[]; | |||
277 | 277 | ||
278 | #define SOKOBAN_RC_MENU BUTTON_REC | 278 | #define SOKOBAN_RC_MENU BUTTON_REC |
279 | 279 | ||
280 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
281 | #define SOKOBAN_LEFT BUTTON_LEFT | ||
282 | #define SOKOBAN_RIGHT BUTTON_RIGHT | ||
283 | #define SOKOBAN_UP BUTTON_UP | ||
284 | #define SOKOBAN_DOWN BUTTON_DOWN | ||
285 | #define SOKOBAN_MENU BUTTON_MENU | ||
286 | #define SOKOBAN_UNDO_PRE BUTTON_PLUS | ||
287 | #define SOKOBAN_UNDO (BUTTON_LEFT|BUTTON_MENU) | ||
288 | #define SOKOBAN_REDO (BUTTON_RIGHT | BUTTON_MENU) | ||
289 | #define SOKOBAN_LEVEL_DOWN (BUTTON_MENU | BUTTON_DOWN) | ||
290 | #define SOKOBAN_LEVEL_UP (BUTTON_MENU | BUTTON_UP) | ||
291 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_SELECT|BUTTON_MENU) | ||
292 | #define SOKOBAN_PAUSE BUTTON_SELECT | ||
293 | #define BUTTON_SAVE BUTTON_SELECT | ||
294 | #define BUTTON_SAVE_NAME "SELECT" | ||
295 | |||
280 | #else | 296 | #else |
281 | #error No keymap defined! | 297 | #error No keymap defined! |
282 | #endif | 298 | #endif |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 62f60c7eb4..6cb995ffba 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -298,6 +298,27 @@ static struct plugin_api* rb; | |||
298 | # define HK_CUR2STACK "MODE" | 298 | # define HK_CUR2STACK "MODE" |
299 | # define HK_REM2STACK "MODE.." | 299 | # define HK_REM2STACK "MODE.." |
300 | 300 | ||
301 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
302 | # define SOL_QUIT BUTTON_POWER | ||
303 | # define SOL_UP BUTTON_UP | ||
304 | # define SOL_DOWN BUTTON_DOWN | ||
305 | # define SOL_LEFT_PRE BUTTON_LEFT | ||
306 | # define SOL_LEFT (BUTTON_LEFT | BUTTON_REL) | ||
307 | # define SOL_RIGHT_PRE BUTTON_RIGHT | ||
308 | # define SOL_RIGHT (BUTTON_RIGHT | BUTTON_REL) | ||
309 | # define SOL_MOVE BUTTON_SELECT | ||
310 | # define SOL_DRAW_PRE BUTTON_LEFT | ||
311 | # define SOL_DRAW (BUTTON_LEFT | BUTTON_MENU) | ||
312 | # define SOL_REM2CUR BUTTON_PLUS | ||
313 | # define SOL_CUR2STACK BUTTON_MINUS | ||
314 | # define SOL_REM2STACK_PRE BUTTON_RIGHT | ||
315 | # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_MENU) | ||
316 | # define HK_MOVE "PLAY" | ||
317 | # define HK_DRAW "LEFT.." | ||
318 | # define HK_REM2CUR "FF" | ||
319 | # define HK_CUR2STACK "REW" | ||
320 | # define HK_REM2STACK "RIGHT.." | ||
321 | |||
301 | #else | 322 | #else |
302 | #error No keymap defined! | 323 | #error No keymap defined! |
303 | #endif | 324 | #endif |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 7de18e5459..5c01c1680f 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -200,6 +200,19 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
200 | #define AST_FIRE BUTTON_RC_MODE | 200 | #define AST_FIRE BUTTON_RC_MODE |
201 | #define AST_FIRE_REP (BUTTON_RC_MODE | BUTTON_REPEAT) | 201 | #define AST_FIRE_REP (BUTTON_RC_MODE | BUTTON_REPEAT) |
202 | 202 | ||
203 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
204 | #define AST_PAUSE BUTTON_SELECT | ||
205 | #define AST_QUIT BUTTON_POWER | ||
206 | #define AST_THRUST_REP BUTTON_UP | BUTTON_MENU | ||
207 | #define AST_THRUST BUTTON_UP | ||
208 | #define AST_HYPERSPACE BUTTON_DOWN | ||
209 | #define AST_LEFT BUTTON_LEFT | ||
210 | #define AST_LEFT_REP BUTTON_LEFT | BUTTON_MENU | ||
211 | #define AST_RIGHT BUTTON_RIGHT | ||
212 | #define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_MENU) | ||
213 | #define AST_FIRE BUTTON_PLUS | ||
214 | #define AST_FIRE_REP BUTTON_PLUS | BUTTON_MENU | ||
215 | |||
203 | #else | 216 | #else |
204 | #error No keymap defined! | 217 | #error No keymap defined! |
205 | #endif | 218 | #endif |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 04b6642ede..efa8d4e6af 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -225,6 +225,19 @@ PLUGIN_HEADER | |||
225 | #define STAR_LEVEL_REPEAT (BUTTON_RC_PLAY|BUTTON_RC_MENU) | 225 | #define STAR_LEVEL_REPEAT (BUTTON_RC_PLAY|BUTTON_RC_MENU) |
226 | #define STAR_MENU_RUN BUTTON_RC_FF | 226 | #define STAR_MENU_RUN BUTTON_RC_FF |
227 | 227 | ||
228 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
229 | |||
230 | #define STAR_QUIT BUTTON_POWER | ||
231 | #define STAR_LEFT BUTTON_LEFT | ||
232 | #define STAR_RIGHT BUTTON_RIGHT | ||
233 | #define STAR_UP BUTTON_UP | ||
234 | #define STAR_DOWN BUTTON_DOWN | ||
235 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | ||
236 | #define STAR_LEVEL_UP BUTTON_PLUS | ||
237 | #define STAR_LEVEL_DOWN BUTTON_MINUS | ||
238 | #define STAR_LEVEL_REPEAT (BUTTON_SELECT | BUTTON_MENU) | ||
239 | #define STAR_MENU_RUN BUTTON_MENU | ||
240 | |||
228 | #else | 241 | #else |
229 | #error No keymap defined! | 242 | #error No keymap defined! |
230 | #endif | 243 | #endif |
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index 163d72ba39..4f2c8b1bbe 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -86,6 +86,13 @@ static struct plugin_api* rb; /* global api struct pointer */ | |||
86 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RC_FF | 86 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RC_FF |
87 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RC_REW | 87 | #define STARFIELD_DECREASE_NB_STARS BUTTON_RC_REW |
88 | #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE | 88 | #define STARFIELD_TOGGLE_COLOR BUTTON_RC_MODE |
89 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
90 | #define STARFIELD_QUIT BUTTON_POWER | ||
91 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | ||
92 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | ||
93 | #define STARFIELD_INCREASE_NB_STARS BUTTON_RIGHT | ||
94 | #define STARFIELD_DECREASE_NB_STARS BUTTON_LEFT | ||
95 | #define STARFIELD_TOGGLE_COLOR BUTTON_MENU | ||
89 | 96 | ||
90 | #else | 97 | #else |
91 | #define STARFIELD_QUIT BUTTON_OFF | 98 | #define STARFIELD_QUIT BUTTON_OFF |
diff --git a/apps/plugins/stats.c b/apps/plugins/stats.c index e72b4bc2f5..a65fde4704 100644 --- a/apps/plugins/stats.c +++ b/apps/plugins/stats.c | |||
@@ -73,6 +73,9 @@ static bool abort; | |||
73 | #define STATS_STOP BUTTON_REC | 73 | #define STATS_STOP BUTTON_REC |
74 | #define STATS_STOP_REMOTE BUTTON_RC_REC | 74 | #define STATS_STOP_REMOTE BUTTON_RC_REC |
75 | 75 | ||
76 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
77 | #define STATS_STOP BUTTON_POWER | ||
78 | |||
76 | #else | 79 | #else |
77 | #error No keymap defined! | 80 | #error No keymap defined! |
78 | #endif | 81 | #endif |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index ac3c7b70fb..d4d890df0d 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -144,6 +144,13 @@ PLUGIN_HEADER | |||
144 | #define STOPWATCH_SCROLL_UP BUTTON_RC_VOL_UP | 144 | #define STOPWATCH_SCROLL_UP BUTTON_RC_VOL_UP |
145 | #define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN | 145 | #define STOPWATCH_SCROLL_DOWN BUTTON_RC_VOL_DOWN |
146 | #define STOPWATCH_RC_QUIT BUTTON_REC | 146 | #define STOPWATCH_RC_QUIT BUTTON_REC |
147 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
148 | #define STOPWATCH_QUIT BUTTON_POWER | ||
149 | #define STOPWATCH_START_STOP BUTTON_SELECT | ||
150 | #define STOPWATCH_RESET_TIMER BUTTON_MENU | ||
151 | #define STOPWATCH_LAP_TIMER BUTTON_PLUS | ||
152 | #define STOPWATCH_SCROLL_UP BUTTON_UP | ||
153 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | ||
147 | #else | 154 | #else |
148 | #error No keymap defined! | 155 | #error No keymap defined! |
149 | #endif | 156 | #endif |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 8c2759796a..3fc8dbe0e0 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -170,6 +170,16 @@ | |||
170 | #define SUDOKU_BUTTON_MENU BUTTON_RC_MENU | 170 | #define SUDOKU_BUTTON_MENU BUTTON_RC_MENU |
171 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY | 171 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_RC_PLAY |
172 | 172 | ||
173 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
174 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
175 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
176 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
177 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | ||
178 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | ||
179 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLUS | ||
180 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | ||
181 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_MINUS | ||
182 | |||
173 | #else | 183 | #else |
174 | #error No keymap defined! | 184 | #error No keymap defined! |
175 | #endif | 185 | #endif |
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c index 794ea9e8f0..e3f35f91ac 100644 --- a/apps/plugins/superdom.c +++ b/apps/plugins/superdom.c | |||
@@ -127,6 +127,14 @@ char buf[255]; | |||
127 | #define SUPERDOM_RIGHT BUTTON_RIGHT | 127 | #define SUPERDOM_RIGHT BUTTON_RIGHT |
128 | #define SUPERDOM_CANCEL BUTTON_BACK | 128 | #define SUPERDOM_CANCEL BUTTON_BACK |
129 | 129 | ||
130 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
131 | #define SUPERDOM_OK BUTTON_SELECT | ||
132 | #define SUPERDOM_UP BUTTON_UP | ||
133 | #define SUPERDOM_LEFT BUTTON_LEFT | ||
134 | #define SUPERDOM_RIGHT BUTTON_RIGHT | ||
135 | #define SUPERDOM_DOWN BUTTON_DOWN | ||
136 | #define SUPERDOM_CANCEL BUTTON_MENU | ||
137 | |||
130 | #endif | 138 | #endif |
131 | 139 | ||
132 | #define SUPERDOM_QUIT 23 | 140 | #define SUPERDOM_QUIT 23 |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index a7be5db33c..a4619269e5 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -244,6 +244,15 @@ PLUGIN_HEADER | |||
244 | 244 | ||
245 | #define VIEWER_RC_QUIT BUTTON_REC | 245 | #define VIEWER_RC_QUIT BUTTON_REC |
246 | 246 | ||
247 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
248 | #define VIEWER_QUIT BUTTON_POWER | ||
249 | #define VIEWER_PAGE_UP BUTTON_UP | ||
250 | #define VIEWER_PAGE_DOWN BUTTON_DOWN | ||
251 | #define VIEWER_SCREEN_LEFT BUTTON_LEFT | ||
252 | #define VIEWER_SCREEN_RIGHT BUTTON_RIGHT | ||
253 | #define VIEWER_MENU BUTTON_MENU | ||
254 | #define VIEWER_AUTOSCROLL BUTTON_SELECT | ||
255 | |||
247 | #else | 256 | #else |
248 | #error No keymap defined! | 257 | #error No keymap defined! |
249 | #endif | 258 | #endif |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 9f0957895a..9773d92d9c 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -148,6 +148,15 @@ PLUGIN_HEADER | |||
148 | #define VUMETER_UP BUTTON_RC_VOL_UP | 148 | #define VUMETER_UP BUTTON_RC_VOL_UP |
149 | #define VUMETER_DOWN BUTTON_RC_VOL_DOWN | 149 | #define VUMETER_DOWN BUTTON_RC_VOL_DOWN |
150 | 150 | ||
151 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
152 | #define VUMETER_QUIT BUTTON_POWER | ||
153 | #define VUMETER_HELP BUTTON_SELECT | ||
154 | #define VUMETER_MENU BUTTON_MENU | ||
155 | #define VUMETER_MENU_EXIT BUTTON_LEFT | ||
156 | #define VUMETER_MENU_EXIT2 BUTTON_POWER | ||
157 | #define VUMETER_UP BUTTON_UP | ||
158 | #define VUMETER_DOWN BUTTON_DOWN | ||
159 | |||
151 | #else | 160 | #else |
152 | #error No keymap defined! | 161 | #error No keymap defined! |
153 | #endif | 162 | #endif |
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index 0da929d0a3..68b31a1a7c 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -215,6 +215,19 @@ PLUGIN_HEADER | |||
215 | #define PLAYERS_TEXT "VOL UP/DN" | 215 | #define PLAYERS_TEXT "VOL UP/DN" |
216 | #define WORMS_TEXT "REW/FF" | 216 | #define WORMS_TEXT "REW/FF" |
217 | 217 | ||
218 | #elif (CONFIG_KEYPAD == COWOND2_PAD) | ||
219 | |||
220 | #define BTN_DIR_UP BUTTON_UP | ||
221 | #define BTN_DIR_DOWN BUTTON_DOWN | ||
222 | #define BTN_DIR_LEFT BUTTON_LEFT | ||
223 | #define BTN_DIR_RIGHT BUTTON_RIGHT | ||
224 | #define BTN_STARTPAUSE BUTTON_SELECT | ||
225 | #define BTN_QUIT BUTTON_POWER | ||
226 | #define BTN_STOPRESET BUTTON_PLUS | ||
227 | |||
228 | #define PLAYERS_TEXT "Up/Down" | ||
229 | #define WORMS_TEXT "Left/Right" | ||
230 | |||
218 | #else | 231 | #else |
219 | #error No keymap defined! | 232 | #error No keymap defined! |
220 | #endif | 233 | #endif |
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index d0d8049900..743dd41362 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -139,6 +139,15 @@ PLUGIN_HEADER | |||
139 | #define DOWN BUTTON_RC_VOL_DOWN | 139 | #define DOWN BUTTON_RC_VOL_DOWN |
140 | #define PAUSE BUTTON_RC_PLAY | 140 | #define PAUSE BUTTON_RC_PLAY |
141 | 141 | ||
142 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
143 | |||
144 | #define QUIT BUTTON_POWER | ||
145 | #define LEFT BUTTON_LEFT | ||
146 | #define RIGHT BUTTON_RIGHT | ||
147 | #define UP BUTTON_UP | ||
148 | #define DOWN BUTTON_DOWN | ||
149 | #define PAUSE BUTTON_SELECT | ||
150 | |||
142 | #else | 151 | #else |
143 | #error No keymap defined! | 152 | #error No keymap defined! |
144 | #endif | 153 | #endif |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 19503e1c78..791149c86c 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -102,6 +102,14 @@ | |||
102 | #define ZX_SELECT BUTTON_RC_PLAY | 102 | #define ZX_SELECT BUTTON_RC_PLAY |
103 | #define ZX_MENU BUTTON_RC_REC | 103 | #define ZX_MENU BUTTON_RC_REC |
104 | 104 | ||
105 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
106 | #define ZX_UP BUTTON_UP | ||
107 | #define ZX_DOWN BUTTON_DOWN | ||
108 | #define ZX_LEFT BUTTON_LEFT | ||
109 | #define ZX_RIGHT BUTTON_RIGHT | ||
110 | #define ZX_SELECT BUTTON_SELECT | ||
111 | #define ZX_MENU BUTTON_MENU | ||
112 | |||
105 | #else | 113 | #else |
106 | #error Keymap not defined! | 114 | #error Keymap not defined! |
107 | 115 | ||
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index e3fb92c43d..f1de0a051c 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c | |||
@@ -122,6 +122,17 @@ | |||
122 | #define KBD_UP BUTTON_RC_VOL_UP | 122 | #define KBD_UP BUTTON_RC_VOL_UP |
123 | #define KBD_DOWN BUTTON_RC_VOL_DOWN | 123 | #define KBD_DOWN BUTTON_RC_VOL_DOWN |
124 | 124 | ||
125 | #elif CONFIG_KEYPAD == COWOND2_PAD | ||
126 | |||
127 | /* TODO: Check keyboard mappings */ | ||
128 | |||
129 | #define KBD_SELECT BUTTON_SELECT | ||
130 | #define KBD_ABORT BUTTON_POWER | ||
131 | #define KBD_LEFT BUTTON_LEFT | ||
132 | #define KBD_RIGHT BUTTON_RIGHT | ||
133 | #define KBD_UP BUTTON_UP | ||
134 | #define KBD_DOWN BUTTON_DOWN | ||
135 | |||
125 | #endif | 136 | #endif |
126 | 137 | ||
127 | 138 | ||