diff options
author | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-12-08 09:51:42 +0000 |
---|---|---|
committer | Maurus Cuelenaere <mcuelenaere@gmail.com> | 2008-12-08 09:51:42 +0000 |
commit | 6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964 (patch) | |
tree | 1db21b8b63edaf094153df2d90a5100ae18577cd /apps | |
parent | 66459fee3ddcabd2a98720ca482d22a1656eeba6 (diff) | |
download | rockbox-6471b3c81a4d629e3ed48d4e8ec678e1f1cf2964.tar.gz 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')
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 | |||
275 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 275 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
276 | #define BJACK_START BUTTON_SELECT | 276 | #define BJACK_START BUTTON_SELECT |
277 | #define BJACK_QUIT BUTTON_BACK | 277 | #define BJACK_QUIT BUTTON_BACK |
278 | #define BJACK_MAX (BUTTON_SELECT|BUTTON_UP) | 278 | #define BJACK_MAX (BUTTON_CUSTOM|BUTTON_UP) |
279 | #define BJACK_MIN (BUTTON_SELECT|BUTTON_DOWN) | 279 | #define BJACK_MIN (BUTTON_CUSTOM|BUTTON_DOWN) |
280 | #define BJACK_HIT BUTTON_LEFT | 280 | #define BJACK_HIT BUTTON_UP |
281 | #define BJACK_STAY BUTTON_RIGHT | 281 | #define BJACK_STAY BUTTON_DOWN |
282 | #define BJACK_DOUBLEDOWN BUTTON_CUSTOM | 282 | #define BJACK_DOUBLEDOWN BUTTON_CUSTOM |
283 | #define BJACK_SCORES BUTTON_RIGHT | 283 | #define BJACK_SCORES BUTTON_RIGHT |
284 | #define BJACK_RESUME BUTTON_MENU | 284 | #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 @@ | |||
295 | #define CB_LEVEL BUTTON_CUSTOM | 295 | #define CB_LEVEL BUTTON_CUSTOM |
296 | #define CB_MENU BUTTON_MENU | 296 | #define CB_MENU BUTTON_MENU |
297 | 297 | ||
298 | |||
299 | #else | 298 | #else |
300 | #error No keymap defined! | 299 | #error No keymap defined! |
301 | #endif | 300 | #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 | |||
204 | 204 | ||
205 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 205 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
206 | #define CHC_QUIT BUTTON_BACK | 206 | #define CHC_QUIT BUTTON_BACK |
207 | #define CHC_STARTSTOP BUTTON_SELECT | 207 | #define CHC_STARTSTOP BUTTON_PLAY |
208 | #define CHC_RESET BUTTON_CUSTOM | 208 | #define CHC_RESET BUTTON_CUSTOM |
209 | #define CHC_MENU BUTTON_MENU | 209 | #define CHC_MENU BUTTON_MENU |
210 | #define CHC_SETTINGS_INC BUTTON_UP | 210 | #define CHC_SETTINGS_INC BUTTON_UP |
211 | #define CHC_SETTINGS_DEC BUTTON_DOWN | 211 | #define CHC_SETTINGS_DEC BUTTON_DOWN |
212 | #define CHC_SETTINGS_OK BUTTON_PLAY | 212 | #define CHC_SETTINGS_OK BUTTON_SELECT |
213 | #define CHC_SETTINGS_CANCEL BUTTON_BACK | 213 | #define CHC_SETTINGS_CANCEL BUTTON_BACK |
214 | 214 | ||
215 | #else | 215 | #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) | |||
1083 | #define CHIP8_OFF BUTTON_POWER | 1083 | #define CHIP8_OFF BUTTON_POWER |
1084 | 1084 | ||
1085 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 1085 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
1086 | #define CHIP8_OFF BUTTON_POWER | 1086 | #define CHIP8_OFF BUTTON_BACK |
1087 | #define CHIP8_KEY1 BUTTON_MENU | 1087 | #define CHIP8_KEY1 BUTTON_MENU |
1088 | #define CHIP8_KEY2 BUTTON_UP | 1088 | #define CHIP8_KEY2 BUTTON_UP |
1089 | #define CHIP8_KEY3 BUTTON_BACK | 1089 | #define CHIP8_KEY3 BUTTON_CUSTOM |
1090 | #define CHIP8_KEY4 BUTTON_LEFT | 1090 | #define CHIP8_KEY4 BUTTON_LEFT |
1091 | #define CHIP8_KEY5 BUTTON_SELECT | 1091 | #define CHIP8_KEY5 BUTTON_PLAY |
1092 | #define CHIP8_KEY6 BUTTON_RIGHT | 1092 | #define CHIP8_KEY6 BUTTON_RIGHT |
1093 | #define CHIP8_KEY7 BUTTON_CUSTOM | ||
1094 | #define CHIP8_KEY8 BUTTON_DOWN | 1093 | #define CHIP8_KEY8 BUTTON_DOWN |
1095 | #define CHIP8_KEY9 BUTTON_PLAY | ||
1096 | 1094 | ||
1097 | #else | 1095 | #else |
1098 | #error No keymap defined! | 1096 | #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) | |||
282 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 282 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
283 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 283 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
284 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 284 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
285 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 285 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
286 | #define DOOMBUTTON_OPEN BUTTON_SELECT | 286 | #define DOOMBUTTON_OPEN BUTTON_PLAY |
287 | #define DOOMBUTTON_ESC BUTTON_POWER | 287 | #define DOOMBUTTON_ESC BUTTON_BACK |
288 | #define DOOMBUTTON_ENTER BUTTON_CUSTOM | 288 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
289 | #define DOOMBUTTON_WEAPON BUTTON_MENU | 289 | #define DOOMBUTTON_WEAPON BUTTON_MENU |
290 | #define DOOMBUTTON_MAP BUTTON_BACK | 290 | #define DOOMBUTTON_MAP BUTTON_CUSTOM |
291 | #else | 291 | #else |
292 | #error Keymap not defined! | 292 | #error Keymap not defined! |
293 | #endif | 293 | #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; | |||
78 | #define BTN_FIRE BUTTON_PLAY | 78 | #define BTN_FIRE BUTTON_PLAY |
79 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 79 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
80 | #define BTN_MENU BUTTON_MENU | 80 | #define BTN_MENU BUTTON_MENU |
81 | #define BTN_FIRE BUTTON_PLAY | 81 | #define BTN_FIRE BUTTON_SELECT |
82 | #else | 82 | #else |
83 | #error No keymap defined! | 83 | #error No keymap defined! |
84 | #endif | 84 | #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 | |||
232 | #define FLIPIT_DOWN BUTTON_DOWN | 232 | #define FLIPIT_DOWN BUTTON_DOWN |
233 | #define FLIPIT_QUIT BUTTON_BACK | 233 | #define FLIPIT_QUIT BUTTON_BACK |
234 | #define FLIPIT_SHUFFLE BUTTON_CUSTOM | 234 | #define FLIPIT_SHUFFLE BUTTON_CUSTOM |
235 | #define FLIPIT_SOLVE BUTTON_SELECT | 235 | #define FLIPIT_SOLVE BUTTON_PLAY |
236 | #define FLIPIT_STEP_BY_STEP BUTTON_MENU | 236 | #define FLIPIT_STEP_BY_STEP BUTTON_MENU |
237 | #define FLIPIT_TOGGLE BUTTON_PLAY | 237 | #define FLIPIT_TOGGLE BUTTON_SELECT |
238 | 238 | ||
239 | #else | 239 | #else |
240 | #error No keymap defined! | 240 | #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 | |||
132 | #define QUIT BUTTON_BACK | 132 | #define QUIT BUTTON_BACK |
133 | #define LEFT BUTTON_LEFT | 133 | #define LEFT BUTTON_LEFT |
134 | #define RIGHT BUTTON_RIGHT | 134 | #define RIGHT BUTTON_RIGHT |
135 | #define FIRE BUTTON_PLAY | 135 | #define FIRE BUTTON_SELECT |
136 | 136 | ||
137 | #else | 137 | #else |
138 | #error INVADROX: Unsupported keypad | 138 | #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) { | |||
1612 | rb->lcd_puts(0, 12, "REC to cancel"); | 1612 | rb->lcd_puts(0, 12, "REC to cancel"); |
1613 | #elif CONFIG_KEYPAD == COWOND2_PAD | 1613 | #elif CONFIG_KEYPAD == COWOND2_PAD |
1614 | rb->lcd_puts(0, 11, "POWER to cancel"); | 1614 | rb->lcd_puts(0, 11, "POWER to cancel"); |
1615 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD || CREATIVEZVM_PAD | 1615 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
1616 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | 1616 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); |
1617 | rb->lcd_puts(0, 3, "form connected segments"); | 1617 | rb->lcd_puts(0, 3, "form connected segments"); |
1618 | rb->lcd_puts(0, 4, "of three or more of the"); | 1618 | rb->lcd_puts(0, 4, "of three or more of the"); |
@@ -1622,6 +1622,16 @@ static int jewels_main(struct game_context* bj) { | |||
1622 | rb->lcd_puts(0, 9, "SELECT to select"); | 1622 | rb->lcd_puts(0, 9, "SELECT to select"); |
1623 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); | 1623 | rb->lcd_puts(0, 10, "Long SELECT to show menu"); |
1624 | rb->lcd_puts(0, 11, "BACK to cancel"); | 1624 | rb->lcd_puts(0, 11, "BACK to cancel"); |
1625 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | ||
1626 | rb->lcd_puts(0, 2, "Swap pairs of jewels to"); | ||
1627 | rb->lcd_puts(0, 3, "form connected segments"); | ||
1628 | rb->lcd_puts(0, 4, "of three or more of the"); | ||
1629 | rb->lcd_puts(0, 5, "same type."); | ||
1630 | rb->lcd_puts(0, 7, "Controls:"); | ||
1631 | rb->lcd_puts(0, 8, "Directions to move"); | ||
1632 | rb->lcd_puts(0, 9, "MIDDLE to select"); | ||
1633 | rb->lcd_puts(0, 10, "Long MIDDLE to show menu"); | ||
1634 | rb->lcd_puts(0, 11, "BACK to cancel"); | ||
1625 | #else | 1635 | #else |
1626 | #warning: missing help text. | 1636 | #warning: missing help text. |
1627 | #endif | 1637 | #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 @@ | |||
236 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 236 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
237 | 237 | ||
238 | #define JPEG_ZOOM_IN BUTTON_PLAY | 238 | #define JPEG_ZOOM_IN BUTTON_PLAY |
239 | #define JPEG_ZOOM_OUT BUTTON_SELECT | 239 | #define JPEG_ZOOM_OUT BUTTON_CUSTOM |
240 | #define JPEG_UP BUTTON_UP | 240 | #define JPEG_UP BUTTON_UP |
241 | #define JPEG_DOWN BUTTON_DOWN | 241 | #define JPEG_DOWN BUTTON_DOWN |
242 | #define JPEG_LEFT BUTTON_LEFT | 242 | #define JPEG_LEFT BUTTON_LEFT |
243 | #define JPEG_RIGHT BUTTON_RIGHT | 243 | #define JPEG_RIGHT BUTTON_RIGHT |
244 | #define JPEG_MENU BUTTON_MENU | 244 | #define JPEG_MENU BUTTON_MENU |
245 | #define JPEG_NEXT BUTTON_CUSTOM | 245 | #define JPEG_NEXT BUTTON_SELECT |
246 | #define JPEG_PREVIOUS BUTTON_BACK | 246 | #define JPEG_PREVIOUS BUTTON_BACK |
247 | 247 | ||
248 | #else | 248 | #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[] = | |||
281 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, | 281 | { PLA_RIGHT, BUTTON_RIGHT, BUTTON_NONE}, |
282 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, | 282 | { PLA_LEFT_REPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE}, |
283 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, | 283 | { PLA_RIGHT_REPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE}, |
284 | { PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, | 284 | { PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
285 | { PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 285 | { PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
286 | #else | 286 | #else |
287 | #error pluginlib_actions: Unsupported keypad | 287 | #error pluginlib_actions: Unsupported keypad |
288 | #endif | 288 | #endif |
@@ -427,8 +427,8 @@ const struct button_mapping generic_actions[] = | |||
427 | {PLA_QUIT, BUTTON_BACK, BUTTON_NONE}, | 427 | {PLA_QUIT, BUTTON_BACK, BUTTON_NONE}, |
428 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, | 428 | {PLA_START, BUTTON_PLAY, BUTTON_NONE}, |
429 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, | 429 | {PLA_MENU, BUTTON_MENU, BUTTON_NONE}, |
430 | {PLA_FIRE, BUTTON_PLAY, BUTTON_NONE}, | 430 | {PLA_FIRE, BUTTON_SELECT, BUTTON_NONE}, |
431 | {PLA_FIRE_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 431 | {PLA_FIRE_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
432 | #else | 432 | #else |
433 | #error pluginlib_actions: Unsupported keypad | 433 | #error pluginlib_actions: Unsupported keypad |
434 | #endif | 434 | #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 | |||
236 | #define MANDELBROT_QUIT BUTTON_POWER | 236 | #define MANDELBROT_QUIT BUTTON_POWER |
237 | 237 | ||
238 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 238 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
239 | #define MANDELBROT_QUIT BUTTON_POWER | 239 | #define MANDELBROT_QUIT BUTTON_BACK |
240 | #define MANDELBROT_UP BUTTON_UP | 240 | #define MANDELBROT_UP BUTTON_UP |
241 | #define MANDELBROT_DOWN BUTTON_DOWN | 241 | #define MANDELBROT_DOWN BUTTON_DOWN |
242 | #define MANDELBROT_LEFT BUTTON_LEFT | 242 | #define MANDELBROT_LEFT BUTTON_LEFT |
243 | #define MANDELBROT_RIGHT BUTTON_RIGHT | 243 | #define MANDELBROT_RIGHT BUTTON_RIGHT |
244 | #define MANDELBROT_ZOOM_IN BUTTON_SELECT | 244 | #define MANDELBROT_ZOOM_IN BUTTON_PLAY |
245 | #define MANDELBROT_ZOOM_OUT BUTTON_MENU | 245 | #define MANDELBROT_ZOOM_OUT BUTTON_MENU |
246 | #define MANDELBROT_MAXITER_INC BUTTON_CUSTOM | 246 | #define MANDELBROT_MAXITER_INC (BUTTON_UP | BUTTON_CUSTOM) |
247 | #define MANDELBROT_MAXITER_DEC BUTTON_BACK | 247 | #define MANDELBROT_MAXITER_DEC (BUTTON_DOWN | BUTTON_CUSTOM) |
248 | #define MANDELBROT_RESET BUTTON_PLAY | 248 | #define MANDELBROT_RESET BUTTON_SELECT |
249 | 249 | ||
250 | #else | 250 | #else |
251 | #error No keymap defined! | 251 | #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 | |||
163 | #define BTN_LEFT BUTTON_LEFT | 163 | #define BTN_LEFT BUTTON_LEFT |
164 | #define BTN_UP BUTTON_UP | 164 | #define BTN_UP BUTTON_UP |
165 | #define BTN_DOWN BUTTON_DOWN | 165 | #define BTN_DOWN BUTTON_DOWN |
166 | #define BTN_PLAY BUTTON_SELECT | 166 | #define BTN_PLAY BUTTON_PLAY |
167 | 167 | ||
168 | #else | 168 | #else |
169 | #error No keymap defined! | 169 | #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 { | |||
194 | # define MINESWP_UP BUTTON_UP | 194 | # define MINESWP_UP BUTTON_UP |
195 | # define MINESWP_DOWN BUTTON_DOWN | 195 | # define MINESWP_DOWN BUTTON_DOWN |
196 | # define MINESWP_QUIT BUTTON_BACK | 196 | # define MINESWP_QUIT BUTTON_BACK |
197 | # define MINESWP_TOGGLE BUTTON_PLAY | 197 | # define MINESWP_TOGGLE BUTTON_SELECT |
198 | # define MINESWP_DISCOVER BUTTON_SELECT | 198 | # define MINESWP_DISCOVER BUTTON_PLAY |
199 | # define MINESWP_INFO BUTTON_MENU | 199 | # define MINESWP_INFO BUTTON_MENU |
200 | 200 | ||
201 | #else | 201 | #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 | |||
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
136 | #define MOSAIQUE_QUIT BUTTON_BACK | 136 | #define MOSAIQUE_QUIT BUTTON_BACK |
137 | #define MOSAIQUE_SPEED BUTTON_MENU | 137 | #define MOSAIQUE_SPEED BUTTON_SELECT |
138 | #define MOSAIQUE_RESTART BUTTON_SELECT | 138 | #define MOSAIQUE_RESTART BUTTON_PLAY |
139 | 139 | ||
140 | #else | 140 | #else |
141 | #error No keymap defined! | 141 | #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) | |||
2466 | #define MP3ENC_PREV BUTTON_UP | 2466 | #define MP3ENC_PREV BUTTON_UP |
2467 | #define MP3ENC_NEXT BUTTON_DOWN | 2467 | #define MP3ENC_NEXT BUTTON_DOWN |
2468 | #define MP3ENC_DONE BUTTON_BACK | 2468 | #define MP3ENC_DONE BUTTON_BACK |
2469 | #define MP3ENC_SELECT BUTTON_PLAY | 2469 | #define MP3ENC_SELECT BUTTON_SELECT |
2470 | #else | 2470 | #else |
2471 | #error No keymap defined! | 2471 | #error No keymap defined! |
2472 | #endif | 2472 | #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; | |||
133 | #define MPEG_START_TIME_EXIT BUTTON_POWER | 133 | #define MPEG_START_TIME_EXIT BUTTON_POWER |
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
136 | #define MPEG_START_TIME_SELECT BUTTON_PLAY | 136 | #define MPEG_START_TIME_SELECT BUTTON_SELECT |
137 | #define MPEG_START_TIME_SCROLL_UP BUTTON_SELECT | 137 | #define MPEG_START_TIME_SCROLL_UP BUTTON_PLAY |
138 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_MENU | 138 | #define MPEG_START_TIME_SCROLL_DOWN BUTTON_MENU |
139 | #define MPEG_START_TIME_LEFT BUTTON_LEFT | 139 | #define MPEG_START_TIME_LEFT BUTTON_LEFT |
140 | #define MPEG_START_TIME_RIGHT BUTTON_RIGHT | 140 | #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 | |||
243 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 243 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
244 | #define MPEG_MENU BUTTON_MENU | 244 | #define MPEG_MENU BUTTON_MENU |
245 | #define MPEG_STOP BUTTON_BACK | 245 | #define MPEG_STOP BUTTON_BACK |
246 | #define MPEG_PAUSE BUTTON_SELECT | 246 | #define MPEG_PAUSE BUTTON_PLAY |
247 | #define MPEG_VOLDOWN BUTTON_UP | 247 | #define MPEG_VOLDOWN BUTTON_UP |
248 | #define MPEG_VOLUP BUTTON_DOWN | 248 | #define MPEG_VOLUP BUTTON_DOWN |
249 | #define MPEG_RW BUTTON_LEFT | 249 | #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 | |||
201 | 201 | ||
202 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 202 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
203 | #define OSCILLOSCOPE_QUIT BUTTON_BACK | 203 | #define OSCILLOSCOPE_QUIT BUTTON_BACK |
204 | #define OSCILLOSCOPE_DRAWMODE BUTTON_PLAY | 204 | #define OSCILLOSCOPE_DRAWMODE BUTTON_SELECT |
205 | #define OSCILLOSCOPE_ADVMODE BUTTON_CUSTOM | 205 | #define OSCILLOSCOPE_ADVMODE BUTTON_CUSTOM |
206 | #define OSCILLOSCOPE_ORIENTATION BUTTON_MENU | 206 | #define OSCILLOSCOPE_ORIENTATION BUTTON_MENU |
207 | #define OSCILLOSCOPE_PAUSE BUTTON_SELECT | 207 | #define OSCILLOSCOPE_PAUSE BUTTON_PLAY |
208 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT | 208 | #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT |
209 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT | 209 | #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT |
210 | #define OSCILLOSCOPE_VOL_UP BUTTON_UP | 210 | #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 @@ | |||
166 | #define PACMAN_LEFT BUTTON_LEFT | 166 | #define PACMAN_LEFT BUTTON_LEFT |
167 | #define PACMAN_RIGHT BUTTON_RIGHT | 167 | #define PACMAN_RIGHT BUTTON_RIGHT |
168 | #define PACMAN_1UP BUTTON_CUSTOM | 168 | #define PACMAN_1UP BUTTON_CUSTOM |
169 | #define PACMAN_2UP BUTTON_SELECT | 169 | #define PACMAN_2UP BUTTON_PLAY |
170 | #define PACMAN_COIN BUTTON_PLAY | 170 | #define PACMAN_COIN BUTTON_SELECT |
171 | #define PACMAN_MENU BUTTON_MENU | 171 | #define PACMAN_MENU BUTTON_MENU |
172 | 172 | ||
173 | #else | 173 | #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 | |||
304 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 304 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
305 | #define PEGBOX_SAVE BUTTON_CUSTOM | 305 | #define PEGBOX_SAVE BUTTON_CUSTOM |
306 | #define PEGBOX_QUIT BUTTON_BACK | 306 | #define PEGBOX_QUIT BUTTON_BACK |
307 | #define PEGBOX_RESTART BUTTON_PLAY | 307 | #define PEGBOX_RESTART BUTTON_SELECT |
308 | #define PEGBOX_LVL_UP BUTTON_SELECT | 308 | #define PEGBOX_LVL_UP BUTTON_PLAY |
309 | #define PEGBOX_LVL_DOWN BUTTON_MENU | 309 | #define PEGBOX_LVL_DOWN BUTTON_MENU |
310 | #define PEGBOX_UP BUTTON_UP | 310 | #define PEGBOX_UP BUTTON_UP |
311 | #define PEGBOX_DOWN BUTTON_DOWN | 311 | #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; | |||
113 | #define PLASMA_QUIT BUTTON_BACK | 113 | #define PLASMA_QUIT BUTTON_BACK |
114 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP | 114 | #define PLASMA_INCREASE_FREQUENCY BUTTON_UP |
115 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN | 115 | #define PLASMA_DECREASE_FREQUENCY BUTTON_DOWN |
116 | #define PLASMA_REGEN_COLORS BUTTON_PLAY | 116 | #define PLASMA_REGEN_COLORS BUTTON_SELECT |
117 | 117 | ||
118 | #endif | 118 | #endif |
119 | 119 | ||
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 | |||
163 | #define PONG_QUIT BUTTON_BACK | 163 | #define PONG_QUIT BUTTON_BACK |
164 | #define PONG_LEFT_UP BUTTON_UP | 164 | #define PONG_LEFT_UP BUTTON_UP |
165 | #define PONG_LEFT_DOWN BUTTON_DOWN | 165 | #define PONG_LEFT_DOWN BUTTON_DOWN |
166 | #define PONG_RIGHT_UP BUTTON_SELECT | 166 | #define PONG_RIGHT_UP BUTTON_PLAY |
167 | #define PONG_RIGHT_DOWN BUTTON_MENU | 167 | #define PONG_RIGHT_DOWN BUTTON_MENU |
168 | 168 | ||
169 | #else | 169 | #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 @@ | |||
162 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN | 162 | #define REVERSI_BUTTON_DOWN BUTTON_DOWN |
163 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT | 163 | #define REVERSI_BUTTON_LEFT BUTTON_LEFT |
164 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT | 164 | #define REVERSI_BUTTON_RIGHT BUTTON_RIGHT |
165 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_PLAY | 165 | #define REVERSI_BUTTON_MAKE_MOVE BUTTON_SELECT |
166 | #define REVERSI_BUTTON_MENU BUTTON_MENU | 166 | #define REVERSI_BUTTON_MENU BUTTON_MENU |
167 | 167 | ||
168 | #else | 168 | #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 | |||
243 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 243 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
244 | #define ROCKBLOX_OFF BUTTON_BACK | 244 | #define ROCKBLOX_OFF BUTTON_BACK |
245 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP | 245 | #define ROCKBLOX_ROTATE_RIGHT BUTTON_UP |
246 | #define ROCKBLOX_ROTATE_LEFT BUTTON_SELECT | 246 | #define ROCKBLOX_ROTATE_LEFT BUTTON_PLAY |
247 | #define ROCKBLOX_DOWN BUTTON_DOWN | 247 | #define ROCKBLOX_DOWN BUTTON_DOWN |
248 | #define ROCKBLOX_LEFT BUTTON_LEFT | 248 | #define ROCKBLOX_LEFT BUTTON_LEFT |
249 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 249 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
250 | #define ROCKBLOX_DROP BUTTON_PLAY | 250 | #define ROCKBLOX_DROP BUTTON_SELECT |
251 | #define ROCKBLOX_RESTART BUTTON_CUSTOM | 251 | #define ROCKBLOX_RESTART BUTTON_CUSTOM |
252 | 252 | ||
253 | #else | 253 | #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 | |||
87 | #define ONEDROCKBLOX_QUIT BUTTON_POWER | 87 | #define ONEDROCKBLOX_QUIT BUTTON_POWER |
88 | 88 | ||
89 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 89 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
90 | #define ONEDROCKBLOX_DOWN BUTTON_PLAY | 90 | #define ONEDROCKBLOX_DOWN BUTTON_SELECT |
91 | #define ONEDROCKBLOX_QUIT BUTTON_BACK | 91 | #define ONEDROCKBLOX_QUIT BUTTON_BACK |
92 | 92 | ||
93 | #else | 93 | #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) | |||
225 | options.DOWN=BUTTON_DOWN; | 225 | options.DOWN=BUTTON_DOWN; |
226 | 226 | ||
227 | options.A=BUTTON_CUSTOM; | 227 | options.A=BUTTON_CUSTOM; |
228 | options.B=BUTTON_SELECT; | 228 | options.B=BUTTON_PLAY; |
229 | options.START=BUTTON_BACK; | 229 | options.START=BUTTON_BACK; |
230 | options.SELECT=BUTTON_PLAY; | 230 | options.SELECT=BUTTON_SELECT; |
231 | options.MENU=BUTTON_MENU; | 231 | options.MENU=BUTTON_MENU; |
232 | #else | 232 | #else |
233 | #error No Keymap Defined! | 233 | #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 | |||
123 | 123 | ||
124 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 124 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
125 | #define ROCKPAINT_QUIT BUTTON_BACK | 125 | #define ROCKPAINT_QUIT BUTTON_BACK |
126 | #define ROCKPAINT_DRAW BUTTON_PLAY | 126 | #define ROCKPAINT_DRAW BUTTON_SELECT |
127 | #define ROCKPAINT_MENU BUTTON_MENU | 127 | #define ROCKPAINT_MENU BUTTON_MENU |
128 | #define ROCKPAINT_TOOLBAR BUTTON_SELECT | 128 | #define ROCKPAINT_TOOLBAR BUTTON_PLAY |
129 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_SELECT | BUTTON_LEFT ) | 129 | #define ROCKPAINT_TOOLBAR2 ( BUTTON_PLAY | BUTTON_LEFT ) |
130 | #define ROCKPAINT_UP BUTTON_UP | 130 | #define ROCKPAINT_UP BUTTON_UP |
131 | #define ROCKPAINT_DOWN BUTTON_DOWN | 131 | #define ROCKPAINT_DOWN BUTTON_DOWN |
132 | #define ROCKPAINT_LEFT BUTTON_LEFT | 132 | #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 | |||
159 | #define PUZZLE_RIGHT BUTTON_RIGHT | 159 | #define PUZZLE_RIGHT BUTTON_RIGHT |
160 | #define PUZZLE_UP BUTTON_UP | 160 | #define PUZZLE_UP BUTTON_UP |
161 | #define PUZZLE_DOWN BUTTON_DOWN | 161 | #define PUZZLE_DOWN BUTTON_DOWN |
162 | #define PUZZLE_SHUFFLE BUTTON_SELECT | 162 | #define PUZZLE_SHUFFLE BUTTON_PLAY |
163 | #define PUZZLE_PICTURE BUTTON_MENU | 163 | #define PUZZLE_PICTURE BUTTON_MENU |
164 | 164 | ||
165 | #else | 165 | #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 | |||
152 | #define SNAKE_RIGHT BUTTON_RIGHT | 152 | #define SNAKE_RIGHT BUTTON_RIGHT |
153 | #define SNAKE_UP BUTTON_UP | 153 | #define SNAKE_UP BUTTON_UP |
154 | #define SNAKE_DOWN BUTTON_DOWN | 154 | #define SNAKE_DOWN BUTTON_DOWN |
155 | #define SNAKE_PLAYPAUSE BUTTON_SELECT | 155 | #define SNAKE_PLAYPAUSE BUTTON_PLAY |
156 | 156 | ||
157 | #else | 157 | #else |
158 | #error No keymap defined! | 158 | #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 | |||
318 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT | 318 | #define SNAKE2_MAZE_NEXT BUTTON_RIGHT |
319 | #define SNAKE2_MAZE_LAST BUTTON_LEFT | 319 | #define SNAKE2_MAZE_LAST BUTTON_LEFT |
320 | #define SNAKE2_SELECT_TYPE BUTTON_MENU | 320 | #define SNAKE2_SELECT_TYPE BUTTON_MENU |
321 | #define SNAKE2_PLAYPAUSE BUTTON_SELECT | 321 | #define SNAKE2_PLAYPAUSE BUTTON_PLAY |
322 | #define SNAKE2_PLAYPAUSE_TEXT "Play" | 322 | #define SNAKE2_PLAYPAUSE_TEXT "Play" |
323 | 323 | ||
324 | #else | 324 | #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; | |||
334 | # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_SELECT) | 334 | # define SOL_REM2CUR (BUTTON_LEFT | BUTTON_SELECT) |
335 | # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) | 335 | # define SOL_CUR2STACK (BUTTON_SELECT | BUTTON_REPEAT) |
336 | # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_SELECT) | 336 | # define SOL_REM2STACK (BUTTON_RIGHT | BUTTON_SELECT) |
337 | # define HK_MOVE "PLAY" | 337 | # define HK_MOVE "MIDDLE" |
338 | # define HK_DRAW "MENU" | 338 | # define HK_DRAW "MENU" |
339 | # define HK_REM2CUR "PLAY+LEFT" | 339 | # define HK_REM2CUR "PLAY+LEFT" |
340 | # define HK_CUR2STACK "PLAY.." | 340 | # 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 */ | |||
217 | #define AST_QUIT BUTTON_POWER | 217 | #define AST_QUIT BUTTON_POWER |
218 | 218 | ||
219 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 219 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
220 | #define AST_PAUSE BUTTON_SELECT | 220 | #define AST_PAUSE BUTTON_PLAY |
221 | #define AST_QUIT BUTTON_BACK | 221 | #define AST_QUIT BUTTON_BACK |
222 | #define AST_THRUST_REP BUTTON_UP | BUTTON_REPEAT | 222 | #define AST_THRUST_REP (BUTTON_UP | BUTTON_REPEAT) |
223 | #define AST_THRUST BUTTON_UP | 223 | #define AST_THRUST BUTTON_UP |
224 | #define AST_HYPERSPACE BUTTON_DOWN | 224 | #define AST_HYPERSPACE BUTTON_DOWN |
225 | #define AST_LEFT BUTTON_LEFT | 225 | #define AST_LEFT BUTTON_LEFT |
226 | #define AST_LEFT_REP BUTTON_LEFT | BUTTON_REPEAT | 226 | #define AST_LEFT_REP (BUTTON_LEFT | BUTTON_REPEAT) |
227 | #define AST_RIGHT BUTTON_RIGHT | 227 | #define AST_RIGHT BUTTON_RIGHT |
228 | #define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT) | 228 | #define AST_RIGHT_REP (BUTTON_RIGHT | BUTTON_REPEAT) |
229 | #define AST_FIRE BUTTON_PLAY | 229 | #define AST_FIRE BUTTON_SELECT |
230 | #define AST_FIRE_REP BUTTON_PLAY | BUTTON_REPEAT | 230 | #define AST_FIRE_REP (BUTTON_SELECT | BUTTON_REPEAT) |
231 | 231 | ||
232 | #else | 232 | #else |
233 | #error No keymap defined! | 233 | #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 | |||
161 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 161 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
162 | #define STOPWATCH_QUIT BUTTON_BACK | 162 | #define STOPWATCH_QUIT BUTTON_BACK |
163 | #define STOPWATCH_START_STOP BUTTON_PLAY | 163 | #define STOPWATCH_START_STOP BUTTON_PLAY |
164 | #define STOPWATCH_RESET_TIMER BUTTON_CUSTOM | 164 | #define STOPWATCH_RESET_TIMER BUTTON_SELECT |
165 | #define STOPWATCH_LAP_TIMER BUTTON_SELECT | 165 | #define STOPWATCH_LAP_TIMER BUTTON_CUSTOM |
166 | #define STOPWATCH_SCROLL_UP BUTTON_UP | 166 | #define STOPWATCH_SCROLL_UP BUTTON_UP |
167 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN | 167 | #define STOPWATCH_SCROLL_DOWN BUTTON_DOWN |
168 | #else | 168 | #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 @@ | |||
216 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 216 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
217 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 217 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
218 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 218 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
219 | #define SUDOKU_BUTTON_TOGGLE BUTTON_PLAY | 219 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT |
220 | #define SUDOKU_BUTTON_MENU BUTTON_MENU | 220 | #define SUDOKU_BUTTON_MENU BUTTON_MENU |
221 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_SELECT | 221 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
222 | 222 | ||
223 | #else | 223 | #else |
224 | #error No keymap defined! | 224 | #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]; | |||
133 | #define SUPERDOM_CANCEL BUTTON_POWER | 133 | #define SUPERDOM_CANCEL BUTTON_POWER |
134 | 134 | ||
135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 135 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
136 | #define SUPERDOM_OK BUTTON_PLAY | 136 | #define SUPERDOM_OK BUTTON_SELECT |
137 | #define SUPERDOM_UP BUTTON_UP | 137 | #define SUPERDOM_UP BUTTON_UP |
138 | #define SUPERDOM_DOWN BUTTON_DOWN | 138 | #define SUPERDOM_DOWN BUTTON_DOWN |
139 | #define SUPERDOM_LEFT BUTTON_LEFT | 139 | #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 | |||
229 | #define VUMETER_MENU_EXIT BUTTON_MENU | 229 | #define VUMETER_MENU_EXIT BUTTON_MENU |
230 | #define VUMETER_UP BUTTON_UP | 230 | #define VUMETER_UP BUTTON_UP |
231 | #define VUMETER_DOWN BUTTON_DOWN | 231 | #define VUMETER_DOWN BUTTON_DOWN |
232 | #define LABEL_HELP "PLAY" | 232 | #define LABEL_HELP "MIDDLE" |
233 | #define LABEL_QUIT "BACK" | 233 | #define LABEL_QUIT "BACK" |
234 | #define LABEL_MENU "MENU" | 234 | #define LABEL_MENU "MENU" |
235 | #define LABEL_VOLUME "UP/DOWN" | 235 | #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 | |||
241 | #define BTN_DIR_DOWN BUTTON_DOWN | 241 | #define BTN_DIR_DOWN BUTTON_DOWN |
242 | #define BTN_DIR_LEFT BUTTON_LEFT | 242 | #define BTN_DIR_LEFT BUTTON_LEFT |
243 | #define BTN_DIR_RIGHT BUTTON_RIGHT | 243 | #define BTN_DIR_RIGHT BUTTON_RIGHT |
244 | #define BTN_STARTPAUSE BUTTON_SELECT | 244 | #define BTN_STARTPAUSE BUTTON_PLAY |
245 | #define BTN_QUIT BUTTON_BACK | 245 | #define BTN_QUIT BUTTON_BACK |
246 | #define BTN_STOPRESET BUTTON_MENU | 246 | #define BTN_STOPRESET BUTTON_MENU |
247 | 247 | ||
248 | #define PLAYERS_TEXT "Up/Down" | 248 | #define PLAYERS_TEXT "Up/Down" |
249 | #define WORMS_TEXT "Left/Right" | 249 | #define WORMS_TEXT "Left/Right" |
250 | |||
251 | #else | 250 | #else |
252 | #error No keymap defined! | 251 | #error No keymap defined! |
253 | #endif | 252 | #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 | |||
171 | #define RIGHT BUTTON_RIGHT | 171 | #define RIGHT BUTTON_RIGHT |
172 | #define UP BUTTON_UP | 172 | #define UP BUTTON_UP |
173 | #define DOWN BUTTON_DOWN | 173 | #define DOWN BUTTON_DOWN |
174 | #define PAUSE BUTTON_SELECT | 174 | #define PAUSE BUTTON_PLAY |
175 | 175 | ||
176 | #else | 176 | #else |
177 | #error No keymap defined! | 177 | #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 @@ | |||
135 | #define ZX_DOWN BUTTON_DOWN | 135 | #define ZX_DOWN BUTTON_DOWN |
136 | #define ZX_LEFT BUTTON_LEFT | 136 | #define ZX_LEFT BUTTON_LEFT |
137 | #define ZX_RIGHT BUTTON_RIGHT | 137 | #define ZX_RIGHT BUTTON_RIGHT |
138 | #define ZX_SELECT BUTTON_PLAY | 138 | #define ZX_SELECT BUTTON_SELECT |
139 | #define ZX_MENU BUTTON_MENU | 139 | #define ZX_MENU BUTTON_MENU |
140 | 140 | ||
141 | #else | 141 | #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 @@ | |||
148 | 148 | ||
149 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 149 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
150 | 150 | ||
151 | #define KBD_SELECT BUTTON_PLAY | 151 | #define KBD_SELECT BUTTON_SELECT |
152 | #define KBD_ABORT BUTTON_BACK | 152 | #define KBD_ABORT BUTTON_BACK |
153 | #define KBD_LEFT BUTTON_LEFT | 153 | #define KBD_LEFT BUTTON_LEFT |
154 | #define KBD_RIGHT BUTTON_RIGHT | 154 | #define KBD_RIGHT BUTTON_RIGHT |