devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Commit FS#9607 by Adam Hogan: fix plugin keymaps for Creative Zen Vision:M

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19363 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Maurus Cuelenaere 2008-12-08 09:51:42 +00:00
parent 66459fee3d
commit 6471b3c81a
41 changed files with 85 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/plugins/blackjack.c
View file

@ -275,10 +275,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define BJACK_START BUTTON_SELECT #define BJACK_START BUTTON_SELECT
#define BJACK_QUIT BUTTON_BACK #define BJACK_QUIT BUTTON_BACK
#define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) #define BJACK_MAX (BUTTON_CUSTOM|BUTTON_UP)
#define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) #define BJACK_MIN (BUTTON_CUSTOM|BUTTON_DOWN)
#define BJACK_HIT BUTTON_LEFT #define BJACK_HIT BUTTON_UP
#define BJACK_STAY BUTTON_RIGHT #define BJACK_STAY BUTTON_DOWN
#define BJACK_DOUBLEDOWN BUTTON_CUSTOM #define BJACK_DOUBLEDOWN BUTTON_CUSTOM
#define BJACK_SCORES BUTTON_RIGHT #define BJACK_SCORES BUTTON_RIGHT
#define BJACK_RESUME BUTTON_MENU #define BJACK_RESUME BUTTON_MENU

1
apps/plugins/chessbox/chessbox_pgn.h
View file

@ -295,7 +295,6 @@
#define CB_LEVEL BUTTON_CUSTOM #define CB_LEVEL BUTTON_CUSTOM
#define CB_MENU BUTTON_MENU #define CB_MENU BUTTON_MENU
#else #else
#error No keymap defined! #error No keymap defined!
#endif #endif

4
apps/plugins/chessclock.c
View file

@ -204,12 +204,12 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define CHC_QUIT BUTTON_BACK #define CHC_QUIT BUTTON_BACK
#define CHC_STARTSTOP BUTTON_SELECT #define CHC_STARTSTOP BUTTON_PLAY
#define CHC_RESET BUTTON_CUSTOM #define CHC_RESET BUTTON_CUSTOM
#define CHC_MENU BUTTON_MENU #define CHC_MENU BUTTON_MENU
#define CHC_SETTINGS_INC BUTTON_UP #define CHC_SETTINGS_INC BUTTON_UP
#define CHC_SETTINGS_DEC BUTTON_DOWN #define CHC_SETTINGS_DEC BUTTON_DOWN
#define CHC_SETTINGS_OK BUTTON_PLAY #define CHC_SETTINGS_OK BUTTON_SELECT
#define CHC_SETTINGS_CANCEL BUTTON_BACK #define CHC_SETTINGS_CANCEL BUTTON_BACK
#else #else

8
apps/plugins/chip8.c
View file

@ -1083,16 +1083,14 @@ STATIC void chip8 (void)
#define CHIP8_OFF BUTTON_POWER #define CHIP8_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define CHIP8_OFF BUTTON_POWER #define CHIP8_OFF BUTTON_BACK
#define CHIP8_KEY1 BUTTON_MENU #define CHIP8_KEY1 BUTTON_MENU
#define CHIP8_KEY2 BUTTON_UP #define CHIP8_KEY2 BUTTON_UP
#define CHIP8_KEY3 BUTTON_BACK #define CHIP8_KEY3 BUTTON_CUSTOM
#define CHIP8_KEY4 BUTTON_LEFT #define CHIP8_KEY4 BUTTON_LEFT
#define CHIP8_KEY5 BUTTON_SELECT #define CHIP8_KEY5 BUTTON_PLAY
#define CHIP8_KEY6 BUTTON_RIGHT #define CHIP8_KEY6 BUTTON_RIGHT
#define CHIP8_KEY7 BUTTON_CUSTOM
#define CHIP8_KEY8 BUTTON_DOWN #define CHIP8_KEY8 BUTTON_DOWN
#define CHIP8_KEY9 BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

10
apps/plugins/doom/i_video.c
View file

