diff options
-rw-r--r-- | apps/plugins/blackjack.c | 6 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 7 | ||||
-rw-r--r-- | apps/plugins/clix.c | 4 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 34 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 2 | ||||
-rw-r--r-- | apps/plugins/goban/goban.h | 6 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 4 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 4 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.h | 2 | ||||
-rw-r--r-- | apps/plugins/pong.c | 11 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 16 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 4 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 2 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 12 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 26 | ||||
-rw-r--r-- | apps/plugins/spacerocks.c | 2 | ||||
-rw-r--r-- | apps/plugins/star.c | 2 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 9 |
18 files changed, 98 insertions, 55 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index b31ecd65ac..91e70e4d1b 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -459,8 +459,10 @@ enum { | |||
459 | #define BJACK_DOUBLE_NAME "BACK" | 459 | #define BJACK_DOUBLE_NAME "BACK" |
460 | #define BJACK_SELECT BUTTON_SELECT | 460 | #define BJACK_SELECT BUTTON_SELECT |
461 | #define BJACK_QUIT BUTTON_POWER | 461 | #define BJACK_QUIT BUTTON_POWER |
462 | #define BJACK_STAY BUTTON_PLAYPAUSE | 462 | #define BJACK_MAX BUTTON_BOTTOMRIGHT |
463 | #define BJACK_DOUBLEDOWN BUTTON_BACK | 463 | #define BJACK_MIN BUTTON_BOTTOMLEFT |
464 | #define BJACK_STAY BUTTON_BACK | ||
465 | #define BJACK_DOUBLEDOWN BUTTON_PLAYPAUSE | ||
464 | #define BJACK_UP BUTTON_UP | 466 | #define BJACK_UP BUTTON_UP |
465 | #define BJACK_DOWN BUTTON_DOWN | 467 | #define BJACK_DOWN BUTTON_DOWN |
466 | #define BJACK_RIGHT BUTTON_RIGHT | 468 | #define BJACK_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index ec5e642e06..a41fcb6b7f 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -402,9 +402,10 @@ | |||
402 | #define CB_DOWN BUTTON_DOWN | 402 | #define CB_DOWN BUTTON_DOWN |
403 | #define CB_LEFT BUTTON_LEFT | 403 | #define CB_LEFT BUTTON_LEFT |
404 | #define CB_RIGHT BUTTON_RIGHT | 404 | #define CB_RIGHT BUTTON_RIGHT |
405 | #define CB_PLAY BUTTON_PLAYPAUSE | 405 | #define CB_PLAY (BUTTON_PLAYPAUSE | BUTTON_REPEAT) |
406 | #define CB_LEVEL BUTTON_BACK | 406 | #define CB_LEVEL BUTTON_BOTTOMRIGHT |
407 | #define CB_MENU (BUTTON_PLAYPAUSE | BUTTON_REPEAT) | 407 | #define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) |
408 | #define CB_MENU BUTTON_POWER | ||
408 | 409 | ||
409 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 410 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
410 | #define CB_SELECT BUTTON_SELECT | 411 | #define CB_SELECT BUTTON_SELECT |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 614b7563f3..475023f1fd 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -195,10 +195,10 @@ | |||
195 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 195 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
196 | #define CLIX_BUTTON_UP BUTTON_UP | 196 | #define CLIX_BUTTON_UP BUTTON_UP |
197 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | 197 | #define CLIX_BUTTON_DOWN BUTTON_DOWN |
198 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_BACK | ||
199 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_PLAYPAUSE | ||
200 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 198 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
201 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 199 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
200 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_BOTTOMRIGHT | ||
201 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_BOTTOMLEFT | ||
202 | #define CLIX_BUTTON_CLICK BUTTON_SELECT | 202 | #define CLIX_BUTTON_CLICK BUTTON_SELECT |
203 | 203 | ||
204 | #else | 204 | #else |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index eda611ffd2..b22ff78c5e 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -168,6 +168,7 @@ void I_ShutdownGraphics(void) | |||
168 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 168 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
169 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 169 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
170 | #define DOOMBUTTON_OPEN BUTTON_MENU | 170 | #define DOOMBUTTON_OPEN BUTTON_MENU |
171 | |||
171 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 172 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
172 | #define DOOMBUTTON_UP BUTTON_UP | 173 | #define DOOMBUTTON_UP BUTTON_UP |
173 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 174 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -178,6 +179,7 @@ void I_ShutdownGraphics(void) | |||
178 | #define DOOMBUTTON_ESC BUTTON_POWER | 179 | #define DOOMBUTTON_ESC BUTTON_POWER |
179 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 180 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
180 | #define DOOMBUTTON_WEAPON BUTTON_REC | 181 | #define DOOMBUTTON_WEAPON BUTTON_REC |
182 | |||
181 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 183 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
182 | #define DOOMBUTTON_UP BUTTON_SCROLL_UP | 184 | #define DOOMBUTTON_UP BUTTON_SCROLL_UP |
183 | #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN | 185 | #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN |
@@ -188,6 +190,7 @@ void I_ShutdownGraphics(void) | |||
188 | #define DOOMBUTTON_ESC BUTTON_POWER | 190 | #define DOOMBUTTON_ESC BUTTON_POWER |
189 | #define DOOMBUTTON_ENTER BUTTON_REW | 191 | #define DOOMBUTTON_ENTER BUTTON_REW |
190 | #define DOOMBUTTON_WEAPON BUTTON_FF | 192 | #define DOOMBUTTON_WEAPON BUTTON_FF |
193 | |||
191 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 194 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
192 | #define DOOMBUTTON_SCROLLWHEEL | 195 | #define DOOMBUTTON_SCROLLWHEEL |
193 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK | 196 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
@@ -201,6 +204,7 @@ void I_ShutdownGraphics(void) | |||
201 | #define DOOMBUTTON_ESC BUTTON_POWER | 204 | #define DOOMBUTTON_ESC BUTTON_POWER |
202 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 205 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
203 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 206 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
207 | |||
204 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 208 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
205 | #define DOOMBUTTON_SCROLLWHEEL | 209 | #define DOOMBUTTON_SCROLLWHEEL |
206 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK | 210 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
@@ -214,6 +218,7 @@ void I_ShutdownGraphics(void) | |||
214 | #define DOOMBUTTON_ESC BUTTON_HOME | 218 | #define DOOMBUTTON_ESC BUTTON_HOME |
215 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 219 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
216 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 220 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
221 | |||
217 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 222 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
218 | #define DOOMBUTTON_UP BUTTON_UP | 223 | #define DOOMBUTTON_UP BUTTON_UP |
219 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 224 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -224,6 +229,7 @@ void I_ShutdownGraphics(void) | |||
224 | #define DOOMBUTTON_ESC BUTTON_POWER | 229 | #define DOOMBUTTON_ESC BUTTON_POWER |
225 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 230 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
226 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 231 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
232 | |||
227 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | 233 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD |
228 | #define DOOMBUTTON_UP BUTTON_UP | 234 | #define DOOMBUTTON_UP BUTTON_UP |
229 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 235 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -234,6 +240,7 @@ void I_ShutdownGraphics(void) | |||
234 | #define DOOMBUTTON_ESC BUTTON_POWER | 240 | #define DOOMBUTTON_ESC BUTTON_POWER |
235 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 241 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
236 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 242 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
243 | |||
237 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 244 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
238 | #define DOOMBUTTON_UP BUTTON_UP | 245 | #define DOOMBUTTON_UP BUTTON_UP |
239 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 246 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -245,6 +252,7 @@ void I_ShutdownGraphics(void) | |||
245 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 252 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
246 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 253 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
247 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 254 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
255 | |||
248 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 256 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
249 | #define DOOMBUTTON_UP BUTTON_UP | 257 | #define DOOMBUTTON_UP BUTTON_UP |
250 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 258 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -256,6 +264,7 @@ void I_ShutdownGraphics(void) | |||
256 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 264 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
257 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 265 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
258 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 266 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
267 | |||
259 | #elif CONFIG_KEYPAD == MROBE500_PAD | 268 | #elif CONFIG_KEYPAD == MROBE500_PAD |
260 | #define DOOMBUTTON_ESC BUTTON_POWER | 269 | #define DOOMBUTTON_ESC BUTTON_POWER |
261 | #define DOOMBUTTON_UP BUTTON_RC_PLAY | 270 | #define DOOMBUTTON_UP BUTTON_RC_PLAY |
@@ -266,6 +275,7 @@ void I_ShutdownGraphics(void) | |||
266 | #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP | 275 | #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP |
267 | #define DOOMBUTTON_ENTER BUTTON_RC_MODE | 276 | #define DOOMBUTTON_ENTER BUTTON_RC_MODE |
268 | #define DOOMBUTTON_WEAPON BUTTON_RC_HEART | 277 | #define DOOMBUTTON_WEAPON BUTTON_RC_HEART |
278 | |||
269 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ | 279 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ |
270 | CONFIG_KEYPAD == IRIVER_H300_PAD | 280 | CONFIG_KEYPAD == IRIVER_H300_PAD |
271 | #define DOOMBUTTON_UP BUTTON_UP | 281 | #define DOOMBUTTON_UP BUTTON_UP |
@@ -277,6 +287,7 @@ void I_ShutdownGraphics(void) | |||
277 | #define DOOMBUTTON_ESC BUTTON_OFF | 287 | #define DOOMBUTTON_ESC BUTTON_OFF |
278 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 288 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
279 | #define DOOMBUTTON_WEAPON BUTTON_ON | 289 | #define DOOMBUTTON_WEAPON BUTTON_ON |
290 | |||
280 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 291 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
281 | #define DOOMBUTTON_ESC BUTTON_RC_REC | 292 | #define DOOMBUTTON_ESC BUTTON_RC_REC |
282 | #define DOOMBUTTON_UP BUTTON_RC_VOL_UP | 293 | #define DOOMBUTTON_UP BUTTON_RC_VOL_UP |
@@ -287,11 +298,13 @@ void I_ShutdownGraphics(void) | |||
287 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE | 298 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE |
288 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY | 299 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY |
289 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU | 300 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU |
301 | |||
290 | #elif CONFIG_KEYPAD == COWON_D2_PAD | 302 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
291 | #define DOOMBUTTON_ESC BUTTON_POWER | 303 | #define DOOMBUTTON_ESC BUTTON_POWER |
292 | #define DOOMBUTTON_SHOOT BUTTON_PLUS | 304 | #define DOOMBUTTON_SHOOT BUTTON_PLUS |
293 | #define DOOMBUTTON_WEAPON BUTTON_MINUS | 305 | #define DOOMBUTTON_WEAPON BUTTON_MINUS |
294 | #define DOOMBUTTON_MAP BUTTON_MENU | 306 | #define DOOMBUTTON_MAP BUTTON_MENU |
307 | |||
295 | #elif CONFIG_KEYPAD == MROBE100_PAD | 308 | #elif CONFIG_KEYPAD == MROBE100_PAD |
296 | #define DOOMBUTTON_UP BUTTON_UP | 309 | #define DOOMBUTTON_UP BUTTON_UP |
297 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 310 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -302,6 +315,7 @@ void I_ShutdownGraphics(void) | |||
302 | #define DOOMBUTTON_ESC BUTTON_POWER | 315 | #define DOOMBUTTON_ESC BUTTON_POWER |
303 | #define DOOMBUTTON_ENTER BUTTON_MENU | 316 | #define DOOMBUTTON_ENTER BUTTON_MENU |
304 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY | 317 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY |
318 | |||
305 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 319 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
306 | #define DOOMBUTTON_ESC BUTTON_POWER | 320 | #define DOOMBUTTON_ESC BUTTON_POWER |
307 | #define DOOMBUTTON_UP BUTTON_STOP | 321 | #define DOOMBUTTON_UP BUTTON_STOP |
@@ -311,6 +325,7 @@ void I_ShutdownGraphics(void) | |||
311 | #define DOOMBUTTON_SHOOT BUTTON_VOLUP | 325 | #define DOOMBUTTON_SHOOT BUTTON_VOLUP |
312 | #define DOOMBUTTON_OPEN BUTTON_VOLDOWN | 326 | #define DOOMBUTTON_OPEN BUTTON_VOLDOWN |
313 | #define DOOMBUTTON_ENTER BUTTON_MENU | 327 | #define DOOMBUTTON_ENTER BUTTON_MENU |
328 | |||
314 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 329 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
315 | #define DOOMBUTTON_UP BUTTON_UP | 330 | #define DOOMBUTTON_UP BUTTON_UP |
316 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 331 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -322,6 +337,7 @@ void I_ShutdownGraphics(void) | |||
322 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 337 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
323 | #define DOOMBUTTON_WEAPON BUTTON_MENU | 338 | #define DOOMBUTTON_WEAPON BUTTON_MENU |
324 | #define DOOMBUTTON_MAP BUTTON_CUSTOM | 339 | #define DOOMBUTTON_MAP BUTTON_CUSTOM |
340 | |||
325 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 341 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
326 | #define DOOMBUTTON_UP BUTTON_UP | 342 | #define DOOMBUTTON_UP BUTTON_UP |
327 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 343 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -333,6 +349,7 @@ void I_ShutdownGraphics(void) | |||
333 | #define DOOMBUTTON_ENTER BUTTON_VIEW | 349 | #define DOOMBUTTON_ENTER BUTTON_VIEW |
334 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 350 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
335 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 351 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
352 | |||
336 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | 353 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD |
337 | #define DOOMBUTTON_UP BUTTON_UP | 354 | #define DOOMBUTTON_UP BUTTON_UP |
338 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 355 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -344,6 +361,7 @@ void I_ShutdownGraphics(void) | |||
344 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 361 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
345 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 362 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
346 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 363 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
364 | |||
347 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 365 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
348 | #define DOOMBUTTON_UP BUTTON_UP | 366 | #define DOOMBUTTON_UP BUTTON_UP |
349 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 367 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -355,13 +373,16 @@ void I_ShutdownGraphics(void) | |||
355 | #define DOOMBUTTON_ENTER BUTTON_LEFT | 373 | #define DOOMBUTTON_ENTER BUTTON_LEFT |
356 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 374 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
357 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 375 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
376 | |||
358 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 377 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
359 | #define DOOMBUTTON_ESC BUTTON_POWER | 378 | #define DOOMBUTTON_ESC BUTTON_POWER |
360 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP | 379 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP |
361 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 380 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
362 | #define DOOMBUTTON_MAP BUTTON_MENU | 381 | #define DOOMBUTTON_MAP BUTTON_MENU |
382 | |||
363 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 383 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
364 | #define DOOMBUTTON_ESC BUTTON_POWER | 384 | #define DOOMBUTTON_ESC BUTTON_POWER |
385 | |||
365 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 386 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD |
366 | #define DOOMBUTTON_UP BUTTON_UP | 387 | #define DOOMBUTTON_UP BUTTON_UP |
367 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 388 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -373,6 +394,7 @@ void I_ShutdownGraphics(void) | |||
373 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) | 394 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) |
374 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) | 395 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) |
375 | #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) | 396 | #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) |
397 | |||
376 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 398 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
377 | #define DOOMBUTTON_UP BUTTON_OK | 399 | #define DOOMBUTTON_UP BUTTON_OK |
378 | #define DOOMBUTTON_DOWN BUTTON_CANCEL | 400 | #define DOOMBUTTON_DOWN BUTTON_CANCEL |
@@ -383,6 +405,7 @@ void I_ShutdownGraphics(void) | |||
383 | #define DOOMBUTTON_ESC BUTTON_REC | 405 | #define DOOMBUTTON_ESC BUTTON_REC |
384 | #define DOOMBUTTON_ENTER BUTTON_POWER | 406 | #define DOOMBUTTON_ENTER BUTTON_POWER |
385 | #define DOOMBUTTON_WEAPON BUTTON_PLAY | 407 | #define DOOMBUTTON_WEAPON BUTTON_PLAY |
408 | |||
386 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 409 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
387 | #define DOOMBUTTON_UP BUTTON_REW | 410 | #define DOOMBUTTON_UP BUTTON_REW |
388 | #define DOOMBUTTON_DOWN BUTTON_FF | 411 | #define DOOMBUTTON_DOWN BUTTON_FF |
@@ -393,6 +416,7 @@ void I_ShutdownGraphics(void) | |||
393 | #define DOOMBUTTON_ESC BUTTON_REC | 416 | #define DOOMBUTTON_ESC BUTTON_REC |
394 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 417 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
395 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 418 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) |
419 | |||
396 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 420 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
397 | #define DOOMBUTTON_UP BUTTON_UP | 421 | #define DOOMBUTTON_UP BUTTON_UP |
398 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 422 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -403,16 +427,20 @@ void I_ShutdownGraphics(void) | |||
403 | #define DOOMBUTTON_ESC BUTTON_REC | 427 | #define DOOMBUTTON_ESC BUTTON_REC |
404 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_REPEAT) | 428 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_REPEAT) |
405 | #define DOOMBUTTON_WEAPON BUTTON_PLAY | 429 | #define DOOMBUTTON_WEAPON BUTTON_PLAY |
430 | |||
406 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 431 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
407 | #define DOOMBUTTON_UP BUTTON_UP | 432 | #define DOOMBUTTON_UP BUTTON_UP |
408 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 433 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
409 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 434 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
410 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 435 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
411 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
412 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE | 436 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE |
437 | #define DOOMBUTTON_QUIT BUTTON_POWER | ||
413 | #define DOOMBUTTON_ESC BUTTON_BACK | 438 | #define DOOMBUTTON_ESC BUTTON_BACK |
414 | #define DOOMBUTTON_ENTER (BUTTON_PLAYPAUSE|BUTTON_REPEAT) | 439 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
415 | #define DOOMBUTTON_WEAPON (BUTTON_SELECT|BUTTON_REPEAT) | 440 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
441 | #define DOOMBUTTON_WEAPON BUTTON_BOTTOMLEFT | ||
442 | #define DOOMBUTTON_MAP BUTTON_BOTTOMRIGHT | ||
443 | |||
416 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 444 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
417 | #define DOOMBUTTON_UP BUTTON_UP | 445 | #define DOOMBUTTON_UP BUTTON_UP |
418 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 446 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 2408bde5d6..baefbd6c27 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -365,7 +365,7 @@ | |||
365 | #define FLIPIT_QUIT BUTTON_POWER | 365 | #define FLIPIT_QUIT BUTTON_POWER |
366 | #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE | 366 | #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE |
367 | #define FLIPIT_SOLVE BUTTON_BACK | 367 | #define FLIPIT_SOLVE BUTTON_BACK |
368 | #define FLIPIT_STEP_BY_STEP (BUTTON_BACK|BUTTON_PLAYPAUSE) | 368 | #define FLIPIT_STEP_BY_STEP BUTTON_BOTTOMLEFT |
369 | #define FLIPIT_TOGGLE BUTTON_SELECT | 369 | #define FLIPIT_TOGGLE BUTTON_SELECT |
370 | 370 | ||
371 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 371 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index f71fc6fbdc..ac9995ce82 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -363,10 +363,12 @@ | |||
363 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 363 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
364 | #define GBN_BUTTON_LEFT BUTTON_LEFT | 364 | #define GBN_BUTTON_LEFT BUTTON_LEFT |
365 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | 365 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT |
366 | #define GBN_BUTTON_MENU BUTTON_POWER | ||
367 | #define GBN_BUTTON_PLAY BUTTON_SELECT | ||
366 | #define GBN_BUTTON_RETREAT BUTTON_BACK | 368 | #define GBN_BUTTON_RETREAT BUTTON_BACK |
367 | #define GBN_BUTTON_ADVANCE BUTTON_PLAYPAUSE | 369 | #define GBN_BUTTON_ADVANCE BUTTON_PLAYPAUSE |
368 | #define GBN_BUTTON_PLAY BUTTON_SELECT | 370 | #define GBN_BUTTON_CONTEXT BUTTON_BOTTOMLEFT |
369 | #define GBN_BUTTON_MENU BUTTON_POWER | 371 | #define GBN_BUTTON_NEXT_VAR BUTTON_BOTTOMRIGHT |
370 | 372 | ||
371 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | 373 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) |
372 | #define GBN_BUTTON_UP BUTTON_UP | 374 | #define GBN_BUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 7d80a536dd..6d03c9c654 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -311,9 +311,9 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
311 | #define JEWELS_UP BUTTON_UP | 311 | #define JEWELS_UP BUTTON_UP |
312 | #define JEWELS_DOWN BUTTON_DOWN | 312 | #define JEWELS_DOWN BUTTON_DOWN |
313 | #define JEWELS_SELECT BUTTON_SELECT | 313 | #define JEWELS_SELECT BUTTON_SELECT |
314 | #define JEWELS_CANCEL BUTTON_BACK | 314 | #define JEWELS_CANCEL BUTTON_POWER |
315 | #define HK_SELECT "SELECT" | 315 | #define HK_SELECT "SELECT" |
316 | #define HK_CANCEL "BACK" | 316 | #define HK_CANCEL "POWER" |
317 | 317 | ||
318 | #else | 318 | #else |
319 | #error No keymap defined! | 319 | #error No keymap defined! |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 9c9b949bed..da07ba6294 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -295,10 +295,12 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
295 | # define MINESWP_QUIT BUTTON_POWER | 295 | # define MINESWP_QUIT BUTTON_POWER |
296 | # define MINESWP_TOGGLE BUTTON_SELECT | 296 | # define MINESWP_TOGGLE BUTTON_SELECT |
297 | # define MINESWP_DISCOVER BUTTON_PLAYPAUSE | 297 | # define MINESWP_DISCOVER BUTTON_PLAYPAUSE |
298 | # define MINESWP_NEXT BUTTON_BOTTOMRIGHT | ||
299 | # define MINESWP_PREV BUTTON_BOTTOMLEFT | ||
298 | # define MINESWP_INFO BUTTON_BACK | 300 | # define MINESWP_INFO BUTTON_BACK |
299 | 301 | ||
300 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | ||
301 | 302 | ||
303 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | ||
302 | # define MINESWP_SCROLLWHEEL | 304 | # define MINESWP_SCROLLWHEEL |
303 | # define MINESWP_LEFT BUTTON_LEFT | 305 | # define MINESWP_LEFT BUTTON_LEFT |
304 | # define MINESWP_RIGHT BUTTON_RIGHT | 306 | # define MINESWP_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index 0183b0c3f6..a3de867c2f 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -250,7 +250,7 @@ | |||
250 | #define PACMAN_LEFT BUTTON_LEFT | 250 | #define PACMAN_LEFT BUTTON_LEFT |
251 | #define PACMAN_RIGHT BUTTON_RIGHT | 251 | #define PACMAN_RIGHT BUTTON_RIGHT |
252 | #define PACMAN_1UP BUTTON_SELECT | 252 | #define PACMAN_1UP BUTTON_SELECT |
253 | #define PACMAN_2UP BUTTON_BACK | 253 | #define PACMAN_2UP BUTTON_BOTTOMRIGHT |
254 | #define PACMAN_COIN BUTTON_PLAYPAUSE | 254 | #define PACMAN_COIN BUTTON_PLAYPAUSE |
255 | #define PACMAN_MENU BUTTON_POWER | 255 | #define PACMAN_MENU BUTTON_POWER |
256 | 256 | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 00bd99c156..7a708ae978 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -238,11 +238,12 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
238 | #define PONG_RIGHT_DOWN BUTTON_PLAY | 238 | #define PONG_RIGHT_DOWN BUTTON_PLAY |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 240 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
241 | #define PONG_QUIT BUTTON_POWER | 241 | #define PONG_QUIT BUTTON_POWER |
242 | #define PONG_LEFT_UP BUTTON_LEFT | 242 | #define PONG_LEFT_UP BUTTON_BACK |
243 | #define PONG_LEFT_DOWN BUTTON_DOWN | 243 | #define PONG_LEFT_DOWN BUTTON_BOTTOMLEFT |
244 | #define PONG_RIGHT_UP BUTTON_UP | 244 | #define PONG_RIGHT_UP BUTTON_PLAYPAUSE |
245 | #define PONG_RIGHT_DOWN BUTTON_RIGHT | 245 | #define PONG_RIGHT_DOWN BUTTON_BOTTOMRIGHT |
246 | #define PONG_PAUSE BUTTON_SELECT | ||
246 | 247 | ||
247 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | 248 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) |
248 | #define PONG_QUIT BUTTON_BACK | 249 | #define PONG_QUIT BUTTON_BACK |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 273c45c920..7db4dd087f 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -360,14 +360,18 @@ | |||
360 | #define ROCKBLOX_RESTART BUTTON_REC | 360 | #define ROCKBLOX_RESTART BUTTON_REC |
361 | 361 | ||
362 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 362 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
363 | #define ROCKBLOX_OFF BUTTON_POWER | 363 | #define ROCKBLOX_OFF_PRE BUTTON_POWER |
364 | #define ROCKBLOX_ROTATE_CW BUTTON_SELECT | 364 | #define ROCKBLOX_OFF BUTTON_POWER|BUTTON_REL |
365 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP | 365 | #define ROCKBLOX_ROTATE_CW BUTTON_BOTTOMRIGHT |
366 | #define ROCKBLOX_DOWN BUTTON_DOWN | 366 | #define ROCKBLOX_ROTATE_CCW BUTTON_BOTTOMLEFT |
367 | #define ROCKBLOX_DOWN BUTTON_SELECT | ||
367 | #define ROCKBLOX_LEFT BUTTON_LEFT | 368 | #define ROCKBLOX_LEFT BUTTON_LEFT |
368 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 369 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
369 | #define ROCKBLOX_DROP BUTTON_PLAYPAUSE | 370 | #define ROCKBLOX_DROP_PRE BUTTON_DOWN |
370 | #define ROCKBLOX_RESTART BUTTON_BACK | 371 | #define ROCKBLOX_DROP BUTTON_DOWN|BUTTON_REL |
372 | #define ROCKBLOX_RESTART BUTTON_BACK|BUTTON_REPEAT | ||
373 | #define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_UP | ||
374 | #define ROCKBLOX_ROTATE_CW2 BUTTON_VOL_DOWN | ||
371 | 375 | ||
372 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 376 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
373 | #define ROCKBLOX_OFF BUTTON_POWER | 377 | #define ROCKBLOX_OFF BUTTON_POWER |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index fe30ba2594..118a85926e 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -252,8 +252,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
252 | #define PUZZLE_RIGHT BUTTON_RIGHT | 252 | #define PUZZLE_RIGHT BUTTON_RIGHT |
253 | #define PUZZLE_UP BUTTON_UP | 253 | #define PUZZLE_UP BUTTON_UP |
254 | #define PUZZLE_DOWN BUTTON_DOWN | 254 | #define PUZZLE_DOWN BUTTON_DOWN |
255 | #define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE | 255 | #define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE|BUTTON_REPEAT |
256 | #define PUZZLE_PICTURE BUTTON_SELECT | 256 | #define PUZZLE_PICTURE BUTTON_SELECT|BUTTON_REPEAT |
257 | 257 | ||
258 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 258 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
259 | #define PUZZLE_QUIT BUTTON_POWER | 259 | #define PUZZLE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index 6e82b3ffe2..95dc4c4503 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -345,7 +345,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
345 | #define SNAKE2_DOWN BUTTON_DOWN | 345 | #define SNAKE2_DOWN BUTTON_DOWN |
346 | #define SNAKE2_QUIT BUTTON_POWER | 346 | #define SNAKE2_QUIT BUTTON_POWER |
347 | #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE | 347 | #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE |
348 | #define SNAKE2_PLAYPAUSE_TEXT "Play/Pause" | 348 | #define SNAKE2_PLAYPAUSE_TEXT "Play-Pause" |
349 | 349 | ||
350 | #else | 350 | #else |
351 | #error No keymap defined! | 351 | #error No keymap defined! |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 4d3bab2b6c..2bf90f6fd5 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -501,15 +501,17 @@ | |||
501 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 501 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
502 | #define SOKOBAN_UP BUTTON_UP | 502 | #define SOKOBAN_UP BUTTON_UP |
503 | #define SOKOBAN_DOWN BUTTON_DOWN | 503 | #define SOKOBAN_DOWN BUTTON_DOWN |
504 | #define SOKOBAN_MENU BUTTON_SELECT | 504 | #define SOKOBAN_MENU BUTTON_POWER |
505 | #define SOKOBAN_UNDO (BUTTON_BACK|BUTTON_SELECT) | 505 | #define SOKOBAN_UNDO_PRE BUTTON_BOTTOMLEFT |
506 | #define SOKOBAN_REDO (BUTTON_PLAYPAUSE|BUTTON_SELECT) | 506 | #define SOKOBAN_UNDO (BUTTON_BOTTOMLEFT|BUTTON_REL) |
507 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN | 507 | #define SOKOBAN_REDO_PRE BUTTON_BOTTOMRIGHT |
508 | #define SOKOBAN_REDO (BUTTON_BOTTOMRIGHT|BUTTON_REL) | ||
508 | #define SOKOBAN_LEVEL_REPEAT BUTTON_BACK | 509 | #define SOKOBAN_LEVEL_REPEAT BUTTON_BACK |
510 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN | ||
509 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP | 511 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP |
510 | #define SOKOBAN_PAUSE BUTTON_PLAYPAUSE | 512 | #define SOKOBAN_PAUSE BUTTON_PLAYPAUSE |
511 | #define BUTTON_SAVE (BUTTON_SELECT|BUTTON_REPEAT) | 513 | #define BUTTON_SAVE (BUTTON_SELECT|BUTTON_REPEAT) |
512 | #define BUTTON_SAVE_NAME "SELECT LONG" | 514 | #define BUTTON_SAVE_NAME "SELECT LONG" |
513 | 515 | ||
514 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 516 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
515 | #define SOKOBAN_LEFT BUTTON_LEFT | 517 | #define SOKOBAN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index e9671dd62d..b5376b5937 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -511,20 +511,18 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
511 | # define SOL_QUIT BUTTON_POWER | 511 | # define SOL_QUIT BUTTON_POWER |
512 | # define SOL_UP BUTTON_UP | 512 | # define SOL_UP BUTTON_UP |
513 | # define SOL_DOWN BUTTON_DOWN | 513 | # define SOL_DOWN BUTTON_DOWN |
514 | # define SOL_LEFT BUTTON_VOL_UP | 514 | # define SOL_LEFT BUTTON_LEFT |
515 | # define SOL_RIGHT BUTTON_VOL_DOWN | 515 | # define SOL_RIGHT BUTTON_RIGHT |
516 | # define SOL_MOVE (BUTTON_SELECT|BUTTON_REL) | 516 | # define SOL_MOVE BUTTON_SELECT |
517 | # define SOL_DRAW (BUTTON_PLAYPAUSE|BUTTON_REL) | 517 | # define SOL_DRAW BUTTON_BACK |
518 | # define SOL_REM2CUR BUTTON_LEFT | 518 | # define SOL_REM2CUR BUTTON_BOTTOMLEFT |
519 | # define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT) | 519 | # define SOL_CUR2STACK BUTTON_PLAYPAUSE|BUTTON_REL |
520 | # define SOL_CUR2STACK BUTTON_RIGHT | 520 | # define SOL_REM2STACK BUTTON_PLAYPAUSE|BUTTON_REPEAT |
521 | # define SOL_REM2STACK (BUTTON_LEFT|BUTTON_REPEAT) | 521 | # define HK_MOVE "SELECT" |
522 | # define SOL_REM2STACK_PRE BUTTON_LEFT | 522 | # define HK_DRAW "BACK" |
523 | # define HK_MOVE "SHORT SELECT" | 523 | # define HK_REM2CUR "BOTTOM-LEFT" |
524 | # define HK_DRAW "SHORT PLAYPAUSE" | 524 | # define HK_CUR2STACK "PLAY-PAUSE" |
525 | # define HK_REM2CUR "LEFT" | 525 | # define HK_REM2STACK "BOTTOM-RIGHT" |
526 | # define HK_CUR2STACK "DOUBLE SELECT" | ||
527 | # define HK_REM2STACK "LEFT" | ||
528 | 526 | ||
529 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 527 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
530 | # define SOL_QUIT BUTTON_POWER | 528 | # define SOL_QUIT BUTTON_POWER |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 5be527f045..a7fdcfba37 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -263,7 +263,7 @@ | |||
263 | #define AST_PAUSE BUTTON_PLAYPAUSE | 263 | #define AST_PAUSE BUTTON_PLAYPAUSE |
264 | #define AST_QUIT BUTTON_POWER | 264 | #define AST_QUIT BUTTON_POWER |
265 | #define AST_THRUST BUTTON_UP | 265 | #define AST_THRUST BUTTON_UP |
266 | #define AST_HYPERSPACE BUTTON_DOWN | 266 | #define AST_HYPERSPACE BUTTON_BACK |
267 | #define AST_LEFT BUTTON_LEFT | 267 | #define AST_LEFT BUTTON_LEFT |
268 | #define AST_RIGHT BUTTON_RIGHT | 268 | #define AST_RIGHT BUTTON_RIGHT |
269 | #define AST_FIRE BUTTON_SELECT | 269 | #define AST_FIRE BUTTON_SELECT |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 80170e667f..e4f4857d61 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -453,7 +453,7 @@ | |||
453 | #define STAR_RIGHT BUTTON_RIGHT | 453 | #define STAR_RIGHT BUTTON_RIGHT |
454 | #define STAR_UP BUTTON_UP | 454 | #define STAR_UP BUTTON_UP |
455 | #define STAR_DOWN BUTTON_DOWN | 455 | #define STAR_DOWN BUTTON_DOWN |
456 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT | 456 | #define STAR_TOGGLE_CONTROL BUTTON_PLAYPAUSE |
457 | #define STAR_LEVEL_UP BUTTON_VOL_UP | 457 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
458 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | 458 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
459 | #define STAR_LEVEL_REPEAT (BUTTON_BACK | BUTTON_REPEAT) | 459 | #define STAR_LEVEL_REPEAT (BUTTON_BACK | BUTTON_REPEAT) |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 655d8e36fe..2fb7462286 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -312,13 +312,16 @@ | |||
312 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 312 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
313 | 313 | ||
314 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 314 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
315 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
315 | #define SUDOKU_BUTTON_MENU BUTTON_BACK | 316 | #define SUDOKU_BUTTON_MENU BUTTON_BACK |
316 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 317 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
317 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 318 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
318 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_SELECT | 319 | #define SUDOKU_BUTTON_UP BUTTON_UP |
319 | #define SUDOKU_BUTTON_TOGGLE BUTTON_UP | 320 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
320 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN | 321 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT |
322 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_BOTTOMLEFT | ||
321 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAYPAUSE | 323 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAYPAUSE |
324 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_BOTTOMRIGHT | ||
322 | 325 | ||
323 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 326 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
324 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 327 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |