summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMaurus Cuelenaere <mcuelenaere@gmail.com>2008-12-08 09:51:42 +0000
committerMaurus Cuelenaere <mcuelenaere@gmail.com>2008-12-08 09:51:42 +0000
commit6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964 (patch)
tree1db21b8b63edaf094153df2d90a5100ae18577cd /apps
parent66459fee3ddcabd2a98720ca482d22a1656eeba6 (diff)
downloadrockbox-6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964.tar.gz
rockbox-6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964.tar.bz2
rockbox-6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964.zip
Commit FS#9607 by Adam Hogan: fix plugin keymaps for Creative Zen Vision:M
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19363 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/plugins/blackjack.c8
-rw-r--r--apps/plugins/chessbox/chessbox_pgn.h1
-rw-r--r--apps/plugins/chessclock.c4
-rw-r--r--apps/plugins/chip8.c8
-rw-r--r--apps/plugins/doom/i_video.c10
-rw-r--r--apps/plugins/fireworks.c2
-rw-r--r--apps/plugins/flipit.c4
-rw-r--r--apps/plugins/invadrox.c2
-rw-r--r--apps/plugins/jewels.c12
-rw-r--r--apps/plugins/jpeg/jpeg.h4
-rw-r--r--apps/plugins/lib/pluginlib_actions.c8
-rw-r--r--apps/plugins/mandelbrot.c10
-rw-r--r--apps/plugins/midi/midiplay.c2
-rw-r--r--apps/plugins/minesweeper.c4
-rw-r--r--apps/plugins/mosaique.c4
-rw-r--r--apps/plugins/mp3_encoder.c2
-rw-r--r--apps/plugins/mpegplayer/mpeg_settings.c4
-rw-r--r--apps/plugins/mpegplayer/mpegplayer.c2
-rw-r--r--apps/plugins/oscilloscope.c4
-rw-r--r--apps/plugins/pacbox/pacbox.h4
-rw-r--r--apps/plugins/pegbox.c4
-rw-r--r--apps/plugins/plasma.c2
-rw-r--r--apps/plugins/pong.c2
-rw-r--r--apps/plugins/reversi/reversi-gui.h2
-rw-r--r--apps/plugins/rockblox.c4
-rw-r--r--apps/plugins/rockblox1d.c2
-rw-r--r--apps/plugins/rockboy/rockboy.c4
-rw-r--r--apps/plugins/rockpaint.c6
-rw-r--r--apps/plugins/sliding_puzzle.c2
-rw-r--r--apps/plugins/snake.c2
-rw-r--r--apps/plugins/snake2.c2
-rw-r--r--apps/plugins/solitaire.c2
-rw-r--r--apps/plugins/spacerocks.c10
-rw-r--r--apps/plugins/stopwatch.c4
-rw-r--r--apps/plugins/sudoku/sudoku.h4
-rw-r--r--apps/plugins/superdom.c2
-rw-r--r--apps/plugins/vu_meter.c2
-rw-r--r--apps/plugins/wormlet.c3
-rw-r--r--apps/plugins/xobox.c2
-rw-r--r--apps/plugins/zxbox/keymaps.h2
-rw-r--r--apps/plugins/zxbox/zxbox_keyb.c2
41 files changed, 85 insertions, 79 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c
index 6536745f38..fb1d6495f9 100644
--- a/apps/plugins/blackjack.c
+++ b/apps/plugins/blackjack.c
@@ -275,10 +275,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define BJACK_START BUTTON_SELECT
#define BJACK_QUIT BUTTON_BACK
-#define BJACK_MAX (BUTTON_SELECT|BUTTON_UP)
-#define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN)
-#define BJACK_HIT BUTTON_LEFT
-#define BJACK_STAY BUTTON_RIGHT
+#define BJACK_MAX (BUTTON_CUSTOM|BUTTON_UP)
+#define BJACK_MIN (BUTTON_CUSTOM|BUTTON_DOWN)
+#define BJACK_HIT BUTTON_UP
+#define BJACK_STAY BUTTON_DOWN
#define BJACK_DOUBLEDOWN BUTTON_CUSTOM
#define BJACK_SCORES BUTTON_RIGHT
#define BJACK_RESUME BUTTON_MENU
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 35ac8daaf7..c454058fe2 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -295,7 +295,6 @@
#define CB_LEVEL BUTTON_CUSTOM
#define CB_MENU BUTTON_MENU
-
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/chessclock.c b/apps/plugins/chessclock.c
index 47d8345edf..a839954d8a 100644
--- a/apps/plugins/chessclock.c
+++ b/apps/plugins/chessclock.c
@@ -204,12 +204,12 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define CHC_QUIT BUTTON_BACK
-#define CHC_STARTSTOP BUTTON_SELECT
+#define CHC_STARTSTOP BUTTON_PLAY
#define CHC_RESET BUTTON_CUSTOM
#define CHC_MENU BUTTON_MENU
#define CHC_SETTINGS_INC BUTTON_UP
#define CHC_SETTINGS_DEC BUTTON_DOWN
-#define CHC_SETTINGS_OK BUTTON_PLAY
+#define CHC_SETTINGS_OK BUTTON_SELECT
#define CHC_SETTINGS_CANCEL BUTTON_BACK
#else
diff --git a/apps/plugins/chip8.c b/apps/plugins/chip8.c
index c5c46d54b2..83bd7262c8 100644
--- a/apps/plugins/chip8.c
+++ b/apps/plugins/chip8.c
@@ -1083,16 +1083,14 @@ STATIC void chip8 (void)
#define CHIP8_OFF BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define CHIP8_OFF BUTTON_POWER
+#define CHIP8_OFF BUTTON_BACK
#define CHIP8_KEY1 BUTTON_MENU
#define CHIP8_KEY2 BUTTON_UP
-#define CHIP8_KEY3 BUTTON_BACK
+#define CHIP8_KEY3 BUTTON_CUSTOM
#define CHIP8_KEY4 BUTTON_LEFT
-#define CHIP8_KEY5 BUTTON_SELECT
+#define CHIP8_KEY5 BUTTON_PLAY
#define CHIP8_KEY6 BUTTON_RIGHT
-#define CHIP8_KEY7 BUTTON_CUSTOM
#define CHIP8_KEY8 BUTTON_DOWN
-#define CHIP8_KEY9 BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c
index 58edcbd3fc..3e41cab460 100644
--- a/apps/plugins/doom/i_video.c
+++ b/apps/plugins/doom/i_video.c
@@ -282,12 +282,12 @@ void I_ShutdownGraphics(void)
#define DOOMBUTTON_DOWN BUTTON_DOWN
#define DOOMBUTTON_LEFT BUTTON_LEFT
#define DOOMBUTTON_RIGHT BUTTON_RIGHT
-#define DOOMBUTTON_SHOOT BUTTON_PLAY
-#define DOOMBUTTON_OPEN BUTTON_SELECT
-#define DOOMBUTTON_ESC BUTTON_POWER
-#define DOOMBUTTON_ENTER BUTTON_CUSTOM
+#define DOOMBUTTON_SHOOT BUTTON_SELECT
+#define DOOMBUTTON_OPEN BUTTON_PLAY
+#define DOOMBUTTON_ESC BUTTON_BACK
+#define DOOMBUTTON_ENTER BUTTON_PLAY
#define DOOMBUTTON_WEAPON BUTTON_MENU
-#define DOOMBUTTON_MAP BUTTON_BACK
+#define DOOMBUTTON_MAP BUTTON_CUSTOM
#else
#error Keymap not defined!
#endif
diff --git a/apps/plugins/fireworks.c b/apps/plugins/fireworks.c
index aeb49a272f..eee72906a4 100644
--- a/apps/plugins/fireworks.c
+++ b/apps/plugins/fireworks.c
@@ -78,7 +78,7 @@ static const struct plugin_api* rb;
#define BTN_FIRE BUTTON_PLAY
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define BTN_MENU BUTTON_MENU
-#define BTN_FIRE BUTTON_PLAY
+#define BTN_FIRE BUTTON_SELECT
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index f95644e064..9bc5659710 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -232,9 +232,9 @@ PLUGIN_HEADER
#define FLIPIT_DOWN BUTTON_DOWN
#define FLIPIT_QUIT BUTTON_BACK
#define FLIPIT_SHUFFLE BUTTON_CUSTOM
-#define FLIPIT_SOLVE BUTTON_SELECT
+#define FLIPIT_SOLVE BUTTON_PLAY
#define FLIPIT_STEP_BY_STEP BUTTON_MENU
-#define FLIPIT_TOGGLE BUTTON_PLAY
+#define FLIPIT_TOGGLE BUTTON_SELECT
#else
#error No keymap defined!
diff --git a/apps/plugins/invadrox.c b/apps/plugins/invadrox.c
index 3dbe5c539d..8554e511d8 100644
--- a/apps/plugins/invadrox.c
+++ b/apps/plugins/invadrox.c
@@ -132,7 +132,7 @@ PLUGIN_HEADER
#define QUIT BUTTON_BACK
#define LEFT BUTTON_LEFT
#define RIGHT BUTTON_RIGHT
-#define FIRE BUTTON_PLAY
+#define FIRE BUTTON_SELECT
#else
#error INVADROX: Unsupported keypad
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c
index c4ddcdf1c8..e453750fa5 100644
--- a/apps/plugins/jewels.c
+++ b/apps/plugins/jewels.c
@@ -1612,7 +1612,7 @@ static int jewels_main(struct game_context* bj) {
rb->lcd_puts(0, 12, "REC to cancel");
#elif CONFIG_KEYPAD == COWOND2_PAD
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, 3, "form connected segments");
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, 10, "Long SELECT to show menu");
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
#warning: missing help text.
#endif
diff --git a/apps/plugins/jpeg/jpeg.h b/apps/plugins/jpeg/jpeg.h
index db07b12b1f..178ff2dae5 100644
--- a/apps/plugins/jpeg/jpeg.h
+++ b/apps/plugins/jpeg/jpeg.h
@@ -236,13 +236,13 @@
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#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_DOWN BUTTON_DOWN
#define JPEG_LEFT BUTTON_LEFT
#define JPEG_RIGHT BUTTON_RIGHT
#define JPEG_MENU BUTTON_MENU
-#define JPEG_NEXT BUTTON_CUSTOM
+#define JPEG_NEXT BUTTON_SELECT
#define JPEG_PREVIOUS BUTTON_BACK
#else
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c
index 62b264d0b8..dd111d67d5 100644
--- a/apps/plugins/lib/pluginlib_actions.c
+++ b/apps/plugins/lib/pluginlib_actions.c
@@ -281,8 +281,8 @@ const struct button_mapping generic_left_right_fire[] =
{ PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE},
{ PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE},
{ PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE},
- { PLA_FIRE, BUTTON_PLAY, BUTTON_NONE},
- { PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
+ { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
+ { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#else
#error pluginlib_actions: Unsupported keypad
#endif
@@ -427,8 +427,8 @@ const struct button_mapping generic_actions[] =
{PLA_QUIT, BUTTON_BACK, BUTTON_NONE},
{PLA_START, BUTTON_PLAY, BUTTON_NONE},
{PLA_MENU, BUTTON_MENU, BUTTON_NONE},
- {PLA_FIRE, BUTTON_PLAY, BUTTON_NONE},
- {PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE},
+ {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE},
+ {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE},
#else
#error pluginlib_actions: Unsupported keypad
#endif
diff --git a/apps/plugins/mandelbrot.c b/apps/plugins/mandelbrot.c
index 9389d05fca..39ecd5b7d1 100644
--- a/apps/plugins/mandelbrot.c
+++ b/apps/plugins/mandelbrot.c
@@ -236,16 +236,16 @@ PLUGIN_HEADER
#define MANDELBROT_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MANDELBROT_QUIT BUTTON_POWER
+#define MANDELBROT_QUIT BUTTON_BACK
#define MANDELBROT_UP BUTTON_UP
#define MANDELBROT_DOWN BUTTON_DOWN
#define MANDELBROT_LEFT BUTTON_LEFT
#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_MAXITER_INC BUTTON_CUSTOM
-#define MANDELBROT_MAXITER_DEC BUTTON_BACK
-#define MANDELBROT_RESET BUTTON_PLAY
+#define MANDELBROT_MAXITER_INC (BUTTON_UP | BUTTON_CUSTOM)
+#define MANDELBROT_MAXITER_DEC (BUTTON_DOWN | BUTTON_CUSTOM)
+#define MANDELBROT_RESET BUTTON_SELECT
#else
#error No keymap defined!
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 4ecc477ac4..9380e14c80 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -163,7 +163,7 @@ PLUGIN_IRAM_DECLARE
#define BTN_LEFT BUTTON_LEFT
#define BTN_UP BUTTON_UP
#define BTN_DOWN BUTTON_DOWN
-#define BTN_PLAY BUTTON_SELECT
+#define BTN_PLAY BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 870fb18af6..7d361a2db2 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -194,8 +194,8 @@ enum minesweeper_status {
# define MINESWP_UP BUTTON_UP
# define MINESWP_DOWN BUTTON_DOWN
# define MINESWP_QUIT BUTTON_BACK
-# define MINESWP_TOGGLE BUTTON_PLAY
-# define MINESWP_DISCOVER BUTTON_SELECT
+# define MINESWP_TOGGLE BUTTON_SELECT
+# define MINESWP_DISCOVER BUTTON_PLAY
# define MINESWP_INFO BUTTON_MENU
#else
diff --git a/apps/plugins/mosaique.c b/apps/plugins/mosaique.c
index 294d7931f4..5560ef35d1 100644
--- a/apps/plugins/mosaique.c
+++ b/apps/plugins/mosaique.c
@@ -134,8 +134,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MOSAIQUE_QUIT BUTTON_BACK
-#define MOSAIQUE_SPEED BUTTON_MENU
-#define MOSAIQUE_RESTART BUTTON_SELECT
+#define MOSAIQUE_SPEED BUTTON_SELECT
+#define MOSAIQUE_RESTART BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/mp3_encoder.c b/apps/plugins/mp3_encoder.c
index 406ab9a079..3141c8d95e 100644
--- a/apps/plugins/mp3_encoder.c
+++ b/apps/plugins/mp3_encoder.c
@@ -2466,7 +2466,7 @@ void get_mp3_filename(const char *wav_name)
#define MP3ENC_PREV BUTTON_UP
#define MP3ENC_NEXT BUTTON_DOWN
#define MP3ENC_DONE BUTTON_BACK
-#define MP3ENC_SELECT BUTTON_PLAY
+#define MP3ENC_SELECT BUTTON_SELECT
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/mpegplayer/mpeg_settings.c b/apps/plugins/mpegplayer/mpeg_settings.c
index 0ab710e578..3672abbfb3 100644
--- a/apps/plugins/mpegplayer/mpeg_settings.c
+++ b/apps/plugins/mpegplayer/mpeg_settings.c
@@ -133,8 +133,8 @@ struct mpeg_settings settings;
#define MPEG_START_TIME_EXIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define MPEG_START_TIME_SELECT BUTTON_PLAY
-#define MPEG_START_TIME_SCROLL_UP BUTTON_SELECT
+#define MPEG_START_TIME_SELECT BUTTON_SELECT
+#define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY
#define MPEG_START_TIME_SCROLL_DOWN BUTTON_MENU
#define MPEG_START_TIME_LEFT BUTTON_LEFT
#define MPEG_START_TIME_RIGHT BUTTON_RIGHT
diff --git a/apps/plugins/mpegplayer/mpegplayer.c b/apps/plugins/mpegplayer/mpegplayer.c
index faa25e3e7b..42c1426468 100644
--- a/apps/plugins/mpegplayer/mpegplayer.c
+++ b/apps/plugins/mpegplayer/mpegplayer.c
@@ -243,7 +243,7 @@ PLUGIN_IRAM_DECLARE
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define MPEG_MENU BUTTON_MENU
#define MPEG_STOP BUTTON_BACK
-#define MPEG_PAUSE BUTTON_SELECT
+#define MPEG_PAUSE BUTTON_PLAY
#define MPEG_VOLDOWN BUTTON_UP
#define MPEG_VOLUP BUTTON_DOWN
#define MPEG_RW BUTTON_LEFT
diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c
index b3a48bb67e..dd148216a1 100644
--- a/apps/plugins/oscilloscope.c
+++ b/apps/plugins/oscilloscope.c
@@ -201,10 +201,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define OSCILLOSCOPE_QUIT BUTTON_BACK
-#define OSCILLOSCOPE_DRAWMODE BUTTON_PLAY
+#define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT
#define OSCILLOSCOPE_ADVMODE BUTTON_CUSTOM
#define OSCILLOSCOPE_ORIENTATION BUTTON_MENU
-#define OSCILLOSCOPE_PAUSE BUTTON_SELECT
+#define OSCILLOSCOPE_PAUSE BUTTON_PLAY
#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
#define OSCILLOSCOPE_VOL_UP BUTTON_UP
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h
index e84f8d8318..e454b17ae7 100644
--- a/apps/plugins/pacbox/pacbox.h
+++ b/apps/plugins/pacbox/pacbox.h
@@ -166,8 +166,8 @@
#define PACMAN_LEFT BUTTON_LEFT
#define PACMAN_RIGHT BUTTON_RIGHT
#define PACMAN_1UP BUTTON_CUSTOM
-#define PACMAN_2UP BUTTON_SELECT
-#define PACMAN_COIN BUTTON_PLAY
+#define PACMAN_2UP BUTTON_PLAY
+#define PACMAN_COIN BUTTON_SELECT
#define PACMAN_MENU BUTTON_MENU
#else
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c
index 414e431a4d..c2b54eba70 100644
--- a/apps/plugins/pegbox.c
+++ b/apps/plugins/pegbox.c
@@ -304,8 +304,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define PEGBOX_SAVE BUTTON_CUSTOM
#define PEGBOX_QUIT BUTTON_BACK
-#define PEGBOX_RESTART BUTTON_PLAY
-#define PEGBOX_LVL_UP BUTTON_SELECT
+#define PEGBOX_RESTART BUTTON_SELECT
+#define PEGBOX_LVL_UP BUTTON_PLAY
#define PEGBOX_LVL_DOWN BUTTON_MENU
#define PEGBOX_UP BUTTON_UP
#define PEGBOX_DOWN BUTTON_DOWN
diff --git a/apps/plugins/plasma.c b/apps/plugins/plasma.c
index 036dbb474c..a821718f46 100644
--- a/apps/plugins/plasma.c
+++ b/apps/plugins/plasma.c
@@ -113,7 +113,7 @@ static int plasma_frequency;
#define PLASMA_QUIT BUTTON_BACK
#define PLASMA_INCREASE_FREQUENCY BUTTON_UP
#define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN
-#define PLASMA_REGEN_COLORS BUTTON_PLAY
+#define PLASMA_REGEN_COLORS BUTTON_SELECT
#endif
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 63ae02b344..fc672c9851 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -163,7 +163,7 @@ PLUGIN_HEADER
#define PONG_QUIT BUTTON_BACK
#define PONG_LEFT_UP BUTTON_UP
#define PONG_LEFT_DOWN BUTTON_DOWN
-#define PONG_RIGHT_UP BUTTON_SELECT
+#define PONG_RIGHT_UP BUTTON_PLAY
#define PONG_RIGHT_DOWN BUTTON_MENU
#else
diff --git a/apps/plugins/reversi/reversi-gui.h b/apps/plugins/reversi/reversi-gui.h
index 2aa949d40b..826e9b12bb 100644
--- a/apps/plugins/reversi/reversi-gui.h
+++ b/apps/plugins/reversi/reversi-gui.h
@@ -162,7 +162,7 @@
#define REVERSI_BUTTON_DOWN BUTTON_DOWN
#define REVERSI_BUTTON_LEFT BUTTON_LEFT
#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
#else
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c
index e88ee58401..38d919a258 100644
--- a/apps/plugins/rockblox.c
+++ b/apps/plugins/rockblox.c
@@ -243,11 +243,11 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ROCKBLOX_OFF BUTTON_BACK
#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_LEFT BUTTON_LEFT
#define ROCKBLOX_RIGHT BUTTON_RIGHT
-#define ROCKBLOX_DROP BUTTON_PLAY
+#define ROCKBLOX_DROP BUTTON_SELECT
#define ROCKBLOX_RESTART BUTTON_CUSTOM
#else
diff --git a/apps/plugins/rockblox1d.c b/apps/plugins/rockblox1d.c
index 9978ed0816..295bd225b9 100644
--- a/apps/plugins/rockblox1d.c
+++ b/apps/plugins/rockblox1d.c
@@ -87,7 +87,7 @@ CONFIG_KEYPAD == SANSA_CLIP_PAD
#define ONEDROCKBLOX_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define ONEDROCKBLOX_DOWN BUTTON_PLAY
+#define ONEDROCKBLOX_DOWN BUTTON_SELECT
#define ONEDROCKBLOX_QUIT BUTTON_BACK
#else
diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c
index baec042031..5244bf0b3d 100644
--- a/apps/plugins/rockboy/rockboy.c
+++ b/apps/plugins/rockboy/rockboy.c
@@ -225,9 +225,9 @@ static void setoptions (void)
options.DOWN=BUTTON_DOWN;
options.A=BUTTON_CUSTOM;
- options.B=BUTTON_SELECT;
+ options.B=BUTTON_PLAY;
options.START=BUTTON_BACK;
- options.SELECT=BUTTON_PLAY;
+ options.SELECT=BUTTON_SELECT;
options.MENU=BUTTON_MENU;
#else
#error No Keymap Defined!
diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c
index a91bdc4e88..300821b3a4 100644
--- a/apps/plugins/rockpaint.c
+++ b/apps/plugins/rockpaint.c
@@ -123,10 +123,10 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define ROCKPAINT_QUIT BUTTON_BACK
-#define ROCKPAINT_DRAW BUTTON_PLAY
+#define ROCKPAINT_DRAW BUTTON_SELECT
#define ROCKPAINT_MENU BUTTON_MENU
-#define ROCKPAINT_TOOLBAR BUTTON_SELECT
-#define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_LEFT )
+#define ROCKPAINT_TOOLBAR BUTTON_PLAY
+#define ROCKPAINT_TOOLBAR2 ( BUTTON_PLAY | BUTTON_LEFT )
#define ROCKPAINT_UP BUTTON_UP
#define ROCKPAINT_DOWN BUTTON_DOWN
#define ROCKPAINT_LEFT BUTTON_LEFT
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 44c4c3a1b2..755129c9b9 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -159,7 +159,7 @@ PLUGIN_HEADER
#define PUZZLE_RIGHT BUTTON_RIGHT
#define PUZZLE_UP BUTTON_UP
#define PUZZLE_DOWN BUTTON_DOWN
-#define PUZZLE_SHUFFLE BUTTON_SELECT
+#define PUZZLE_SHUFFLE BUTTON_PLAY
#define PUZZLE_PICTURE BUTTON_MENU
#else
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index cbe50c8c12..e6cbcc84dc 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -152,7 +152,7 @@ PLUGIN_HEADER
#define SNAKE_RIGHT BUTTON_RIGHT
#define SNAKE_UP BUTTON_UP
#define SNAKE_DOWN BUTTON_DOWN
-#define SNAKE_PLAYPAUSE BUTTON_SELECT
+#define SNAKE_PLAYPAUSE BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c
index 50d2bb2388..b17a47b44c 100644
--- a/apps/plugins/snake2.c
+++ b/apps/plugins/snake2.c
@@ -318,7 +318,7 @@ PLUGIN_HEADER
#define SNAKE2_MAZE_NEXT BUTTON_RIGHT
#define SNAKE2_MAZE_LAST BUTTON_LEFT
#define SNAKE2_SELECT_TYPE BUTTON_MENU
-#define SNAKE2_PLAYPAUSE BUTTON_SELECT
+#define SNAKE2_PLAYPAUSE BUTTON_PLAY
#define SNAKE2_PLAYPAUSE_TEXT "Play"
#else
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index d1016ac59b..ea2246c442 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -334,7 +334,7 @@ static const struct plugin_api* rb;
# define SOL_REM2CUR (BUTTON_LEFT | BUTTON_SELECT)
# define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT)
# define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_SELECT)
-# define HK_MOVE "PLAY"
+# define HK_MOVE "MIDDLE"
# define HK_DRAW "MENU"
# define HK_REM2CUR "PLAY+LEFT"
# define HK_CUR2STACK "PLAY.."
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c
index 8fea76d41b..1926c9bf04 100644
--- a/apps/plugins/spacerocks.c
+++ b/apps/plugins/spacerocks.c
@@ -217,17 +217,17 @@ static const struct plugin_api* rb; /* global api struct pointer */
#define AST_QUIT BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define AST_PAUSE BUTTON_SELECT
+#define AST_PAUSE BUTTON_PLAY
#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_HYPERSPACE BUTTON_DOWN
#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_REP (BUTTON_RIGHT | BUTTON_REPEAT)
-#define AST_FIRE BUTTON_PLAY
-#define AST_FIRE_REP BUTTON_PLAY | BUTTON_REPEAT
+#define AST_FIRE BUTTON_SELECT
+#define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT)
#else
#error No keymap defined!
diff --git a/apps/plugins/stopwatch.c b/apps/plugins/stopwatch.c
index 9725c6dc67..5090305511 100644
--- a/apps/plugins/stopwatch.c
+++ b/apps/plugins/stopwatch.c
@@ -161,8 +161,8 @@ PLUGIN_HEADER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
#define STOPWATCH_QUIT BUTTON_BACK
#define STOPWATCH_START_STOP BUTTON_PLAY
-#define STOPWATCH_RESET_TIMER BUTTON_CUSTOM
-#define STOPWATCH_LAP_TIMER BUTTON_SELECT
+#define STOPWATCH_RESET_TIMER BUTTON_SELECT
+#define STOPWATCH_LAP_TIMER BUTTON_CUSTOM
#define STOPWATCH_SCROLL_UP BUTTON_UP
#define STOPWATCH_SCROLL_DOWN BUTTON_DOWN
#else
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h
index 7fc6a4f09b..83da2e85c7 100644
--- a/apps/plugins/sudoku/sudoku.h
+++ b/apps/plugins/sudoku/sudoku.h
@@ -216,9 +216,9 @@
#define SUDOKU_BUTTON_DOWN BUTTON_DOWN
#define SUDOKU_BUTTON_LEFT BUTTON_LEFT
#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_POSSIBLE BUTTON_SELECT
+#define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/superdom.c b/apps/plugins/superdom.c
index 4a571491dd..d375879eb5 100644
--- a/apps/plugins/superdom.c
+++ b/apps/plugins/superdom.c
@@ -133,7 +133,7 @@ char buf[255];
#define SUPERDOM_CANCEL BUTTON_POWER
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define SUPERDOM_OK BUTTON_PLAY
+#define SUPERDOM_OK BUTTON_SELECT
#define SUPERDOM_UP BUTTON_UP
#define SUPERDOM_DOWN BUTTON_DOWN
#define SUPERDOM_LEFT BUTTON_LEFT
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 67ac024c62..77f7a707b1 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -229,7 +229,7 @@ PLUGIN_HEADER
#define VUMETER_MENU_EXIT BUTTON_MENU
#define VUMETER_UP BUTTON_UP
#define VUMETER_DOWN BUTTON_DOWN
-#define LABEL_HELP "PLAY"
+#define LABEL_HELP "MIDDLE"
#define LABEL_QUIT "BACK"
#define LABEL_MENU "MENU"
#define LABEL_VOLUME "UP/DOWN"
diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 534fc48d43..5e912e90a2 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -241,13 +241,12 @@ PLUGIN_HEADER
#define BTN_DIR_DOWN BUTTON_DOWN
#define BTN_DIR_LEFT BUTTON_LEFT
#define BTN_DIR_RIGHT BUTTON_RIGHT
-#define BTN_STARTPAUSE BUTTON_SELECT
+#define BTN_STARTPAUSE BUTTON_PLAY
#define BTN_QUIT BUTTON_BACK
#define BTN_STOPRESET BUTTON_MENU
#define PLAYERS_TEXT "Up/Down"
#define WORMS_TEXT "Left/Right"
-
#else
#error No keymap defined!
#endif
diff --git a/apps/plugins/xobox.c b/apps/plugins/xobox.c
index cd9c7f29ce..b6bed51163 100644
--- a/apps/plugins/xobox.c
+++ b/apps/plugins/xobox.c
@@ -171,7 +171,7 @@ PLUGIN_HEADER
#define RIGHT BUTTON_RIGHT
#define UP BUTTON_UP
#define DOWN BUTTON_DOWN
-#define PAUSE BUTTON_SELECT
+#define PAUSE BUTTON_PLAY
#else
#error No keymap defined!
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h
index d6b37f7bb7..2145c69565 100644
--- a/apps/plugins/zxbox/keymaps.h
+++ b/apps/plugins/zxbox/keymaps.h
@@ -135,7 +135,7 @@
#define ZX_DOWN BUTTON_DOWN
#define ZX_LEFT BUTTON_LEFT
#define ZX_RIGHT BUTTON_RIGHT
-#define ZX_SELECT BUTTON_PLAY
+#define ZX_SELECT BUTTON_SELECT
#define ZX_MENU BUTTON_MENU
#else
diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c
index f7526e2334..6673258bdd 100644
--- a/apps/plugins/zxbox/zxbox_keyb.c
+++ b/apps/plugins/zxbox/zxbox_keyb.c
@@ -148,7 +148,7 @@
#elif CONFIG_KEYPAD == CREATIVEZVM_PAD
-#define KBD_SELECT BUTTON_PLAY
+#define KBD_SELECT BUTTON_SELECT
#define KBD_ABORT BUTTON_BACK
#define KBD_LEFT BUTTON_LEFT
#define KBD_RIGHT BUTTON_RIGHT