@ -282,12 +282,12 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_DOWN BUTTON_DOWN #define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT #define DOOMBUTTON_LEFT BUTTON_LEFT
#define DOOMBUTTON_RIGHT BUTTON_RIGHT #define DOOMBUTTON_RIGHT BUTTON_RIGHT
#define DOOMBUTTON_SHOOT BUTTON_PLAY #define DOOMBUTTON_SHOOT BUTTON_SELECT
#define DOOMBUTTON_OPEN BUTTON_SELECT #define DOOMBUTTON_OPEN BUTTON_PLAY
#define DOOMBUTTON_ESC BUTTON_POWER #define DOOMBUTTON_ESC BUTTON_BACK
#define DOOMBUTTON_ENTER BUTTON_CUSTOM #define DOOMBUTTON_ENTER BUTTON_PLAY
#define DOOMBUTTON_WEAPON BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_MENU
#define DOOMBUTTON_MAP BUTTON_BACK #define DOOMBUTTON_MAP BUTTON_CUSTOM
#else #else
#error Keymap not defined! #error Keymap not defined!
#endif #endif

2
apps/plugins/fireworks.c
View file

@ -78,7 +78,7 @@ static const struct plugin_api* rb;
#define BTN_FIRE BUTTON_PLAY #define BTN_FIRE BUTTON_PLAY
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define BTN_MENU BUTTON_MENU #define BTN_MENU BUTTON_MENU
#define BTN_FIRE BUTTON_PLAY #define BTN_FIRE BUTTON_SELECT
#else #else
#error No keymap defined! #error No keymap defined!
#endif #endif

4
apps/plugins/flipit.c
View file

@ -232,9 +232,9 @@ PLUGIN_HEADER
#define FLIPIT_DOWN BUTTON_DOWN #define FLIPIT_DOWN BUTTON_DOWN
#define FLIPIT_QUIT BUTTON_BACK #define FLIPIT_QUIT BUTTON_BACK
#define FLIPIT_SHUFFLE BUTTON_CUSTOM #define FLIPIT_SHUFFLE BUTTON_CUSTOM
#define FLIPIT_SOLVE BUTTON_SELECT #define FLIPIT_SOLVE BUTTON_PLAY
#define FLIPIT_STEP_BY_STEP BUTTON_MENU #define FLIPIT_STEP_BY_STEP BUTTON_MENU
#define FLIPIT_TOGGLE BUTTON_PLAY #define FLIPIT_TOGGLE BUTTON_SELECT
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/invadrox.c
View file

@ -132,7 +132,7 @@ PLUGIN_HEADER
#define QUIT BUTTON_BACK #define QUIT BUTTON_BACK
#define LEFT BUTTON_LEFT #define LEFT BUTTON_LEFT
#define RIGHT BUTTON_RIGHT #define RIGHT BUTTON_RIGHT
#define FIRE BUTTON_PLAY #define FIRE BUTTON_SELECT
#else #else
#error INVADROX: Unsupported keypad #error INVADROX: Unsupported keypad

12
apps/plugins/jewels.c
View file

