diff options
Diffstat (limited to 'apps/plugins')
42 files changed, 225 insertions, 209 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index ab4da37b0a..039acb0d39 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -437,13 +437,13 @@ enum { | |||
437 | #define BJACK_LEFT BUTTON_VOL_DOWN | 437 | #define BJACK_LEFT BUTTON_VOL_DOWN |
438 | 438 | ||
439 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 439 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
440 | #define BJACK_SELECT_NAME "FUNC" | 440 | #define BJACK_SELECT_NAME "ENTER" |
441 | #define BJACK_STAY_NAME "VOL +" | 441 | #define BJACK_STAY_NAME "PLAY" |
442 | #define BJACK_RESUME_NAME "PLAY" | 442 | #define BJACK_RESUME_NAME "" |
443 | #define BJACK_QUIT_NAME "REC+PLAY" | 443 | #define BJACK_QUIT_NAME "Long MENU" |
444 | #define BJACK_DOUBLE_NAME "VOL -" | 444 | #define BJACK_DOUBLE_NAME "REC" |
445 | #define BJACK_SELECT BUTTON_ENTER | 445 | #define BJACK_SELECT BUTTON_ENTER |
446 | #define BJACK_QUIT (BUTTON_REC|BUTTON_REPEAT) | 446 | #define BJACK_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
447 | #define BJACK_STAY BUTTON_PLAY | 447 | #define BJACK_STAY BUTTON_PLAY |
448 | #define BJACK_DOUBLEDOWN BUTTON_REC | 448 | #define BJACK_DOUBLEDOWN BUTTON_REC |
449 | #define BJACK_UP BUTTON_UP | 449 | #define BJACK_UP BUTTON_UP |
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c index 5bd81b7fed..21bec53fa7 100644 --- a/apps/plugins/bounce.c +++ b/apps/plugins/bounce.c | |||
@@ -227,8 +227,8 @@ | |||
227 | #define BOUNCE_RIGHT BUTTON_FF | 227 | #define BOUNCE_RIGHT BUTTON_FF |
228 | #define BOUNCE_UP BUTTON_UP | 228 | #define BOUNCE_UP BUTTON_UP |
229 | #define BOUNCE_DOWN BUTTON_DOWN | 229 | #define BOUNCE_DOWN BUTTON_DOWN |
230 | #define BOUNCE_QUIT (BUTTON_REC | BUTTON_REPEAT) | 230 | #define BOUNCE_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
231 | #define BOUNCE_MODE BUTTON_MENU | 231 | #define BOUNCE_MODE BUTTON_PLAY |
232 | 232 | ||
233 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 233 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
234 | #define BOUNCE_LEFT BUTTON_LEFT | 234 | #define BOUNCE_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/brickmania.c b/apps/plugins/brickmania.c index dd3903eb26..e741b56976 100644 --- a/apps/plugins/brickmania.c +++ b/apps/plugins/brickmania.c | |||
@@ -262,7 +262,7 @@ CONFIG_KEYPAD == SANSA_CONNECT_PAD | |||
262 | #define DOWN BUTTON_FF | 262 | #define DOWN BUTTON_FF |
263 | 263 | ||
264 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 264 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
265 | #define QUIT (BUTTON_REC|BUTTON_REPEAT) | 265 | #define QUIT (BUTTON_MENU|BUTTON_REPEAT) |
266 | #define LEFT BUTTON_REW | 266 | #define LEFT BUTTON_REW |
267 | #define RIGHT BUTTON_FF | 267 | #define RIGHT BUTTON_FF |
268 | #define SELECT BUTTON_ENTER | 268 | #define SELECT BUTTON_ENTER |
diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index 77c7a5588d..b8d7d85e61 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c | |||
@@ -397,13 +397,14 @@ F3: equal to "=" | |||
397 | #define CALCULATOR_QUIT (BUTTON_REC|BUTTON_PLAY) | 397 | #define CALCULATOR_QUIT (BUTTON_REC|BUTTON_PLAY) |
398 | #define CALCULATOR_INPUT BUTTON_FUNC | 398 | #define CALCULATOR_INPUT BUTTON_FUNC |
399 | #define CALCULATOR_CALC BUTTON_PLAY | 399 | #define CALCULATOR_CALC BUTTON_PLAY |
400 | #define CALCULATOR_CLEAR BUTTON_REC | ||
400 | 401 | ||
401 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 402 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
402 | #define CALCULATOR_LEFT BUTTON_REW | 403 | #define CALCULATOR_LEFT BUTTON_REW |
403 | #define CALCULATOR_RIGHT BUTTON_FF | 404 | #define CALCULATOR_RIGHT BUTTON_FF |
404 | #define CALCULATOR_UP BUTTON_UP | 405 | #define CALCULATOR_UP BUTTON_UP |
405 | #define CALCULATOR_DOWN BUTTON_DOWN | 406 | #define CALCULATOR_DOWN BUTTON_DOWN |
406 | #define CALCULATOR_QUIT (BUTTON_REC|BUTTON_REPEAT) | 407 | #define CALCULATOR_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
407 | #define CALCULATOR_INPUT BUTTON_ENTER | 408 | #define CALCULATOR_INPUT BUTTON_ENTER |
408 | #define CALCULATOR_CALC BUTTON_PLAY | 409 | #define CALCULATOR_CALC BUTTON_PLAY |
409 | #define CALCULATOR_CLEAR BUTTON_MENU | 410 | #define CALCULATOR_CLEAR BUTTON_MENU |
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index d498b97ffb..d0caef399f 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c | |||
@@ -279,14 +279,14 @@ | |||
279 | #define CALENDAR_PREV_MONTH BUTTON_REC | 279 | #define CALENDAR_PREV_MONTH BUTTON_REC |
280 | 280 | ||
281 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 281 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
282 | #define CALENDAR_QUIT BUTTON_REC | 282 | #define CALENDAR_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
283 | #define CALENDAR_SELECT BUTTON_ENTER | 283 | #define CALENDAR_SELECT BUTTON_ENTER |
284 | #define CALENDAR_NEXT_WEEK BUTTON_FF | 284 | #define CALENDAR_NEXT_WEEK BUTTON_FF |
285 | #define CALENDAR_PREV_WEEK BUTTON_REW | 285 | #define CALENDAR_PREV_WEEK BUTTON_REW |
286 | #define CALENDAR_NEXT_DAY BUTTON_UP | 286 | #define CALENDAR_NEXT_DAY BUTTON_UP |
287 | #define CALENDAR_PREV_DAY BUTTON_DOWN | 287 | #define CALENDAR_PREV_DAY BUTTON_DOWN |
288 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY | 288 | #define CALENDAR_NEXT_MONTH BUTTON_PLAY |
289 | #define CALENDAR_PREV_MONTH BUTTON_MENU | 289 | #define CALENDAR_PREV_MONTH BUTTON_REC |
290 | 290 | ||
291 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 291 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
292 | #define CALENDAR_QUIT BUTTON_POWER | 292 | #define CALENDAR_QUIT BUTTON_POWER |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 765e52ec8c..ec5e642e06 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -394,7 +394,7 @@ | |||
394 | #define CB_RIGHT BUTTON_FF | 394 | #define CB_RIGHT BUTTON_FF |
395 | #define CB_PLAY BUTTON_PLAY | 395 | #define CB_PLAY BUTTON_PLAY |
396 | #define CB_LEVEL BUTTON_REC | 396 | #define CB_LEVEL BUTTON_REC |
397 | #define CB_MENU (BUTTON_MENU | BUTTON_REPEAT) | 397 | #define CB_MENU BUTTON_MENU |
398 | 398 | ||
399 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 399 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
400 | #define CB_SELECT BUTTON_SELECT | 400 | #define CB_SELECT BUTTON_SELECT |
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c index 94f069d0a0..64a851b6c0 100644 --- a/apps/plugins/chessclock.c +++ b/apps/plugins/chessclock.c | |||
@@ -287,24 +287,24 @@ | |||
287 | #define CHC_SETTINGS_CANCEL BUTTON_CANCEL | 287 | #define CHC_SETTINGS_CANCEL BUTTON_CANCEL |
288 | 288 | ||
289 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 289 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
290 | #define CHC_QUIT (BUTTON_REC|BUTTON_PLAY) | 290 | #define CHC_QUIT (BUTTON_REC|BUTTON_PLAY) |
291 | #define CHC_STARTSTOP BUTTON_PLAY | 291 | #define CHC_STARTSTOP BUTTON_PLAY |
292 | #define CHC_RESET BUTTON_REW | 292 | #define CHC_RESET BUTTON_REW |
293 | #define CHC_MENU BUTTON_FUNC | 293 | #define CHC_MENU (BUTTON_FUNC|BUTTON_REPEAT) |
294 | #define CHC_SETTINGS_INC BUTTON_VOL_UP | 294 | #define CHC_SETTINGS_INC BUTTON_VOL_UP |
295 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN | 295 | #define CHC_SETTINGS_DEC BUTTON_VOL_DOWN |
296 | #define CHC_SETTINGS_OK BUTTON_FUNC | 296 | #define CHC_SETTINGS_OK BUTTON_FUNC |
297 | #define CHC_SETTINGS_CANCEL BUTTON_REC | 297 | #define CHC_SETTINGS_CANCEL BUTTON_REC |
298 | 298 | ||
299 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 299 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
300 | #define CHC_QUIT (BUTTON_REC|BUTTON_REPEAT) | 300 | #define CHC_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
301 | #define CHC_STARTSTOP BUTTON_PLAY | 301 | #define CHC_STARTSTOP BUTTON_PLAY |
302 | #define CHC_RESET BUTTON_REW | 302 | #define CHC_RESET BUTTON_REW |
303 | #define CHC_MENU BUTTON_MENU | 303 | #define CHC_MENU BUTTON_MENU |
304 | #define CHC_SETTINGS_INC BUTTON_UP | 304 | #define CHC_SETTINGS_INC BUTTON_UP |
305 | #define CHC_SETTINGS_DEC BUTTON_DOWN | 305 | #define CHC_SETTINGS_DEC BUTTON_DOWN |
306 | #define CHC_SETTINGS_OK BUTTON_ENTER | 306 | #define CHC_SETTINGS_OK BUTTON_ENTER |
307 | #define CHC_SETTINGS_CANCEL BUTTON_MENU | 307 | #define CHC_SETTINGS_CANCEL BUTTON_REC |
308 | 308 | ||
309 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 309 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
310 | #define CHC_QUIT BUTTON_POWER | 310 | #define CHC_QUIT BUTTON_POWER |
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c index 470a8e4c89..0e1b9c5213 100644 --- a/apps/plugins/chip8.c +++ b/apps/plugins/chip8.c | |||
@@ -1152,20 +1152,25 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
1152 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 1152 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
1153 | 1153 | ||
1154 | #define CHIP8_OFF (BUTTON_REC|BUTTON_PLAY) | 1154 | #define CHIP8_OFF (BUTTON_REC|BUTTON_PLAY) |
1155 | #define CHIP8_KEY2 BUTTON_REW | 1155 | #define CHIP8_KEY1 BUTTON_REW |
1156 | #define CHIP8_KEY4 BUTTON_FF | 1156 | #define CHIP8_KEY2 BUTTON_FF |
1157 | #define CHIP8_KEY3 BUTTON_FUNC | ||
1158 | #define CHIP8_KEY4 BUTTON_REC | ||
1157 | #define CHIP8_KEY5 BUTTON_PLAY | 1159 | #define CHIP8_KEY5 BUTTON_PLAY |
1158 | #define CHIP8_KEY6 BUTTON_VOL_DOWN | 1160 | #define CHIP8_KEY6 BUTTON_VOL_DOWN |
1159 | #define CHIP8_KEY8 BUTTON_VOL_UP | 1161 | #define CHIP8_KEY8 BUTTON_VOL_UP |
1160 | 1162 | ||
1161 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 1163 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
1162 | 1164 | ||
1163 | #define CHIP8_OFF (BUTTON_REC|BUTTON_REPEAT) | 1165 | #define CHIP8_OFF (BUTTON_MENU|BUTTON_REPEAT) |
1164 | #define CHIP8_KEY2 BUTTON_REW | 1166 | #define CHIP8_KEY1 BUTTON_REW |
1165 | #define CHIP8_KEY4 BUTTON_FF | 1167 | #define CHIP8_KEY2 BUTTON_FF |
1166 | #define CHIP8_KEY5 BUTTON_PLAY | 1168 | #define CHIP8_KEY3 BUTTON_MENU |
1167 | #define CHIP8_KEY6 BUTTON_DOWN | 1169 | #define CHIP8_KEY4 BUTTON_ENTER |
1168 | #define CHIP8_KEY8 BUTTON_UP | 1170 | #define CHIP8_KEY5 BUTTON_REC |
1171 | #define CHIP8_KEY6 BUTTON_PLAY | ||
1172 | #define CHIP8_KEY7 BUTTON_UP | ||
1173 | #define CHIP8_KEY8 BUTTON_DOWN | ||
1169 | 1174 | ||
1170 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 1175 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
1171 | 1176 | ||
diff --git a/apps/plugins/chopper.c b/apps/plugins/chopper.c index b2c3653aeb..29c91407c2 100644 --- a/apps/plugins/chopper.c +++ b/apps/plugins/chopper.c | |||
@@ -171,7 +171,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
171 | #define ACTIONTEXT "FUNC" | 171 | #define ACTIONTEXT "FUNC" |
172 | 172 | ||
173 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 173 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
174 | #define QUIT BUTTON_REC | 174 | #define QUIT (BUTTON_MENU|BUTTON_REPEAT) |
175 | #define ACTION BUTTON_ENTER | 175 | #define ACTION BUTTON_ENTER |
176 | #define ACTIONTEXT "ENTER" | 176 | #define ACTIONTEXT "ENTER" |
177 | 177 | ||
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index cecb10e1f2..1e80bda63a 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c | |||
@@ -300,7 +300,7 @@ | |||
300 | #define CUBE_HIGHSPEED BUTTON_FUNC | 300 | #define CUBE_HIGHSPEED BUTTON_FUNC |
301 | 301 | ||
302 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 302 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
303 | #define CUBE_QUIT BUTTON_REC | 303 | #define CUBE_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
304 | #define CUBE_NEXT BUTTON_FF | 304 | #define CUBE_NEXT BUTTON_FF |
305 | #define CUBE_PREV BUTTON_REW | 305 | #define CUBE_PREV BUTTON_REW |
306 | #define CUBE_INC BUTTON_UP | 306 | #define CUBE_INC BUTTON_UP |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 9009acc67f..eda611ffd2 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -401,8 +401,8 @@ void I_ShutdownGraphics(void) | |||
401 | #define DOOMBUTTON_SHOOT BUTTON_ENTER | 401 | #define DOOMBUTTON_SHOOT BUTTON_ENTER |
402 | #define DOOMBUTTON_OPEN BUTTON_MENU | 402 | #define DOOMBUTTON_OPEN BUTTON_MENU |
403 | #define DOOMBUTTON_ESC BUTTON_REC | 403 | #define DOOMBUTTON_ESC BUTTON_REC |
404 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 404 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_REPEAT) |
405 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 405 | #define DOOMBUTTON_WEAPON BUTTON_PLAY |
406 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 406 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
407 | #define DOOMBUTTON_UP BUTTON_UP | 407 | #define DOOMBUTTON_UP BUTTON_UP |
408 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 408 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index da5a9e8c6b..2408bde5d6 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -350,7 +350,7 @@ | |||
350 | #define FLIPIT_RIGHT BUTTON_FF | 350 | #define FLIPIT_RIGHT BUTTON_FF |
351 | #define FLIPIT_UP BUTTON_UP | 351 | #define FLIPIT_UP BUTTON_UP |
352 | #define FLIPIT_DOWN BUTTON_DOWN | 352 | #define FLIPIT_DOWN BUTTON_DOWN |
353 | #define FLIPIT_QUIT (BUTTON_REC|BUTTON_REPEAT) | 353 | #define FLIPIT_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
354 | #define FLIPIT_SHUFFLE BUTTON_PLAY | 354 | #define FLIPIT_SHUFFLE BUTTON_PLAY |
355 | #define FLIPIT_SOLVE BUTTON_MENU | 355 | #define FLIPIT_SOLVE BUTTON_MENU |
356 | #define FLIPIT_STEP_BY_STEP BUTTON_REC | 356 | #define FLIPIT_STEP_BY_STEP BUTTON_REC |
diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 0d1aff3078..027f4698dc 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h | |||
@@ -343,16 +343,16 @@ | |||
343 | #define FRACTAL_RESET BUTTON_REC | 343 | #define FRACTAL_RESET BUTTON_REC |
344 | 344 | ||
345 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 345 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
346 | #define FRACTAL_QUIT BUTTON_REC | 346 | #define FRACTAL_QUIT BUTTON_MENU |
347 | #define FRACTAL_UP BUTTON_UP | 347 | #define FRACTAL_UP BUTTON_UP |
348 | #define FRACTAL_DOWN BUTTON_DOWN | 348 | #define FRACTAL_DOWN BUTTON_DOWN |
349 | #define FRACTAL_LEFT BUTTON_MENU | 349 | #define FRACTAL_LEFT BUTTON_REW |
350 | #define FRACTAL_RIGHT BUTTON_ENTER | 350 | #define FRACTAL_RIGHT BUTTON_FF |
351 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY|BUTTON_UP) | 351 | #define FRACTAL_ZOOM_IN (BUTTON_PLAY | BUTTON_UP) |
352 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY|BUTTON_DOWN) | 352 | #define FRACTAL_ZOOM_OUT (BUTTON_PLAY | BUTTON_DOWN) |
353 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_FF) | 353 | #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_FF) |
354 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_REW) | 354 | #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_REW) |
355 | #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_REC) | 355 | #define FRACTAL_RESET BUTTON_REC |
356 | 356 | ||
357 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 357 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
358 | #define FRACTAL_QUIT BUTTON_POWER | 358 | #define FRACTAL_QUIT BUTTON_POWER |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index 20940d74f0..bb2c980f12 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -339,20 +339,24 @@ | |||
339 | #define GBN_BUTTON_DOWN BUTTON_FF | 339 | #define GBN_BUTTON_DOWN BUTTON_FF |
340 | #define GBN_BUTTON_LEFT BUTTON_VOL_DOWN | 340 | #define GBN_BUTTON_LEFT BUTTON_VOL_DOWN |
341 | #define GBN_BUTTON_RIGHT BUTTON_VOL_UP | 341 | #define GBN_BUTTON_RIGHT BUTTON_VOL_UP |
342 | #define GBN_BUTTON_RETREAT BUTTON_REC | 342 | #define GBN_BUTTON_RETREAT (BUTTON_REC | BUTTON_REW) |
343 | #define GBN_BUTTON_ADVANCE BUTTON_PLAY | 343 | #define GBN_BUTTON_ADVANCE (BUTTON_REC | BUTTON_FF) |
344 | #define GBN_BUTTON_PLAY BUTTON_FUNC | BUTTON_REL | 344 | #define GBN_BUTTON_PLAY (BUTTON_FUNC | BUTTON_REL) |
345 | #define GBN_BUTTON_MENU BUTTON_FUNC | BUTTON_REPEAT | 345 | #define GBN_BUTTON_MENU BUTTON_PLAY |
346 | #define GBN_BUTTON_CONTEXT (BUTTON_FUNC | BUTTON_REPEATE) | ||
347 | #define GBN_BUTTON_NEXT_VAR BUTTON_REC | ||
346 | 348 | ||
347 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 349 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
348 | #define GBN_BUTTON_UP BUTTON_UP | 350 | #define GBN_BUTTON_UP BUTTON_UP |
349 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 351 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
350 | #define GBN_BUTTON_LEFT BUTTON_REW | 352 | #define GBN_BUTTON_LEFT BUTTON_REW |
351 | #define GBN_BUTTON_RIGHT BUTTON_FF | 353 | #define GBN_BUTTON_RIGHT BUTTON_FF |
352 | #define GBN_BUTTON_RETREAT BUTTON_REC | 354 | #define GBN_BUTTON_RETREAT (BUTTON_REC | BUTTON_REW) |
353 | #define GBN_BUTTON_ADVANCE BUTTON_PLAY | 355 | #define GBN_BUTTON_ADVANCE (BUTTON_REC | BUTTON_FF) |
354 | #define GBN_BUTTON_PLAY BUTTON_ENTER | 356 | #define GBN_BUTTON_PLAY (BUTTON_ENTER | BUTTON_REL) |
357 | #define GBN_BUTTON_CONTEXT (BUTTON_ENTER | BUTTON_REPEAT) | ||
355 | #define GBN_BUTTON_MENU BUTTON_MENU | 358 | #define GBN_BUTTON_MENU BUTTON_MENU |
359 | #define GBN_BUTTON_NEXT_VAR BUTTON_REC | ||
356 | 360 | ||
357 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | 361 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) |
358 | #define GBN_BUTTON_UP BUTTON_UP | 362 | #define GBN_BUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h index 10d239922e..37f5f404b6 100644 --- a/apps/plugins/imageviewer/imageviewer_button.h +++ b/apps/plugins/imageviewer/imageviewer_button.h | |||
@@ -329,28 +329,28 @@ | |||
329 | #define IMGVIEW_QUIT BUTTON_CANCEL | 329 | #define IMGVIEW_QUIT BUTTON_CANCEL |
330 | 330 | ||
331 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 331 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
332 | #define IMGVIEW_ZOOM_IN (BUTTON_REC|BUTTON_VOL_UP) | 332 | #define IMGVIEW_ZOOM_IN BUTTON_PLAY |
333 | #define IMGVIEW_ZOOM_OUT (BUTTON_REC|BUTTON_VOL_DOWN) | 333 | #define IMGVIEW_ZOOM_OUT BUTTON_REC |
334 | #define IMGVIEW_UP BUTTON_REW | 334 | #define IMGVIEW_UP (BUTTON_REC | BUTTON_REW) |
335 | #define IMGVIEW_DOWN BUTTON_FF | 335 | #define IMGVIEW_DOWN (BUTTON_REC | BUTTON_FF) |
336 | #define IMGVIEW_LEFT BUTTON_VOL_DOWN | 336 | #define IMGVIEW_LEFT BUTTON_VOL_DOWN |
337 | #define IMGVIEW_RIGHT BUTTON_VOL_UP | 337 | #define IMGVIEW_RIGHT BUTTON_VOL_UP |
338 | #define IMGVIEW_NEXT (BUTTON_REC | BUTTON_FF) | 338 | #define IMGVIEW_NEXT BUTTON_FF |
339 | #define IMGVIEW_PREVIOUS (BUTTON_REC | BUTTON_REW) | 339 | #define IMGVIEW_PREVIOUS BUTTON_REW |
340 | #define IMGVIEW_MENU BUTTON_FUNC | 340 | #define IMGVIEW_MENU BUTTON_FUNC |
341 | #define IMGVIEW_QUIT (BUTTON_REC | BUTTON_PLAY) | 341 | #define IMGVIEW_QUIT (BUTTON_REC | BUTTON_PLAY) |
342 | 342 | ||
343 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 343 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
344 | #define IMGVIEW_ZOOM_IN (BUTTON_ENTER | BUTTON_UP) | 344 | #define IMGVIEW_ZOOM_IN (BUTTON_PLAY | BUTTON_REL) |
345 | #define IMGVIEW_ZOOM_OUT (BUTTON_ENTER | BUTTON_DOWN) | 345 | #define IMGVIEW_ZOOM_OUT BUTTON_REC |
346 | #define IMGVIEW_UP BUTTON_UP | 346 | #define IMGVIEW_UP (BUTTON_PLAY | BUTTON_UP) |
347 | #define IMGVIEW_DOWN BUTTON_DOWN | 347 | #define IMGVIEW_DOWN (BUTTON_PLAY | BUTTON_DOWN) |
348 | #define IMGVIEW_LEFT BUTTON_REW | 348 | #define IMGVIEW_LEFT BUTTON_REW |
349 | #define IMGVIEW_RIGHT BUTTON_FF | 349 | #define IMGVIEW_RIGHT BUTTON_FF |
350 | #define IMGVIEW_NEXT (BUTTON_FF | BUTTON_ENTER) | 350 | #define IMGVIEW_NEXT BUTTON_DOWN |
351 | #define IMGVIEW_PREVIOUS (BUTTON_REW | BUTTON_ENTER) | 351 | #define IMGVIEW_PREVIOUS BUTTON_UP |
352 | #define IMGVIEW_MENU (BUTTON_ENTER | BUTTON_REPEAT) | 352 | #define IMGVIEW_MENU BUTTON_ENTER |
353 | #define IMGVIEW_QUIT BUTTON_REC | 353 | #define IMGVIEW_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
354 | 354 | ||
355 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 355 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
356 | #define IMGVIEW_ZOOM_IN BUTTON_VOL_UP | 356 | #define IMGVIEW_ZOOM_IN BUTTON_VOL_UP |
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c index c52208d3c6..0cbbe9ddb6 100644 --- a/apps/plugins/invadrox.c +++ b/apps/plugins/invadrox.c | |||
@@ -217,10 +217,10 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
217 | 217 | ||
218 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 218 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
219 | 219 | ||
220 | #define QUIT BUTTON_REC | 220 | #define QUIT BUTTON_MENU |
221 | #define LEFT BUTTON_MENU | 221 | #define LEFT BUTTON_REW |
222 | #define RIGHT BUTTON_ENTER | 222 | #define RIGHT BUTTON_FF |
223 | #define FIRE BUTTON_PLAY | 223 | #define FIRE BUTTON_ENTER |
224 | 224 | ||
225 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 225 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
226 | 226 | ||
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index be148bd533..7f8c11a34e 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -397,7 +397,7 @@ const struct button_mapping pla_main_ctx[] = | |||
397 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, | 397 | {PLA_SELECT_REPEAT, BUTTON_FUNC|BUTTON_REPEAT, BUTTON_NONE}, |
398 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 398 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
399 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, | 399 | {PLA_CANCEL, BUTTON_MENU, BUTTON_NONE}, |
400 | {PLA_EXIT, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE}, | 400 | {PLA_EXIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE}, |
401 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, | 401 | {PLA_SELECT, BUTTON_ENTER, BUTTON_NONE}, |
402 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, | 402 | {PLA_SELECT_REL, BUTTON_ENTER|BUTTON_REL, BUTTON_ENTER}, |
403 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, | 403 | {PLA_SELECT_REPEAT, BUTTON_ENTER|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/logo.c b/apps/plugins/logo.c index be163f566e..14360b4845 100644 --- a/apps/plugins/logo.c +++ b/apps/plugins/logo.c | |||
@@ -210,7 +210,7 @@ const unsigned char rockbox16x7[] = { | |||
210 | #define LP_INC_Y BUTTON_FF | 210 | #define LP_INC_Y BUTTON_FF |
211 | 211 | ||
212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
213 | #define LP_QUIT (BUTTON_REC|BUTTON_REPEAT) | 213 | #define LP_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
214 | #define LP_DEC_X BUTTON_REW | 214 | #define LP_DEC_X BUTTON_REW |
215 | #define LP_INC_X BUTTON_FF | 215 | #define LP_INC_X BUTTON_FF |
216 | #define LP_DEC_Y BUTTON_DOWN | 216 | #define LP_DEC_Y BUTTON_DOWN |
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c index ace7290a12..6ef3439ffd 100644 --- a/apps/plugins/midi/midiplay.c +++ b/apps/plugins/midi/midiplay.c | |||
@@ -203,14 +203,14 @@ | |||
203 | 203 | ||
204 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 204 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
205 | #define BTN_QUIT (BUTTON_REC | BUTTON_PLAY) | 205 | #define BTN_QUIT (BUTTON_REC | BUTTON_PLAY) |
206 | #define BTN_RIGHT BUTTON_VOL_DOWN | 206 | #define BTN_RIGHT BUTTON_FF |
207 | #define BTN_LEFT BUTTON_VOL_UP | 207 | #define BTN_LEFT BUTTON_REW |
208 | #define BTN_UP BUTTON_REW | 208 | #define BTN_UP BUTTON_VOL_UP |
209 | #define BTN_DOWN BUTTON_FF | 209 | #define BTN_DOWN BUTTON_VOL_DOWN |
210 | #define BTN_PLAY BUTTON_PLAY | 210 | #define BTN_PLAY BUTTON_PLAY |
211 | 211 | ||
212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
213 | #define BTN_QUIT (BUTTON_REC | BUTTON_REPEAT) | 213 | #define BTN_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
214 | #define BTN_RIGHT BUTTON_FF | 214 | #define BTN_RIGHT BUTTON_FF |
215 | #define BTN_LEFT BUTTON_REW | 215 | #define BTN_LEFT BUTTON_REW |
216 | #define BTN_UP BUTTON_UP | 216 | #define BTN_UP BUTTON_UP |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index e0da928b02..9c9b949bed 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -278,14 +278,14 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
278 | # define MINESWP_INFO BUTTON_REC | 278 | # define MINESWP_INFO BUTTON_REC |
279 | 279 | ||
280 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 280 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
281 | # define MINESWP_LEFT BUTTON_MENU | 281 | # define MINESWP_LEFT BUTTON_REW |
282 | # define MINESWP_RIGHT BUTTON_ENTER | 282 | # define MINESWP_RIGHT BUTTON_FF |
283 | # define MINESWP_UP BUTTON_UP | 283 | # define MINESWP_UP BUTTON_UP |
284 | # define MINESWP_DOWN BUTTON_DOWN | 284 | # define MINESWP_DOWN BUTTON_DOWN |
285 | # define MINESWP_QUIT BUTTON_REC | 285 | # define MINESWP_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
286 | # define MINESWP_TOGGLE BUTTON_PLAY | 286 | # define MINESWP_TOGGLE BUTTON_ENTER |
287 | # define MINESWP_DISCOVER BUTTON_FF | 287 | # define MINESWP_DISCOVER BUTTON_PLAY |
288 | # define MINESWP_INFO BUTTON_REW | 288 | # define MINESWP_INFO (BUTTON_MENU|BUTTON_REL) |
289 | 289 | ||
290 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 290 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
291 | # define MINESWP_LEFT BUTTON_LEFT | 291 | # define MINESWP_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index 0b1687da5c..0a0164ed13 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c | |||
@@ -310,7 +310,7 @@ | |||
310 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN | 310 | #define OSCILLOSCOPE_VOL_DOWN BUTTON_VOL_DOWN |
311 | 311 | ||
312 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 312 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
313 | #define OSCILLOSCOPE_QUIT (BUTTON_REC | BUTTON_REPEAT) | 313 | #define OSCILLOSCOPE_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
314 | #define OSCILLOSCOPE_DRAWMODE BUTTON_ENTER | 314 | #define OSCILLOSCOPE_DRAWMODE BUTTON_ENTER |
315 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC | 315 | #define OSCILLOSCOPE_ADVMODE BUTTON_REC |
316 | #define OSCILLOSCOPE_ORIENTATION BUTTON_MENU | 316 | #define OSCILLOSCOPE_ORIENTATION BUTTON_MENU |
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 479f7c5ec2..9f68fc3e31 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -455,22 +455,23 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
455 | #define SELECT_TEXT "FUNC" | 455 | #define SELECT_TEXT "FUNC" |
456 | 456 | ||
457 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 457 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
458 | #define PEGBOX_QUIT BUTTON_REC | 458 | #define PEGBOX_SAVE (BUTTON_ENTER | BUTTON_REPEAT) |
459 | #define PEGBOX_RESTART (BUTTON_MENU | BUTTON_REC) | 459 | #define PEGBOX_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
460 | #define PEGBOX_LVL_UP BUTTON_REW | 460 | #define PEGBOX_RESTART (BUTTON_MENU | BUTTON_REL) |
461 | #define PEGBOX_LVL_DOWN BUTTON_FF | 461 | #define PEGBOX_LVL_UP BUTTON_PLAY |
462 | #define PEGBOX_LVL_DOWN BUTTON_REC | ||
462 | #define PEGBOX_UP BUTTON_UP | 463 | #define PEGBOX_UP BUTTON_UP |
463 | #define PEGBOX_DOWN BUTTON_DOWN | 464 | #define PEGBOX_DOWN BUTTON_DOWN |
464 | #define PEGBOX_RIGHT BUTTON_ENTER | 465 | #define PEGBOX_RIGHT BUTTON_FF |
465 | #define PEGBOX_LEFT BUTTON_MENU | 466 | #define PEGBOX_LEFT BUTTON_REW |
466 | #define PEGBOX_SELECT BUTTON_PLAY | 467 | #define PEGBOX_SELECT (BUTTON_ENTER | BUTTON_REL) |
467 | 468 | ||
468 | #define SAVE_TEXT "PLAY + FUNC" | 469 | #define SAVE_TEXT "Long ENTER" |
469 | #define QUIT_TEXT "REC + PLAY" | 470 | #define QUIT_TEXT "Long MENU" |
470 | #define RESTART_TEXT "REC" | 471 | #define RESTART_TEXT "MENU" |
471 | #define LVL_UP_TEXT "REW" | 472 | #define LVL_UP_TEXT "PLAY" |
472 | #define LVL_DOWN_TEXT "FF" | 473 | #define LVL_DOWN_TEXT "REC" |
473 | #define SELECT_TEXT "FUNC" | 474 | #define SELECT_TEXT "ENTER" |
474 | 475 | ||
475 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 476 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
476 | #define PEGBOX_QUIT BUTTON_POWER | 477 | #define PEGBOX_QUIT BUTTON_POWER |
diff --git a/apps/plugins/pictureflow/pictureflow.c b/apps/plugins/pictureflow/pictureflow.c index 224dc81667..ef18f53ffe 100644 --- a/apps/plugins/pictureflow/pictureflow.c +++ b/apps/plugins/pictureflow/pictureflow.c | |||
@@ -61,7 +61,7 @@ | |||
61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) | 61 | #define PF_TRACKLIST (LAST_ACTION_PLACEHOLDER + 2) |
62 | 62 | ||
63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ | 63 | #if defined(HAVE_SCROLLWHEEL) || CONFIG_KEYPAD == IRIVER_H10_PAD || \ |
64 | CONFIG_KEYPAD == SAMSUNG_YH_PAD | 64 | CONFIG_KEYPAD == SAMSUNG_YH_PAD || CONFIG_KEYPAD == MPIO_HD300_PAD |
65 | #define USE_CORE_PREVNEXT | 65 | #define USE_CORE_PREVNEXT |
66 | #endif | 66 | #endif |
67 | 67 | ||
@@ -137,7 +137,8 @@ const struct button_mapping pf_context_buttons[] = | |||
137 | {PF_QUIT, BUTTON_EQ, BUTTON_NONE}, | 137 | {PF_QUIT, BUTTON_EQ, BUTTON_NONE}, |
138 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ | 138 | #elif (CONFIG_KEYPAD == IPOD_1G2G_PAD) \ |
139 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ | 139 | || (CONFIG_KEYPAD == IPOD_3G_PAD) \ |
140 | || (CONFIG_KEYPAD == IPOD_4G_PAD) | 140 | || (CONFIG_KEYPAD == IPOD_4G_PAD) \ |
141 | || (CONFIG_KEYPAD == MPIO_HD300_PAD) | ||
141 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, | 142 | {PF_QUIT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU}, |
142 | #elif CONFIG_KEYPAD == LOGIK_DAX_PAD | 143 | #elif CONFIG_KEYPAD == LOGIK_DAX_PAD |
143 | {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY}, | 144 | {PF_QUIT, BUTTON_POWERPLAY|BUTTON_REPEAT, BUTTON_POWERPLAY}, |
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 430b688f1f..00bd99c156 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -231,11 +231,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
231 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN | 231 | #define PONG_RIGHT_DOWN BUTTON_VOL_DOWN |
232 | 232 | ||
233 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 233 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
234 | #define PONG_QUIT (BUTTON_REC|BUTTON_REPEAT) | 234 | #define PONG_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
235 | #define PONG_LEFT_UP BUTTON_FF | 235 | #define PONG_LEFT_UP BUTTON_REW |
236 | #define PONG_LEFT_DOWN BUTTON_REW | 236 | #define PONG_LEFT_DOWN BUTTON_REC |
237 | #define PONG_RIGHT_UP BUTTON_UP | 237 | #define PONG_RIGHT_UP BUTTON_FF |
238 | #define PONG_RIGHT_DOWN BUTTON_DOWN | 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 |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index c23c6b11cb..273c45c920 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -350,12 +350,12 @@ | |||
350 | #define ROCKBLOX_RESTART BUTTON_REC | 350 | #define ROCKBLOX_RESTART BUTTON_REC |
351 | 351 | ||
352 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 352 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
353 | #define ROCKBLOX_OFF (BUTTON_REC|BUTTON_REPEAT) | 353 | #define ROCKBLOX_OFF (BUTTON_MENU|BUTTON_REPEAT) |
354 | #define ROCKBLOX_ROTATE_CCW BUTTON_REW | 354 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP |
355 | #define ROCKBLOX_ROTATE_CW BUTTON_FF | 355 | #define ROCKBLOX_ROTATE_CW BUTTON_DOWN |
356 | #define ROCKBLOX_DOWN BUTTON_DOWN | 356 | #define ROCKBLOX_DOWN (BUTTON_ENTER | BUTTON_REL) |
357 | #define ROCKBLOX_LEFT BUTTON_MENU | 357 | #define ROCKBLOX_LEFT BUTTON_REW |
358 | #define ROCKBLOX_RIGHT BUTTON_ENTER | 358 | #define ROCKBLOX_RIGHT BUTTON_FF |
359 | #define ROCKBLOX_DROP BUTTON_PLAY | 359 | #define ROCKBLOX_DROP BUTTON_PLAY |
360 | #define ROCKBLOX_RESTART BUTTON_REC | 360 | #define ROCKBLOX_RESTART BUTTON_REC |
361 | 361 | ||
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c index 5b6e812abf..7a50030596 100644 --- a/apps/plugins/rockblox1d.c +++ b/apps/plugins/rockblox1d.c | |||
@@ -123,8 +123,8 @@ | |||
123 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_PLAY) | 123 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_PLAY) |
124 | 124 | ||
125 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 125 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
126 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | 126 | #define ONEDROCKBLOX_DOWN BUTTON_ENTER |
127 | #define ONEDROCKBLOX_QUIT (BUTTON_REC | BUTTON_REPEAT) | 127 | #define ONEDROCKBLOX_QUIT BUTTON_MENU |
128 | 128 | ||
129 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | 129 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) |
130 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN | 130 | #define ONEDROCKBLOX_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index bc73abee92..ec2135af46 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c | |||
@@ -312,11 +312,11 @@ static void setoptions (void) | |||
312 | options.LEFT = BUTTON_REW; | 312 | options.LEFT = BUTTON_REW; |
313 | options.RIGHT = BUTTON_FF; | 313 | options.RIGHT = BUTTON_FF; |
314 | 314 | ||
315 | options.A = BUTTON_MENU; | 315 | options.A = BUTTON_PLAY; |
316 | options.B = BUTTON_ENTER; | 316 | options.B = BUTTON_REC; |
317 | options.START = BUTTON_PLAY; | 317 | options.START = (BUTTON_PLAY | BUTTON_REPEAT); |
318 | options.SELECT = (BUTTON_ENTER | BUTTON_REPEAT); | 318 | options.SELECT = BUTTON_ENTER; |
319 | options.MENU = (BUTTON_MENU | BUTTON_REPEAT); | 319 | options.MENU = BUTTON_MENU; |
320 | 320 | ||
321 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 321 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
322 | options.UP = BUTTON_UP; | 322 | options.UP = BUTTON_UP; |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index a176f75c91..fe30ba2594 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -238,11 +238,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
238 | #define PUZZLE_PICTURE BUTTON_PLAY | 238 | #define PUZZLE_PICTURE BUTTON_PLAY |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 240 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
241 | #define PUZZLE_QUIT (BUTTON_REC | BUTTON_REPEAT) | 241 | #define PUZZLE_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
242 | #define PUZZLE_LEFT BUTTON_REW | 242 | #define PUZZLE_LEFT BUTTON_FF |
243 | #define PUZZLE_RIGHT BUTTON_FF | 243 | #define PUZZLE_RIGHT BUTTON_REW |
244 | #define PUZZLE_UP BUTTON_UP | 244 | #define PUZZLE_UP BUTTON_DOWN |
245 | #define PUZZLE_DOWN BUTTON_DOWN | 245 | #define PUZZLE_DOWN BUTTON_UP |
246 | #define PUZZLE_SHUFFLE BUTTON_ENTER | 246 | #define PUZZLE_SHUFFLE BUTTON_ENTER |
247 | #define PUZZLE_PICTURE BUTTON_PLAY | 247 | #define PUZZLE_PICTURE BUTTON_PLAY |
248 | 248 | ||
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c index a20376742f..21d5977a99 100644 --- a/apps/plugins/snake.c +++ b/apps/plugins/snake.c | |||
@@ -212,19 +212,19 @@ dir is the current direction of the snake - 0=up, 1=right, 2=down, 3=left; | |||
212 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 212 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
213 | 213 | ||
214 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 214 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
215 | #define SNAKE_QUIT (BUTTON_REC|BUTTON_PLAY) | 215 | #define SNAKE_QUIT (BUTTON_REC|BUTTON_PLAY) |
216 | #define SNAKE_LEFT BUTTON_VOL_DOWN | 216 | #define SNAKE_LEFT BUTTON_VOL_DOWN |
217 | #define SNAKE_RIGHT BUTTON_VOL_UP | 217 | #define SNAKE_RIGHT BUTTON_VOL_UP |
218 | #define SNAKE_UP BUTTON_REW | 218 | #define SNAKE_UP BUTTON_REW |
219 | #define SNAKE_DOWN BUTTON_FF | 219 | #define SNAKE_DOWN BUTTON_FF |
220 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 220 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
221 | 221 | ||
222 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 222 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
223 | #define SNAKE_QUIT (BUTTON_REC|BUTTON_REPEAT) | 223 | #define SNAKE_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
224 | #define SNAKE_LEFT BUTTON_REW | 224 | #define SNAKE_LEFT BUTTON_REW |
225 | #define SNAKE_RIGHT BUTTON_FF | 225 | #define SNAKE_RIGHT BUTTON_FF |
226 | #define SNAKE_UP BUTTON_UP | 226 | #define SNAKE_UP BUTTON_UP |
227 | #define SNAKE_DOWN BUTTON_DOWN | 227 | #define SNAKE_DOWN BUTTON_DOWN |
228 | #define SNAKE_PLAYPAUSE BUTTON_PLAY | 228 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
229 | 229 | ||
230 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 230 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index bd0257d2be..6e82b3ffe2 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -330,11 +330,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
330 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 330 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
331 | 331 | ||
332 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 332 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
333 | #define SNAKE2_LEFT BUTTON_MENU | 333 | #define SNAKE2_LEFT BUTTON_REW |
334 | #define SNAKE2_RIGHT BUTTON_ENTER | 334 | #define SNAKE2_RIGHT BUTTON_FF |
335 | #define SNAKE2_UP BUTTON_UP | 335 | #define SNAKE2_UP BUTTON_UP |
336 | #define SNAKE2_DOWN BUTTON_DOWN | 336 | #define SNAKE2_DOWN BUTTON_DOWN |
337 | #define SNAKE2_QUIT (BUTTON_REC|BUTTON_REPEAT) | 337 | #define SNAKE2_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
338 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY | 338 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
339 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 339 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
340 | 340 | ||
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 942b101d4c..4d3bab2b6c 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -486,15 +486,15 @@ | |||
486 | #define SOKOBAN_RIGHT BUTTON_FF | 486 | #define SOKOBAN_RIGHT BUTTON_FF |
487 | #define SOKOBAN_UP BUTTON_UP | 487 | #define SOKOBAN_UP BUTTON_UP |
488 | #define SOKOBAN_DOWN BUTTON_DOWN | 488 | #define SOKOBAN_DOWN BUTTON_DOWN |
489 | #define SOKOBAN_MENU BUTTON_MENU | 489 | #define SOKOBAN_MENU (BUTTON_MENU | BUTTON_REPEAT) |
490 | #define SOKOBAN_UNDO (BUTTON_PLAY | BUTTON_REW) | 490 | #define SOKOBAN_UNDO BUTTON_REC |
491 | #define SOKOBAN_REDO (BUTTON_PLAY | BUTTON_FF) | 491 | #define SOKOBAN_REDO BUTTON_PLAY |
492 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_DOWN) | 492 | #define SOKOBAN_LEVEL_DOWN (BUTTON_PLAY | BUTTON_REW) |
493 | #define SOKOBAN_LEVEL_REPEAT BUTTON_REC | 493 | #define SOKOBAN_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_ENTER) |
494 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_UP) | 494 | #define SOKOBAN_LEVEL_UP (BUTTON_PLAY | BUTTON_FF) |
495 | #define SOKOBAN_PAUSE BUTTON_PLAY | 495 | #define SOKOBAN_PAUSE BUTTON_PLAY |
496 | #define BUTTON_SAVE (BUTTON_PLAY|BUTTON_ENTER) | 496 | #define BUTTON_SAVE (BUTTON_ENTER | BUTTON_REL) |
497 | #define BUTTON_SAVE_NAME "PLAY+ENTER" | 497 | #define BUTTON_SAVE_NAME "ENTER" |
498 | 498 | ||
499 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 499 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
500 | #define SOKOBAN_LEFT BUTTON_LEFT | 500 | #define SOKOBAN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index a1e8b7694b..e9671dd62d 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -490,21 +490,21 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
490 | # define HK_REM2STACK "PLAY...." | 490 | # define HK_REM2STACK "PLAY...." |
491 | 491 | ||
492 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 492 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
493 | # define SOL_QUIT BUTTON_REC | 493 | # define SOL_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
494 | # define SOL_UP BUTTON_UP | 494 | # define SOL_UP BUTTON_UP |
495 | # define SOL_DOWN BUTTON_DOWN | 495 | # define SOL_DOWN BUTTON_DOWN |
496 | # define SOL_LEFT BUTTON_MENU | 496 | # define SOL_LEFT BUTTON_REW |
497 | # define SOL_RIGHT BUTTON_ENTER | 497 | # define SOL_RIGHT BUTTON_FF |
498 | # define SOL_MOVE_PRE BUTTON_REW | 498 | # define SOL_MOVE_PRE BUTTON_ENTER |
499 | # define SOL_MOVE BUTTON_FF | 499 | # define SOL_MOVE (BUTTON_ENTER | BUTTON_REL) |
500 | # define SOL_DRAW (BUTTON_ENTER | BUTTON_PLAY) | 500 | # define SOL_DRAW BUTTON_MENU |
501 | # define SOL_REM2CUR (BUTTON_MENU | BUTTON_REPEAT) | 501 | # define SOL_REM2CUR (BUTTON_PLAY | BUTTON_REL) |
502 | # define SOL_CUR2STACK BUTTON_PLAY | 502 | # define SOL_CUR2STACK BUTTON_REC |
503 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_REPEAT) | 503 | # define SOL_REM2STACK (BUTTON_PLAY | BUTTON_REPEAT) |
504 | # define HK_MOVE "FF" | 504 | # define HK_MOVE "ENTER" |
505 | # define HK_DRAW "ENTER + PLAY" | 505 | # define HK_DRAW "MENU" |
506 | # define HK_REM2CUR "EMNU.." | 506 | # define HK_REM2CUR "PLAY" |
507 | # define HK_CUR2STACK "PLAY" | 507 | # define HK_CUR2STACK "ENTER..." |
508 | # define HK_REM2STACK "PLAY...." | 508 | # define HK_REM2STACK "PLAY...." |
509 | 509 | ||
510 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 510 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 946d97d075..5be527f045 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -250,12 +250,12 @@ | |||
250 | 250 | ||
251 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) | 251 | #elif (CONFIG_KEYPAD == MPIO_HD300_PAD) |
252 | 252 | ||
253 | #define AST_PAUSE BUTTON_PLAY | 253 | #define AST_PAUSE (BUTTON_PLAY|BUTTON_REL) |
254 | #define AST_QUIT (BUTTON_REC|BUTTON_REPEAT) | 254 | #define AST_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
255 | #define AST_THRUST BUTTON_MENU | 255 | #define AST_THRUST BUTTON_REC |
256 | #define AST_HYPERSPACE (BUTTON_PLAY|BUTTON_REPEAT) | 256 | #define AST_HYPERSPACE (BUTTON_PLAY|BUTTON_REPEAT) |
257 | #define AST_LEFT BUTTON_REW | 257 | #define AST_LEFT BUTTON_UP |
258 | #define AST_RIGHT BUTTON_FF | 258 | #define AST_RIGHT BUTTON_DOWN |
259 | #define AST_FIRE BUTTON_ENTER | 259 | #define AST_FIRE BUTTON_ENTER |
260 | 260 | ||
261 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | 261 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index cf04e02edc..80170e667f 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -430,21 +430,21 @@ | |||
430 | 430 | ||
431 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 431 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
432 | 432 | ||
433 | #define STAR_QUIT (BUTTON_REC | BUTTON_REPEAT) | 433 | #define STAR_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
434 | #define STAR_LEFT BUTTON_REW | 434 | #define STAR_LEFT BUTTON_REW |
435 | #define STAR_RIGHT BUTTON_FF | 435 | #define STAR_RIGHT BUTTON_FF |
436 | #define STAR_UP BUTTON_UP | 436 | #define STAR_UP BUTTON_UP |
437 | #define STAR_DOWN BUTTON_DOWN | 437 | #define STAR_DOWN BUTTON_DOWN |
438 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_MENU | 438 | #define STAR_TOGGLE_CONTROL_PRE BUTTON_ENTER |
439 | #define STAR_TOGGLE_CONTROL (BUTTON_MENU | BUTTON_REL) | 439 | #define STAR_TOGGLE_CONTROL (BUTTON_ENTER | BUTTON_REL) |
440 | #define STAR_LEVEL_UP BUTTON_PLAY | 440 | #define STAR_LEVEL_UP (BUTTON_PLAY | BUTTON_FF) |
441 | #define STAR_LEVEL_DOWN BUTTON_REC | 441 | #define STAR_LEVEL_DOWN (BUTTON_PLAY | BUTTON_REW) |
442 | #define STAR_LEVEL_REPEAT (BUTTON_MENU | BUTTON_REPEAT) | 442 | #define STAR_LEVEL_REPEAT (BUTTON_PLAY | BUTTON_REPEAT) |
443 | #define STAR_TOGGLE_CONTROL_NAME "MENU" | 443 | #define STAR_TOGGLE_CONTROL_NAME "ENTER" |
444 | #define STAR_QUIT_NAME "REC LONG" | 444 | #define STAR_QUIT_NAME "LONG MENU" |
445 | #define STAR_LEVEL_UP_NAME "PLAY" | 445 | #define STAR_LEVEL_UP_NAME "PLAY + FF" |
446 | #define STAR_LEVEL_DOWN_NAME "REC" | 446 | #define STAR_LEVEL_DOWN_NAME "PLAY + REW" |
447 | #define STAR_LEVEL_REPEAT_NAME "MENU LONG" | 447 | #define STAR_LEVEL_REPEAT_NAME "LONG PLAY" |
448 | 448 | ||
449 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 449 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
450 | 450 | ||
diff --git a/apps/plugins/starfield.c b/apps/plugins/starfield.c index c996da9234..b410c4134a 100644 --- a/apps/plugins/starfield.c +++ b/apps/plugins/starfield.c | |||
@@ -174,7 +174,7 @@ | |||
174 | #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY | 174 | #define STARFIELD_TOGGLE_COLOR BUTTON_PLAY |
175 | 175 | ||
176 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 176 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
177 | #define STARFIELD_QUIT (BUTTON_REC|BUTTON_REPEAT) | 177 | #define STARFIELD_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
178 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP | 178 | #define STARFIELD_INCREASE_ZMOVE BUTTON_UP |
179 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN | 179 | #define STARFIELD_DECREASE_ZMOVE BUTTON_DOWN |
180 | #define STARFIELD_INCREASE_NB_STARS BUTTON_FF | 180 | #define STARFIELD_INCREASE_NB_STARS BUTTON_FF |
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c index fd33bb7c03..a676816a50 100644 --- a/apps/plugins/stopwatch.c +++ b/apps/plugins/stopwatch.c | |||
@@ -240,7 +240,7 @@ | |||
240 | #define STOPWATCH_SCROLL_DOWN BUTTON_VOL_DOWN | 240 | #define STOPWATCH_SCROLL_DOWN BUTTON_VOL_DOWN |
241 | 241 | ||
242 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 242 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
243 | #define STOPWATCH_QUIT (BUTTON_REC|BUTTON_REPEAT) | 243 | #define STOPWATCH_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
244 | #define STOPWATCH_START_STOP BUTTON_PLAY | 244 | #define STOPWATCH_START_STOP BUTTON_PLAY |
245 | #define STOPWATCH_RESET_TIMER BUTTON_REW | 245 | #define STOPWATCH_RESET_TIMER BUTTON_REW |
246 | #define STOPWATCH_LAP_TIMER BUTTON_FF | 246 | #define STOPWATCH_LAP_TIMER BUTTON_FF |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 07147185ae..655d8e36fe 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -292,21 +292,23 @@ | |||
292 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 292 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
293 | 293 | ||
294 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 294 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
295 | #define SUDOKU_BUTTON_QUIT (BUTTON_REC | BUTTON_PLAY) | ||
295 | #define SUDOKU_BUTTON_MENU BUTTON_REC | 296 | #define SUDOKU_BUTTON_MENU BUTTON_REC |
297 | #define SUDOKU_BUTTON_UP BUTTON_FF | ||
298 | #define SUDOKU_BUTTON_DOWN BUTTON_REW | ||
296 | #define SUDOKU_BUTTON_LEFT BUTTON_VOL_DOWN | 299 | #define SUDOKU_BUTTON_LEFT BUTTON_VOL_DOWN |
297 | #define SUDOKU_BUTTON_RIGHT BUTTON_VOL_UP | 300 | #define SUDOKU_BUTTON_RIGHT BUTTON_VOL_UP |
298 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_FUNC | 301 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FUNC |
299 | #define SUDOKU_BUTTON_TOGGLE BUTTON_FF | ||
300 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_REW | ||
301 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 302 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
302 | 303 | ||
303 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 304 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
304 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 305 | #define SUDOKU_BUTTON_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
306 | #define SUDOKU_BUTTON_MENU (BUTTON_MENU | BUTTON_REL) | ||
307 | #define SUDOKU_BUTTON_UP BUTTON_UP | ||
308 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | ||
305 | #define SUDOKU_BUTTON_LEFT BUTTON_REW | 309 | #define SUDOKU_BUTTON_LEFT BUTTON_REW |
306 | #define SUDOKU_BUTTON_RIGHT BUTTON_FF | 310 | #define SUDOKU_BUTTON_RIGHT BUTTON_FF |
307 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_ENTER | 311 | #define SUDOKU_BUTTON_TOGGLE BUTTON_ENTER |
308 | #define SUDOKU_BUTTON_TOGGLE BUTTON_UP | ||
309 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN | ||
310 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 312 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
311 | 313 | ||
312 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 314 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
diff --git a/apps/plugins/text_viewer/tv_button.h b/apps/plugins/text_viewer/tv_button.h index d81bed3a40..e8526e78b5 100644 --- a/apps/plugins/text_viewer/tv_button.h +++ b/apps/plugins/text_viewer/tv_button.h | |||
@@ -394,8 +394,8 @@ | |||
394 | /* MPIO HD200 keys */ | 394 | /* MPIO HD200 keys */ |
395 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 395 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
396 | #define TV_QUIT (BUTTON_REC | BUTTON_PLAY) | 396 | #define TV_QUIT (BUTTON_REC | BUTTON_PLAY) |
397 | #define TV_SCROLL_UP BUTTON_REW | 397 | #define TV_SCROLL_UP BUTTON_REW |
398 | #define TV_SCROLL_DOWN BUTTON_FF | 398 | #define TV_SCROLL_DOWN BUTTON_FF |
399 | #define TV_SCREEN_LEFT BUTTON_VOL_DOWN | 399 | #define TV_SCREEN_LEFT BUTTON_VOL_DOWN |
400 | #define TV_SCREEN_RIGHT BUTTON_VOL_UP | 400 | #define TV_SCREEN_RIGHT BUTTON_VOL_UP |
401 | #define TV_MENU BUTTON_FUNC | 401 | #define TV_MENU BUTTON_FUNC |
@@ -404,14 +404,16 @@ | |||
404 | 404 | ||
405 | /* MPIO HD300 keys */ | 405 | /* MPIO HD300 keys */ |
406 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 406 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
407 | #define TV_QUIT BUTTON_REC | 407 | #define TV_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
408 | #define TV_SCROLL_UP BUTTON_UP | 408 | #define TV_SCROLL_UP BUTTON_REW |
409 | #define TV_SCROLL_DOWN BUTTON_DOWN | 409 | #define TV_SCROLL_DOWN BUTTON_FF |
410 | #define TV_SCREEN_LEFT BUTTON_REW | 410 | #define TV_LINE_UP BUTTON_UP |
411 | #define TV_SCREEN_RIGHT BUTTON_FF | 411 | #define TV_LINE_DOWN BUTTON_DOWN |
412 | #define TV_MENU (BUTTON_MENU | BUTTON_REPEAT) | 412 | #define TV_SCREEN_LEFT (BUTTON_REW | BUTTON_PLAY) |
413 | #define TV_AUTOSCROLL BUTTON_ENTER | 413 | #define TV_SCREEN_RIGHT (BUTTON_FF | BUTTON_PLAY) |
414 | #define TV_BOOKMARK BUTTON_PLAY | 414 | #define TV_MENU (BUTTON_MENU | BUTTON_REL) |
415 | #define TV_AUTOSCROLL BUTTON_REC | ||
416 | #define TV_BOOKMARK BUTTON_ENTER | ||
415 | 417 | ||
416 | /* Sansa Fuze+ keys */ | 418 | /* Sansa Fuze+ keys */ |
417 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 419 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c index 7ca7b43726..a1c96707a1 100644 --- a/apps/plugins/vu_meter.c +++ b/apps/plugins/vu_meter.c | |||
@@ -301,18 +301,18 @@ | |||
301 | #define VUMETER_UP BUTTON_VOL_UP | 301 | #define VUMETER_UP BUTTON_VOL_UP |
302 | #define VUMETER_DOWN BUTTON_VOL_DOWN | 302 | #define VUMETER_DOWN BUTTON_VOL_DOWN |
303 | #define LABEL_HELP "PLAY" | 303 | #define LABEL_HELP "PLAY" |
304 | #define LABEL_QUIT "MENU" | 304 | #define LABEL_QUIT "REC+PLAY" |
305 | #define LABEL_MENU "FUNC" | 305 | #define LABEL_MENU "FUNC" |
306 | #define LABEL_VOLUME "UP/DOWN" | 306 | #define LABEL_VOLUME "UP/DOWN" |
307 | 307 | ||
308 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 308 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
309 | #define VUMETER_QUIT (BUTTON_REC|BUTTON_REPEAT) | 309 | #define VUMETER_QUIT (BUTTON_MENU|BUTTON_REPEAT) |
310 | #define VUMETER_HELP BUTTON_PLAY | 310 | #define VUMETER_HELP BUTTON_PLAY |
311 | #define VUMETER_MENU BUTTON_MENU | 311 | #define VUMETER_MENU BUTTON_MENU |
312 | #define VUMETER_UP BUTTON_UP | 312 | #define VUMETER_UP BUTTON_UP |
313 | #define VUMETER_DOWN BUTTON_DOWN | 313 | #define VUMETER_DOWN BUTTON_DOWN |
314 | #define LABEL_HELP "PLAY" | 314 | #define LABEL_HELP "PLAY" |
315 | #define LABEL_QUIT "REC..." | 315 | #define LABEL_QUIT "LONG MENU" |
316 | #define LABEL_MENU "MENU" | 316 | #define LABEL_MENU "MENU" |
317 | #define LABEL_VOLUME "UP/DOWN" | 317 | #define LABEL_VOLUME "UP/DOWN" |
318 | 318 | ||
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c index f1834aade5..28f854ba69 100644 --- a/apps/plugins/wormlet.c +++ b/apps/plugins/wormlet.c | |||
@@ -283,10 +283,10 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
283 | 283 | ||
284 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 284 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
285 | 285 | ||
286 | #define BTN_DIR_UP BUTTON_REC | 286 | #define BTN_DIR_UP BUTTON_REW |
287 | #define BTN_DIR_DOWN BUTTON_PLAY | 287 | #define BTN_DIR_DOWN BUTTON_FF |
288 | #define BTN_DIR_LEFT BUTTON_REW | 288 | #define BTN_DIR_LEFT BUTTON_VOL_DOWN |
289 | #define BTN_DIR_RIGHT BUTTON_FF | 289 | #define BTN_DIR_RIGHT BUTTON_VOL_UP |
290 | #define BTN_STARTPAUSE BUTTON_FUNC | 290 | #define BTN_STARTPAUSE BUTTON_FUNC |
291 | #define BTN_QUIT (BUTTON_REC|BUTTON_PLAY) | 291 | #define BTN_QUIT (BUTTON_REC|BUTTON_PLAY) |
292 | #define BTN_STOPRESET (BUTTON_FUNC|BUTTON_REPEAT) | 292 | #define BTN_STOPRESET (BUTTON_FUNC|BUTTON_REPEAT) |
@@ -295,11 +295,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
295 | 295 | ||
296 | #define BTN_DIR_UP BUTTON_UP | 296 | #define BTN_DIR_UP BUTTON_UP |
297 | #define BTN_DIR_DOWN BUTTON_DOWN | 297 | #define BTN_DIR_DOWN BUTTON_DOWN |
298 | #define BTN_DIR_LEFT BUTTON_MENU | 298 | #define BTN_DIR_LEFT BUTTON_REW |
299 | #define BTN_DIR_RIGHT BUTTON_ENTER | 299 | #define BTN_DIR_RIGHT BUTTON_FF |
300 | #define BTN_STARTPAUSE BUTTON_PLAY | 300 | #define BTN_STARTPAUSE BUTTON_PLAY |
301 | #define BTN_QUIT BUTTON_REC | 301 | #define BTN_QUIT (BUTTON_MENU | BUTTON_REPEAT) |
302 | #define BTN_STOPRESET (BUTTON_MENU | BUTTON_REPEAT) | 302 | #define BTN_STOPRESET (BUTTON_PLAY | BUTTON_REPEAT) |
303 | 303 | ||
304 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 304 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
305 | 305 | ||
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c index 30fd5fde13..344e3d60a8 100644 --- a/apps/plugins/xobox.c +++ b/apps/plugins/xobox.c | |||
@@ -252,9 +252,9 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
252 | 252 | ||
253 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 253 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
254 | 254 | ||
255 | #define QUIT BUTTON_REC | 255 | #define QUIT (BUTTON_MENU | BUTTON_REPEAT) |
256 | #define LEFT BUTTON_MENU | 256 | #define LEFT BUTTON_REW |
257 | #define RIGHT BUTTON_ENTER | 257 | #define RIGHT BUTTON_FF |
258 | #define UP BUTTON_UP | 258 | #define UP BUTTON_UP |
259 | #define DOWN BUTTON_DOWN | 259 | #define DOWN BUTTON_DOWN |
260 | #define PAUSE BUTTON_PLAY | 260 | #define PAUSE BUTTON_PLAY |
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index 831c6d8e69..9075ae7bbb 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h | |||
@@ -211,7 +211,7 @@ | |||
211 | 211 | ||
212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 212 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
213 | 213 | ||
214 | #define ZX_MENU (BUTTON_REC|BUTTON_REPEAT) | 214 | #define ZX_MENU (BUTTON_MENU|BUTTON_REPEAT) |
215 | #define ZX_UP BUTTON_UP | 215 | #define ZX_UP BUTTON_UP |
216 | #define ZX_DOWN BUTTON_DOWN | 216 | #define ZX_DOWN BUTTON_DOWN |
217 | #define ZX_SELECT BUTTON_ENTER | 217 | #define ZX_SELECT BUTTON_ENTER |