@ -1612,7 +1612,7 @@ static int jewels_main(struct game_context* bj) {
rb->lcd_puts(0, 12, "REC to cancel"); rb->lcd_puts(0, 12, "REC to cancel");
#elif CONFIG_KEYPAD == COWOND2_PAD #elif CONFIG_KEYPAD == COWOND2_PAD
rb->lcd_puts(0, 11, "POWER to cancel"); rb->lcd_puts(0, 11, "POWER to cancel");
#elif CONFIG_KEYPAD == GIGABEAT_S_PAD || CREATIVEZVM_PAD #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
rb->lcd_puts(0, 2, "Swap pairs of jewels to"); rb->lcd_puts(0, 2, "Swap pairs of jewels to");
rb->lcd_puts(0, 3, "form connected segments"); rb->lcd_puts(0, 3, "form connected segments");
rb->lcd_puts(0, 4, "of three or more of the"); rb->lcd_puts(0, 4, "of three or more of the");
@ -1622,6 +1622,16 @@ static int jewels_main(struct game_context* bj) {
rb->lcd_puts(0, 9, "SELECT to select"); rb->lcd_puts(0, 9, "SELECT to select");
rb->lcd_puts(0, 10, "Long SELECT to show menu"); rb->lcd_puts(0, 10, "Long SELECT to show menu");
rb->lcd_puts(0, 11, "BACK to cancel"); rb->lcd_puts(0, 11, "BACK to cancel");
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
rb->lcd_puts(0, 2, "Swap pairs of jewels to");
rb->lcd_puts(0, 3, "form connected segments");
rb->lcd_puts(0, 4, "of three or more of the");
rb->lcd_puts(0, 5, "same type.");
rb->lcd_puts(0, 7, "Controls:");
rb->lcd_puts(0, 8, "Directions to move");
rb->lcd_puts(0, 9, "MIDDLE to select");
rb->lcd_puts(0, 10, "Long MIDDLE to show menu");
rb->lcd_puts(0, 11, "BACK to cancel");
#else #else
#warning: missing help text. #warning: missing help text.
#endif #endif

4
apps/plugins/jpeg/jpeg.h
View file

@ -236,13 +236,13 @@
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define JPEG_ZOOM_IN BUTTON_PLAY #define JPEG_ZOOM_IN BUTTON_PLAY
#define JPEG_ZOOM_OUT BUTTON_SELECT #define JPEG_ZOOM_OUT BUTTON_CUSTOM
#define JPEG_UP BUTTON_UP #define JPEG_UP BUTTON_UP
#define JPEG_DOWN BUTTON_DOWN #define JPEG_DOWN BUTTON_DOWN
#define JPEG_LEFT BUTTON_LEFT #define JPEG_LEFT BUTTON_LEFT
#define JPEG_RIGHT BUTTON_RIGHT #define JPEG_RIGHT BUTTON_RIGHT
#define JPEG_MENU BUTTON_MENU #define JPEG_MENU BUTTON_MENU
#define JPEG_NEXT BUTTON_CUSTOM #define JPEG_NEXT BUTTON_SELECT
#define JPEG_PREVIOUS BUTTON_BACK #define JPEG_PREVIOUS BUTTON_BACK
#else #else

8
apps/plugins/lib/pluginlib_actions.c
View file

@ -281,8 +281,8 @@ const struct button_mapping generic_left_right_fire[] =
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{ PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#else #else
#error pluginlib_actions: Unsupported keypad #error pluginlib_actions: Unsupported keypad
#endif #endif
@ -427,8 +427,8 @@ const struct button_mapping generic_actions[] =
{PLA_QUIT, BUTTON_BACK, BUTTON_NONE}, {PLA_QUIT, BUTTON_BACK, BUTTON_NONE},
{PLA_START, BUTTON_PLAY, BUTTON_NONE}, {PLA_START, BUTTON_PLAY, BUTTON_NONE},
{PLA_MENU, BUTTON_MENU, BUTTON_NONE}, {PLA_MENU, BUTTON_MENU, BUTTON_NONE},
{PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
{PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#else #else
#error pluginlib_actions: Unsupported keypad #error pluginlib_actions: Unsupported keypad
#endif #endif

10
apps/plugins/mandelbrot.c
View file

@ -236,16 +236,16 @@ PLUGIN_HEADER
#define MANDELBROT_QUIT BUTTON_POWER #define MANDELBROT_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MANDELBROT_QUIT BUTTON_POWER #define MANDELBROT_QUIT BUTTON_BACK
#define MANDELBROT_UP BUTTON_UP #define MANDELBROT_UP BUTTON_UP
#define MANDELBROT_DOWN BUTTON_DOWN #define MANDELBROT_DOWN BUTTON_DOWN
#define MANDELBROT_LEFT BUTTON_LEFT #define MANDELBROT_LEFT BUTTON_LEFT
#define MANDELBROT_RIGHT BUTTON_RIGHT #define MANDELBROT_RIGHT BUTTON_RIGHT
#define MANDELBROT_ZOOM_IN BUTTON_SELECT #define MANDELBROT_ZOOM_IN BUTTON_PLAY
#define MANDELBROT_ZOOM_OUT BUTTON_MENU #define MANDELBROT_ZOOM_OUT BUTTON_MENU
#define MANDELBROT_MAXITER_INC BUTTON_CUSTOM #define MANDELBROT_MAXITER_INC (BUTTON_UP | BUTTON_CUSTOM)
#define MANDELBROT_MAXITER_DEC BUTTON_BACK #define MANDELBROT_MAXITER_DEC (BUTTON_DOWN | BUTTON_CUSTOM)
#define MANDELBROT_RESET BUTTON_PLAY #define MANDELBROT_RESET BUTTON_SELECT
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/midi/midiplay.c
View file

@ -163,7 +163,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT #define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_UP #define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN #define BTN_DOWN BUTTON_DOWN
#define BTN_PLAY BUTTON_SELECT #define BTN_PLAY BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

4
apps/plugins/minesweeper.c
View file

@ -194,8 +194,8 @@ enum minesweeper_status {
# define MINESWP_UP BUTTON_UP # define MINESWP_UP BUTTON_UP
# define MINESWP_DOWN BUTTON_DOWN # define MINESWP_DOWN BUTTON_DOWN
# define MINESWP_QUIT BUTTON_BACK # define MINESWP_QUIT BUTTON_BACK
# define MINESWP_TOGGLE BUTTON_PLAY # define MINESWP_TOGGLE BUTTON_SELECT
# define MINESWP_DISCOVER BUTTON_SELECT # define MINESWP_DISCOVER BUTTON_PLAY
# define MINESWP_INFO BUTTON_MENU # define MINESWP_INFO BUTTON_MENU
#else #else

4
apps/plugins/mosaique.c
View file

@ -134,8 +134,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MOSAIQUE_QUIT BUTTON_BACK #define MOSAIQUE_QUIT BUTTON_BACK
#define MOSAIQUE_SPEED BUTTON_MENU #define MOSAIQUE_SPEED BUTTON_SELECT
#define MOSAIQUE_RESTART BUTTON_SELECT #define MOSAIQUE_RESTART BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/mp3_encoder.c
View file

@ -2466,7 +2466,7 @@ void get_mp3_filename(const char *wav_name)
#define MP3ENC_PREV BUTTON_UP #define MP3ENC_PREV BUTTON_UP
#define MP3ENC_NEXT BUTTON_DOWN #define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_BACK #define MP3ENC_DONE BUTTON_BACK
#define MP3ENC_SELECT BUTTON_PLAY #define MP3ENC_SELECT BUTTON_SELECT
#else #else
#error No keymap defined! #error No keymap defined!
#endif #endif

4
apps/plugins/mpegplayer/mpeg_settings.c
View file

@ -133,8 +133,8 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_EXIT BUTTON_POWER #define MPEG_START_TIME_EXIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MPEG_START_TIME_SELECT BUTTON_PLAY #define MPEG_START_TIME_SELECT BUTTON_SELECT
#define MPEG_START_TIME_SCROLL_UP BUTTON_SELECT #define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY
#define MPEG_START_TIME_SCROLL_DOWN BUTTON_MENU #define MPEG_START_TIME_SCROLL_DOWN BUTTON_MENU
#define MPEG_START_TIME_LEFT BUTTON_LEFT #define MPEG_START_TIME_LEFT BUTTON_LEFT
#define MPEG_START_TIME_RIGHT BUTTON_RIGHT #define MPEG_START_TIME_RIGHT BUTTON_RIGHT

2
apps/plugins/mpegplayer/mpegplayer.c
View file

@ -243,7 +243,7 @@ PLUGIN_IRAM_DECLARE
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MPEG_MENU BUTTON_MENU #define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_BACK #define MPEG_STOP BUTTON_BACK
#define MPEG_PAUSE BUTTON_SELECT #define MPEG_PAUSE BUTTON_PLAY
#define MPEG_VOLDOWN BUTTON_UP #define MPEG_VOLDOWN BUTTON_UP
#define MPEG_VOLUP BUTTON_DOWN #define MPEG_VOLUP BUTTON_DOWN
#define MPEG_RW BUTTON_LEFT #define MPEG_RW BUTTON_LEFT

4
apps/plugins/oscilloscope.c
View file

@ -201,10 +201,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define OSCILLOSCOPE_QUIT BUTTON_BACK #define OSCILLOSCOPE_QUIT BUTTON_BACK
#define OSCILLOSCOPE_DRAWMODE BUTTON_PLAY #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT
#define OSCILLOSCOPE_ADVMODE BUTTON_CUSTOM #define OSCILLOSCOPE_ADVMODE BUTTON_CUSTOM
#define OSCILLOSCOPE_ORIENTATION BUTTON_MENU #define OSCILLOSCOPE_ORIENTATION BUTTON_MENU
#define OSCILLOSCOPE_PAUSE BUTTON_SELECT #define OSCILLOSCOPE_PAUSE BUTTON_PLAY
#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
#define OSCILLOSCOPE_VOL_UP BUTTON_UP #define OSCILLOSCOPE_VOL_UP BUTTON_UP

4
apps/plugins/pacbox/pacbox.h
View file

@ -166,8 +166,8 @@
#define PACMAN_LEFT BUTTON_LEFT #define PACMAN_LEFT BUTTON_LEFT
#define PACMAN_RIGHT BUTTON_RIGHT #define PACMAN_RIGHT BUTTON_RIGHT
#define PACMAN_1UP BUTTON_CUSTOM #define PACMAN_1UP BUTTON_CUSTOM
#define PACMAN_2UP BUTTON_SELECT #define PACMAN_2UP BUTTON_PLAY
#define PACMAN_COIN BUTTON_PLAY #define PACMAN_COIN BUTTON_SELECT
#define PACMAN_MENU BUTTON_MENU #define PACMAN_MENU BUTTON_MENU
#else #else

4
apps/plugins/pegbox.c
View file

@ -304,8 +304,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define PEGBOX_SAVE BUTTON_CUSTOM #define PEGBOX_SAVE BUTTON_CUSTOM
#define PEGBOX_QUIT BUTTON_BACK #define PEGBOX_QUIT BUTTON_BACK
#define PEGBOX_RESTART BUTTON_PLAY #define PEGBOX_RESTART BUTTON_SELECT
#define PEGBOX_LVL_UP BUTTON_SELECT #define PEGBOX_LVL_UP BUTTON_PLAY
#define PEGBOX_LVL_DOWN BUTTON_MENU #define PEGBOX_LVL_DOWN BUTTON_MENU
#define PEGBOX_UP BUTTON_UP #define PEGBOX_UP BUTTON_UP
#define PEGBOX_DOWN BUTTON_DOWN #define PEGBOX_DOWN BUTTON_DOWN

2
apps/plugins/plasma.c
View file

@ -113,7 +113,7 @@ static int plasma_frequency;
#define PLASMA_QUIT BUTTON_BACK #define PLASMA_QUIT BUTTON_BACK
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP #define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
#define PLASMA_REGEN_COLORS BUTTON_PLAY #define PLASMA_REGEN_COLORS BUTTON_SELECT
#endif #endif

2
apps/plugins/pong.c
View file

@ -163,7 +163,7 @@ PLUGIN_HEADER
#define PONG_QUIT BUTTON_BACK #define PONG_QUIT BUTTON_BACK
#define PONG_LEFT_UP BUTTON_UP #define PONG_LEFT_UP BUTTON_UP
#define PONG_LEFT_DOWN BUTTON_DOWN #define PONG_LEFT_DOWN BUTTON_DOWN
#define PONG_RIGHT_UP BUTTON_SELECT #define PONG_RIGHT_UP BUTTON_PLAY
#define PONG_RIGHT_DOWN BUTTON_MENU #define PONG_RIGHT_DOWN BUTTON_MENU
#else #else

2
apps/plugins/reversi/reversi-gui.h
View file

@ -162,7 +162,7 @@
#define REVERSI_BUTTON_DOWN BUTTON_DOWN #define REVERSI_BUTTON_DOWN BUTTON_DOWN
#define REVERSI_BUTTON_LEFT BUTTON_LEFT #define REVERSI_BUTTON_LEFT BUTTON_LEFT
#define REVERSI_BUTTON_RIGHT BUTTON_RIGHT #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT
#define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT
#define REVERSI_BUTTON_MENU BUTTON_MENU #define REVERSI_BUTTON_MENU BUTTON_MENU
#else #else

4
apps/plugins/rockblox.c
View file

@ -243,11 +243,11 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ROCKBLOX_OFF BUTTON_BACK #define ROCKBLOX_OFF BUTTON_BACK
#define ROCKBLOX_ROTATE_RIGHT BUTTON_UP #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP
#define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT #define ROCKBLOX_ROTATE_LEFT BUTTON_PLAY
#define ROCKBLOX_DOWN BUTTON_DOWN #define ROCKBLOX_DOWN BUTTON_DOWN
#define ROCKBLOX_LEFT BUTTON_LEFT #define ROCKBLOX_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT #define ROCKBLOX_RIGHT BUTTON_RIGHT
#define ROCKBLOX_DROP BUTTON_PLAY #define ROCKBLOX_DROP BUTTON_SELECT
#define ROCKBLOX_RESTART BUTTON_CUSTOM #define ROCKBLOX_RESTART BUTTON_CUSTOM
#else #else

2
apps/plugins/rockblox1d.c
View file

@ -87,7 +87,7 @@ CONFIG_KEYPAD == SANSA_CLIP_PAD
#define ONEDROCKBLOX_QUIT BUTTON_POWER #define ONEDROCKBLOX_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ONEDROCKBLOX_DOWN BUTTON_PLAY #define ONEDROCKBLOX_DOWN BUTTON_SELECT
#define ONEDROCKBLOX_QUIT BUTTON_BACK #define ONEDROCKBLOX_QUIT BUTTON_BACK
#else #else

4
apps/plugins/rockboy/rockboy.c
View file

@ -225,9 +225,9 @@ static void setoptions (void)
options.DOWN=BUTTON_DOWN; options.DOWN=BUTTON_DOWN;
options.A=BUTTON_CUSTOM; options.A=BUTTON_CUSTOM;
options.B=BUTTON_SELECT; options.B=BUTTON_PLAY;
options.START=BUTTON_BACK; options.START=BUTTON_BACK;
options.SELECT=BUTTON_PLAY; options.SELECT=BUTTON_SELECT;
options.MENU=BUTTON_MENU; options.MENU=BUTTON_MENU;
#else #else
#error No Keymap Defined! #error No Keymap Defined!

6
apps/plugins/rockpaint.c
View file

@ -123,10 +123,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ROCKPAINT_QUIT BUTTON_BACK #define ROCKPAINT_QUIT BUTTON_BACK
#define ROCKPAINT_DRAW BUTTON_PLAY #define ROCKPAINT_DRAW BUTTON_SELECT
#define ROCKPAINT_MENU BUTTON_MENU #define ROCKPAINT_MENU BUTTON_MENU
#define ROCKPAINT_TOOLBAR BUTTON_SELECT #define ROCKPAINT_TOOLBAR BUTTON_PLAY
#define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_LEFT ) #define ROCKPAINT_TOOLBAR2 ( BUTTON_PLAY | BUTTON_LEFT )
#define ROCKPAINT_UP BUTTON_UP #define ROCKPAINT_UP BUTTON_UP
#define ROCKPAINT_DOWN BUTTON_DOWN #define ROCKPAINT_DOWN BUTTON_DOWN
#define ROCKPAINT_LEFT BUTTON_LEFT #define ROCKPAINT_LEFT BUTTON_LEFT

2
apps/plugins/sliding_puzzle.c
View file

@ -159,7 +159,7 @@ PLUGIN_HEADER
#define PUZZLE_RIGHT BUTTON_RIGHT #define PUZZLE_RIGHT BUTTON_RIGHT
#define PUZZLE_UP BUTTON_UP #define PUZZLE_UP BUTTON_UP
#define PUZZLE_DOWN BUTTON_DOWN #define PUZZLE_DOWN BUTTON_DOWN
#define PUZZLE_SHUFFLE BUTTON_SELECT #define PUZZLE_SHUFFLE BUTTON_PLAY
#define PUZZLE_PICTURE BUTTON_MENU #define PUZZLE_PICTURE BUTTON_MENU
#else #else

2
apps/plugins/snake.c
View file

@ -152,7 +152,7 @@ PLUGIN_HEADER
#define SNAKE_RIGHT BUTTON_RIGHT #define SNAKE_RIGHT BUTTON_RIGHT
#define SNAKE_UP BUTTON_UP #define SNAKE_UP BUTTON_UP
#define SNAKE_DOWN BUTTON_DOWN #define SNAKE_DOWN BUTTON_DOWN
#define SNAKE_PLAYPAUSE BUTTON_SELECT #define SNAKE_PLAYPAUSE BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/snake2.c
View file

@ -318,7 +318,7 @@ PLUGIN_HEADER
#define SNAKE2_MAZE_NEXT BUTTON_RIGHT #define SNAKE2_MAZE_NEXT BUTTON_RIGHT
#define SNAKE2_MAZE_LAST BUTTON_LEFT #define SNAKE2_MAZE_LAST BUTTON_LEFT
#define SNAKE2_SELECT_TYPE BUTTON_MENU #define SNAKE2_SELECT_TYPE BUTTON_MENU
#define SNAKE2_PLAYPAUSE BUTTON_SELECT #define SNAKE2_PLAYPAUSE BUTTON_PLAY
#define SNAKE2_PLAYPAUSE_TEXT "Play" #define SNAKE2_PLAYPAUSE_TEXT "Play"
#else #else

2
apps/plugins/solitaire.c
View file

@ -334,7 +334,7 @@ static const struct plugin_api* rb;
# define SOL_REM2CUR (BUTTON_LEFT | BUTTON_SELECT) # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_SELECT)
# define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT)
# define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_SELECT) # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_SELECT)
# define HK_MOVE "PLAY" # define HK_MOVE "MIDDLE"
# define HK_DRAW "MENU" # define HK_DRAW "MENU"
# define HK_REM2CUR "PLAY+LEFT" # define HK_REM2CUR "PLAY+LEFT"
# define HK_CUR2STACK "PLAY.." # define HK_CUR2STACK "PLAY.."

10
apps/plugins/spacerocks.c
View file

@ -217,17 +217,17 @@ static const struct plugin_api* rb; /* global api struct pointer */
#define AST_QUIT BUTTON_POWER #define AST_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define AST_PAUSE BUTTON_SELECT #define AST_PAUSE BUTTON_PLAY
#define AST_QUIT BUTTON_BACK #define AST_QUIT BUTTON_BACK
#define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT)
#define AST_THRUST BUTTON_UP #define AST_THRUST BUTTON_UP
#define AST_HYPERSPACE BUTTON_DOWN #define AST_HYPERSPACE BUTTON_DOWN
#define AST_LEFT BUTTON_LEFT #define AST_LEFT BUTTON_LEFT
#define AST_LEFT_REP BUTTON_LEFT | BUTTON_REPEAT #define AST_LEFT_REP (BUTTON_LEFT | BUTTON_REPEAT)
#define AST_RIGHT BUTTON_RIGHT #define AST_RIGHT BUTTON_RIGHT
#define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT) #define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT)
#define AST_FIRE BUTTON_PLAY #define AST_FIRE BUTTON_SELECT
#define AST_FIRE_REP BUTTON_PLAY | BUTTON_REPEAT #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)
#else #else
#error No keymap defined! #error No keymap defined!

4
apps/plugins/stopwatch.c
View file

@ -161,8 +161,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define STOPWATCH_QUIT BUTTON_BACK #define STOPWATCH_QUIT BUTTON_BACK
#define STOPWATCH_START_STOP BUTTON_PLAY #define STOPWATCH_START_STOP BUTTON_PLAY
#define STOPWATCH_RESET_TIMER BUTTON_CUSTOM #define STOPWATCH_RESET_TIMER BUTTON_SELECT
#define STOPWATCH_LAP_TIMER BUTTON_SELECT #define STOPWATCH_LAP_TIMER BUTTON_CUSTOM
#define STOPWATCH_SCROLL_UP BUTTON_UP #define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
#else #else

4
apps/plugins/sudoku/sudoku.h
View file

@ -216,9 +216,9 @@
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN #define SUDOKU_BUTTON_DOWN BUTTON_DOWN
#define SUDOKU_BUTTON_LEFT BUTTON_LEFT #define SUDOKU_BUTTON_LEFT BUTTON_LEFT
#define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT
#define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT
#define SUDOKU_BUTTON_MENU BUTTON_MENU #define SUDOKU_BUTTON_MENU BUTTON_MENU
#define SUDOKU_BUTTON_POSSIBLE BUTTON_SELECT #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/superdom.c
View file

@ -133,7 +133,7 @@ char buf[255];
#define SUPERDOM_CANCEL BUTTON_POWER #define SUPERDOM_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define SUPERDOM_OK BUTTON_PLAY #define SUPERDOM_OK BUTTON_SELECT
#define SUPERDOM_UP BUTTON_UP #define SUPERDOM_UP BUTTON_UP
#define SUPERDOM_DOWN BUTTON_DOWN #define SUPERDOM_DOWN BUTTON_DOWN
#define SUPERDOM_LEFT BUTTON_LEFT #define SUPERDOM_LEFT BUTTON_LEFT

2
apps/plugins/vu_meter.c
View file

@ -229,7 +229,7 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT BUTTON_MENU #define VUMETER_MENU_EXIT BUTTON_MENU
#define VUMETER_UP BUTTON_UP #define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN #define VUMETER_DOWN BUTTON_DOWN
#define LABEL_HELP "PLAY" #define LABEL_HELP "MIDDLE"
#define LABEL_QUIT "BACK" #define LABEL_QUIT "BACK"
#define LABEL_MENU "MENU" #define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN" #define LABEL_VOLUME "UP/DOWN"

3
apps/plugins/wormlet.c
View file

@ -241,13 +241,12 @@ PLUGIN_HEADER
#define BTN_DIR_DOWN BUTTON_DOWN #define BTN_DIR_DOWN BUTTON_DOWN
#define BTN_DIR_LEFT BUTTON_LEFT #define BTN_DIR_LEFT BUTTON_LEFT
#define BTN_DIR_RIGHT BUTTON_RIGHT #define BTN_DIR_RIGHT BUTTON_RIGHT
#define BTN_STARTPAUSE BUTTON_SELECT #define BTN_STARTPAUSE BUTTON_PLAY
#define BTN_QUIT BUTTON_BACK #define BTN_QUIT BUTTON_BACK
#define BTN_STOPRESET BUTTON_MENU #define BTN_STOPRESET BUTTON_MENU
#define PLAYERS_TEXT "Up/Down" #define PLAYERS_TEXT "Up/Down"
#define WORMS_TEXT "Left/Right" #define WORMS_TEXT "Left/Right"
#else #else
#error No keymap defined! #error No keymap defined!
#endif #endif

2
apps/plugins/xobox.c
View file

@ -171,7 +171,7 @@ PLUGIN_HEADER
#define RIGHT BUTTON_RIGHT #define RIGHT BUTTON_RIGHT
#define UP BUTTON_UP #define UP BUTTON_UP
#define DOWN BUTTON_DOWN #define DOWN BUTTON_DOWN
#define PAUSE BUTTON_SELECT #define PAUSE BUTTON_PLAY
#else #else
#error No keymap defined! #error No keymap defined!

2
apps/plugins/zxbox/keymaps.h
View file

@ -135,7 +135,7 @@
#define ZX_DOWN BUTTON_DOWN #define ZX_DOWN BUTTON_DOWN
#define ZX_LEFT BUTTON_LEFT #define ZX_LEFT BUTTON_LEFT
#define ZX_RIGHT BUTTON_RIGHT #define ZX_RIGHT BUTTON_RIGHT
#define ZX_SELECT BUTTON_PLAY #define ZX_SELECT BUTTON_SELECT
#define ZX_MENU BUTTON_MENU #define ZX_MENU BUTTON_MENU
#else #else

2
apps/plugins/zxbox/zxbox_keyb.c
View file

@ -148,7 +148,7 @@
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define KBD_SELECT BUTTON_PLAY #define KBD_SELECT BUTTON_SELECT
#define KBD_ABORT BUTTON_BACK #define KBD_ABORT BUTTON_BACK
#define KBD_LEFT BUTTON_LEFT #define KBD_LEFT BUTTON_LEFT
#define KBD_RIGHT BUTTON_RIGHT #define KBD_RIGHT BUTTON_RIGHT