diff options
author | Jean-Louis Biasini <metaphysiciendouteux@jabber.org> | 2012-01-15 02:28:10 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2012-01-15 02:29:30 +0100 |
commit | 7f26a10d31911c3468312563cd2667a96278944b (patch) | |
tree | fb3873673a18e08d155064f1c8bbe2b1adb481d1 | |
parent | 35ba39e57f3e1af32f4b3fd24ef633243b36d30e (diff) | |
download | rockbox-7f26a10d31911c3468312563cd2667a96278944b.tar.gz rockbox-7f26a10d31911c3468312563cd2667a96278944b.zip |
fuzeplus: update plugins keymaps (FS#12405)
Signed-off-by: Amaury Pouly <amaury.pouly@gmail.com>
Change-Id: Ib94cec07c80892eb50471c87b83e2701911ea0d7
-rw-r--r-- | apps/plugins/blackjack.c | 6 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 7 | ||||
-rw-r--r-- | apps/plugins/clix.c | 4 | ||||
-rw-r--r-- | apps/plugins/doom/i_video.c | 34 | ||||
-rw-r--r-- | apps/plugins/flipit.c | 2 | ||||
-rw-r--r-- | apps/plugins/goban/goban.h | 6 | ||||
-rw-r--r-- | apps/plugins/jewels.c | 4 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 2 | ||||
-rw-r--r-- | apps/plugins/minesweeper.c | 4 | ||||
-rw-r--r-- | apps/plugins/pacbox/pacbox.h | 2 | ||||
-rw-r--r-- | apps/plugins/pong.c | 11 | ||||
-rw-r--r-- | apps/plugins/rockblox.c | 16 | ||||
-rw-r--r-- | apps/plugins/sliding_puzzle.c | 4 | ||||
-rw-r--r-- | apps/plugins/snake2.c | 2 | ||||
-rw-r--r-- | apps/plugins/sokoban.c | 12 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 26 | ||||
-rw-r--r-- | apps/plugins/spacerocks.c | 2 | ||||
-rw-r--r-- | apps/plugins/star.c | 2 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 9 |
19 files changed, 56 insertions, 99 deletions
diff --git a/apps/plugins/blackjack.c b/apps/plugins/blackjack.c index bbadb76159..ab4da37b0a 100644 --- a/apps/plugins/blackjack.c +++ b/apps/plugins/blackjack.c | |||
@@ -459,10 +459,8 @@ enum { | |||
459 | #define BJACK_DOUBLE_NAME "BACK" | 459 | #define BJACK_DOUBLE_NAME "BACK" |
460 | #define BJACK_SELECT BUTTON_SELECT | 460 | #define BJACK_SELECT BUTTON_SELECT |
461 | #define BJACK_QUIT BUTTON_POWER | 461 | #define BJACK_QUIT BUTTON_POWER |
462 | #define BJACK_MAX BUTTON_BOTTOMRIGHT | 462 | #define BJACK_STAY BUTTON_PLAYPAUSE |
463 | #define BJACK_MIN BUTTON_BOTTOMLEFT | 463 | #define BJACK_DOUBLEDOWN BUTTON_BACK |
464 | #define BJACK_STAY BUTTON_BACK | ||
465 | #define BJACK_DOUBLEDOWN BUTTON_PLAYPAUSE | ||
466 | #define BJACK_UP BUTTON_UP | 464 | #define BJACK_UP BUTTON_UP |
467 | #define BJACK_DOWN BUTTON_DOWN | 465 | #define BJACK_DOWN BUTTON_DOWN |
468 | #define BJACK_RIGHT BUTTON_RIGHT | 466 | #define BJACK_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 077b3091d8..765e52ec8c 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -402,10 +402,9 @@ | |||
402 | #define CB_DOWN BUTTON_DOWN | 402 | #define CB_DOWN BUTTON_DOWN |
403 | #define CB_LEFT BUTTON_LEFT | 403 | #define CB_LEFT BUTTON_LEFT |
404 | #define CB_RIGHT BUTTON_RIGHT | 404 | #define CB_RIGHT BUTTON_RIGHT |
405 | #define CB_PLAY (BUTTON_PLAYPAUSE | BUTTON_REPEAT) | 405 | #define CB_PLAY BUTTON_PLAYPAUSE |
406 | #define CB_LEVEL BUTTON_BOTTOMRIGHT | 406 | #define CB_LEVEL BUTTON_BACK |
407 | #define CB_RESTART (BUTTON_BACK | BUTTON_REPEAT) | 407 | #define CB_MENU (BUTTON_PLAYPAUSE | BUTTON_REPEAT) |
408 | #define CB_MENU BUTTON_POWER | ||
409 | 408 | ||
410 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 409 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
411 | #define CB_SELECT BUTTON_SELECT | 410 | #define CB_SELECT BUTTON_SELECT |
diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c index 88b6d44fa9..06fe0d84e0 100644 --- a/apps/plugins/clix.c +++ b/apps/plugins/clix.c | |||
@@ -190,10 +190,10 @@ | |||
190 | #define CLIX_BUTTON_QUIT BUTTON_POWER | 190 | #define CLIX_BUTTON_QUIT BUTTON_POWER |
191 | #define CLIX_BUTTON_UP BUTTON_UP | 191 | #define CLIX_BUTTON_UP BUTTON_UP |
192 | #define CLIX_BUTTON_DOWN BUTTON_DOWN | 192 | #define CLIX_BUTTON_DOWN BUTTON_DOWN |
193 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_BACK | ||
194 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_PLAYPAUSE | ||
193 | #define CLIX_BUTTON_LEFT BUTTON_LEFT | 195 | #define CLIX_BUTTON_LEFT BUTTON_LEFT |
194 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT | 196 | #define CLIX_BUTTON_RIGHT BUTTON_RIGHT |
195 | #define CLIX_BUTTON_SCROLL_FWD BUTTON_BOTTOMRIGHT | ||
196 | #define CLIX_BUTTON_SCROLL_BACK BUTTON_BOTTOMLEFT | ||
197 | #define CLIX_BUTTON_CLICK BUTTON_SELECT | 197 | #define CLIX_BUTTON_CLICK BUTTON_SELECT |
198 | 198 | ||
199 | #else | 199 | #else |
diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 1216061477..9009acc67f 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c | |||
@@ -168,7 +168,6 @@ void I_ShutdownGraphics(void) | |||
168 | #define DOOMBUTTON_SHOOT BUTTON_PLAY | 168 | #define DOOMBUTTON_SHOOT BUTTON_PLAY |
169 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 169 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
170 | #define DOOMBUTTON_OPEN BUTTON_MENU | 170 | #define DOOMBUTTON_OPEN BUTTON_MENU |
171 | |||
172 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 171 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD |
173 | #define DOOMBUTTON_UP BUTTON_UP | 172 | #define DOOMBUTTON_UP BUTTON_UP |
174 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 173 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -179,7 +178,6 @@ void I_ShutdownGraphics(void) | |||
179 | #define DOOMBUTTON_ESC BUTTON_POWER | 178 | #define DOOMBUTTON_ESC BUTTON_POWER |
180 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 179 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
181 | #define DOOMBUTTON_WEAPON BUTTON_REC | 180 | #define DOOMBUTTON_WEAPON BUTTON_REC |
182 | |||
183 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD | 181 | #elif CONFIG_KEYPAD == IRIVER_H10_PAD |
184 | #define DOOMBUTTON_UP BUTTON_SCROLL_UP | 182 | #define DOOMBUTTON_UP BUTTON_SCROLL_UP |
185 | #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN | 183 | #define DOOMBUTTON_DOWN BUTTON_SCROLL_DOWN |
@@ -190,7 +188,6 @@ void I_ShutdownGraphics(void) | |||
190 | #define DOOMBUTTON_ESC BUTTON_POWER | 188 | #define DOOMBUTTON_ESC BUTTON_POWER |
191 | #define DOOMBUTTON_ENTER BUTTON_REW | 189 | #define DOOMBUTTON_ENTER BUTTON_REW |
192 | #define DOOMBUTTON_WEAPON BUTTON_FF | 190 | #define DOOMBUTTON_WEAPON BUTTON_FF |
193 | |||
194 | #elif CONFIG_KEYPAD == SANSA_E200_PAD | 191 | #elif CONFIG_KEYPAD == SANSA_E200_PAD |
195 | #define DOOMBUTTON_SCROLLWHEEL | 192 | #define DOOMBUTTON_SCROLLWHEEL |
196 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK | 193 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
@@ -204,7 +201,6 @@ void I_ShutdownGraphics(void) | |||
204 | #define DOOMBUTTON_ESC BUTTON_POWER | 201 | #define DOOMBUTTON_ESC BUTTON_POWER |
205 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 202 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
206 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 203 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
207 | |||
208 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD | 204 | #elif CONFIG_KEYPAD == SANSA_FUZE_PAD |
209 | #define DOOMBUTTON_SCROLLWHEEL | 205 | #define DOOMBUTTON_SCROLLWHEEL |
210 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK | 206 | #define DOOMBUTTON_SCROLLWHEEL_CC BUTTON_SCROLL_BACK |
@@ -218,7 +214,6 @@ void I_ShutdownGraphics(void) | |||
218 | #define DOOMBUTTON_ESC BUTTON_HOME | 214 | #define DOOMBUTTON_ESC BUTTON_HOME |
219 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 215 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
220 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW | 216 | #define DOOMBUTTON_WEAPON DOOMBUTTON_SCROLLWHEEL_CW |
221 | |||
222 | #elif CONFIG_KEYPAD == SANSA_C200_PAD | 217 | #elif CONFIG_KEYPAD == SANSA_C200_PAD |
223 | #define DOOMBUTTON_UP BUTTON_UP | 218 | #define DOOMBUTTON_UP BUTTON_UP |
224 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 219 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -229,7 +224,6 @@ void I_ShutdownGraphics(void) | |||
229 | #define DOOMBUTTON_ESC BUTTON_POWER | 224 | #define DOOMBUTTON_ESC BUTTON_POWER |
230 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 225 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
231 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 226 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
232 | |||
233 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD | 227 | #elif CONFIG_KEYPAD == SANSA_CLIP_PAD |
234 | #define DOOMBUTTON_UP BUTTON_UP | 228 | #define DOOMBUTTON_UP BUTTON_UP |
235 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 229 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -240,7 +234,6 @@ void I_ShutdownGraphics(void) | |||
240 | #define DOOMBUTTON_ESC BUTTON_POWER | 234 | #define DOOMBUTTON_ESC BUTTON_POWER |
241 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 235 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
242 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP | 236 | #define DOOMBUTTON_WEAPON BUTTON_VOL_UP |
243 | |||
244 | #elif CONFIG_KEYPAD == GIGABEAT_PAD | 237 | #elif CONFIG_KEYPAD == GIGABEAT_PAD |
245 | #define DOOMBUTTON_UP BUTTON_UP | 238 | #define DOOMBUTTON_UP BUTTON_UP |
246 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 239 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -252,7 +245,6 @@ void I_ShutdownGraphics(void) | |||
252 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 245 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
253 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 246 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
254 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 247 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
255 | |||
256 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD | 248 | #elif CONFIG_KEYPAD == GIGABEAT_S_PAD |
257 | #define DOOMBUTTON_UP BUTTON_UP | 249 | #define DOOMBUTTON_UP BUTTON_UP |
258 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 250 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -264,7 +256,6 @@ void I_ShutdownGraphics(void) | |||
264 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 256 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
265 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 257 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
266 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 258 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
267 | |||
268 | #elif CONFIG_KEYPAD == MROBE500_PAD | 259 | #elif CONFIG_KEYPAD == MROBE500_PAD |
269 | #define DOOMBUTTON_ESC BUTTON_POWER | 260 | #define DOOMBUTTON_ESC BUTTON_POWER |
270 | #define DOOMBUTTON_UP BUTTON_RC_PLAY | 261 | #define DOOMBUTTON_UP BUTTON_RC_PLAY |
@@ -275,7 +266,6 @@ void I_ShutdownGraphics(void) | |||
275 | #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP | 266 | #define DOOMBUTTON_SHOOT BUTTON_RC_VOL_UP |
276 | #define DOOMBUTTON_ENTER BUTTON_RC_MODE | 267 | #define DOOMBUTTON_ENTER BUTTON_RC_MODE |
277 | #define DOOMBUTTON_WEAPON BUTTON_RC_HEART | 268 | #define DOOMBUTTON_WEAPON BUTTON_RC_HEART |
278 | |||
279 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ | 269 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD || \ |
280 | CONFIG_KEYPAD == IRIVER_H300_PAD | 270 | CONFIG_KEYPAD == IRIVER_H300_PAD |
281 | #define DOOMBUTTON_UP BUTTON_UP | 271 | #define DOOMBUTTON_UP BUTTON_UP |
@@ -287,7 +277,6 @@ void I_ShutdownGraphics(void) | |||
287 | #define DOOMBUTTON_ESC BUTTON_OFF | 277 | #define DOOMBUTTON_ESC BUTTON_OFF |
288 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 278 | #define DOOMBUTTON_ENTER BUTTON_SELECT |
289 | #define DOOMBUTTON_WEAPON BUTTON_ON | 279 | #define DOOMBUTTON_WEAPON BUTTON_ON |
290 | |||
291 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD | 280 | #elif CONFIG_KEYPAD == IAUDIO_M3_PAD |
292 | #define DOOMBUTTON_ESC BUTTON_RC_REC | 281 | #define DOOMBUTTON_ESC BUTTON_RC_REC |
293 | #define DOOMBUTTON_UP BUTTON_RC_VOL_UP | 282 | #define DOOMBUTTON_UP BUTTON_RC_VOL_UP |
@@ -298,13 +287,11 @@ void I_ShutdownGraphics(void) | |||
298 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE | 287 | #define DOOMBUTTON_SHOOT BUTTON_RC_MODE |
299 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY | 288 | #define DOOMBUTTON_ENTER BUTTON_RC_PLAY |
300 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU | 289 | #define DOOMBUTTON_WEAPON BUTTON_RC_MENU |
301 | |||
302 | #elif CONFIG_KEYPAD == COWON_D2_PAD | 290 | #elif CONFIG_KEYPAD == COWON_D2_PAD |
303 | #define DOOMBUTTON_ESC BUTTON_POWER | 291 | #define DOOMBUTTON_ESC BUTTON_POWER |
304 | #define DOOMBUTTON_SHOOT BUTTON_PLUS | 292 | #define DOOMBUTTON_SHOOT BUTTON_PLUS |
305 | #define DOOMBUTTON_WEAPON BUTTON_MINUS | 293 | #define DOOMBUTTON_WEAPON BUTTON_MINUS |
306 | #define DOOMBUTTON_MAP BUTTON_MENU | 294 | #define DOOMBUTTON_MAP BUTTON_MENU |
307 | |||
308 | #elif CONFIG_KEYPAD == MROBE100_PAD | 295 | #elif CONFIG_KEYPAD == MROBE100_PAD |
309 | #define DOOMBUTTON_UP BUTTON_UP | 296 | #define DOOMBUTTON_UP BUTTON_UP |
310 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 297 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -315,7 +302,6 @@ void I_ShutdownGraphics(void) | |||
315 | #define DOOMBUTTON_ESC BUTTON_POWER | 302 | #define DOOMBUTTON_ESC BUTTON_POWER |
316 | #define DOOMBUTTON_ENTER BUTTON_MENU | 303 | #define DOOMBUTTON_ENTER BUTTON_MENU |
317 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY | 304 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY |
318 | |||
319 | #elif CONFIG_KEYPAD == IAUDIO67_PAD | 305 | #elif CONFIG_KEYPAD == IAUDIO67_PAD |
320 | #define DOOMBUTTON_ESC BUTTON_POWER | 306 | #define DOOMBUTTON_ESC BUTTON_POWER |
321 | #define DOOMBUTTON_UP BUTTON_STOP | 307 | #define DOOMBUTTON_UP BUTTON_STOP |
@@ -325,7 +311,6 @@ void I_ShutdownGraphics(void) | |||
325 | #define DOOMBUTTON_SHOOT BUTTON_VOLUP | 311 | #define DOOMBUTTON_SHOOT BUTTON_VOLUP |
326 | #define DOOMBUTTON_OPEN BUTTON_VOLDOWN | 312 | #define DOOMBUTTON_OPEN BUTTON_VOLDOWN |
327 | #define DOOMBUTTON_ENTER BUTTON_MENU | 313 | #define DOOMBUTTON_ENTER BUTTON_MENU |
328 | |||
329 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD | 314 | #elif CONFIG_KEYPAD == CREATIVEZVM_PAD |
330 | #define DOOMBUTTON_UP BUTTON_UP | 315 | #define DOOMBUTTON_UP BUTTON_UP |
331 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 316 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -337,7 +322,6 @@ void I_ShutdownGraphics(void) | |||
337 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 322 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
338 | #define DOOMBUTTON_WEAPON BUTTON_MENU | 323 | #define DOOMBUTTON_WEAPON BUTTON_MENU |
339 | #define DOOMBUTTON_MAP BUTTON_CUSTOM | 324 | #define DOOMBUTTON_MAP BUTTON_CUSTOM |
340 | |||
341 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD | 325 | #elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD |
342 | #define DOOMBUTTON_UP BUTTON_UP | 326 | #define DOOMBUTTON_UP BUTTON_UP |
343 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 327 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -349,7 +333,6 @@ void I_ShutdownGraphics(void) | |||
349 | #define DOOMBUTTON_ENTER BUTTON_VIEW | 333 | #define DOOMBUTTON_ENTER BUTTON_VIEW |
350 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 334 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
351 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 335 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
352 | |||
353 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD | 336 | #elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD |
354 | #define DOOMBUTTON_UP BUTTON_UP | 337 | #define DOOMBUTTON_UP BUTTON_UP |
355 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 338 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -361,7 +344,6 @@ void I_ShutdownGraphics(void) | |||
361 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 344 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
362 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 345 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
363 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 346 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
364 | |||
365 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD | 347 | #elif CONFIG_KEYPAD == PHILIPS_SA9200_PAD |
366 | #define DOOMBUTTON_UP BUTTON_UP | 348 | #define DOOMBUTTON_UP BUTTON_UP |
367 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 349 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -373,16 +355,13 @@ void I_ShutdownGraphics(void) | |||
373 | #define DOOMBUTTON_ENTER BUTTON_LEFT | 355 | #define DOOMBUTTON_ENTER BUTTON_LEFT |
374 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 356 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
375 | #define DOOMBUTTON_MAP BUTTON_VOL_UP | 357 | #define DOOMBUTTON_MAP BUTTON_VOL_UP |
376 | |||
377 | #elif CONFIG_KEYPAD == ONDAVX747_PAD | 358 | #elif CONFIG_KEYPAD == ONDAVX747_PAD |
378 | #define DOOMBUTTON_ESC BUTTON_POWER | 359 | #define DOOMBUTTON_ESC BUTTON_POWER |
379 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP | 360 | #define DOOMBUTTON_SHOOT BUTTON_VOL_UP |
380 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN | 361 | #define DOOMBUTTON_WEAPON BUTTON_VOL_DOWN |
381 | #define DOOMBUTTON_MAP BUTTON_MENU | 362 | #define DOOMBUTTON_MAP BUTTON_MENU |
382 | |||
383 | #elif CONFIG_KEYPAD == ONDAVX777_PAD | 363 | #elif CONFIG_KEYPAD == ONDAVX777_PAD |
384 | #define DOOMBUTTON_ESC BUTTON_POWER | 364 | #define DOOMBUTTON_ESC BUTTON_POWER |
385 | |||
386 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD | 365 | #elif CONFIG_KEYPAD == SAMSUNG_YH_PAD |
387 | #define DOOMBUTTON_UP BUTTON_UP | 366 | #define DOOMBUTTON_UP BUTTON_UP |
388 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 367 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -394,7 +373,6 @@ void I_ShutdownGraphics(void) | |||
394 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) | 373 | #define DOOMBUTTON_ENTER (BUTTON_PLAY|BUTTON_RIGHT) |
395 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) | 374 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_UP) |
396 | #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) | 375 | #define DOOMBUTTON_MAP (BUTTON_PLAY|BUTTON_DOWN) |
397 | |||
398 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 376 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
399 | #define DOOMBUTTON_UP BUTTON_OK | 377 | #define DOOMBUTTON_UP BUTTON_OK |
400 | #define DOOMBUTTON_DOWN BUTTON_CANCEL | 378 | #define DOOMBUTTON_DOWN BUTTON_CANCEL |
@@ -405,7 +383,6 @@ void I_ShutdownGraphics(void) | |||
405 | #define DOOMBUTTON_ESC BUTTON_REC | 383 | #define DOOMBUTTON_ESC BUTTON_REC |
406 | #define DOOMBUTTON_ENTER BUTTON_POWER | 384 | #define DOOMBUTTON_ENTER BUTTON_POWER |
407 | #define DOOMBUTTON_WEAPON BUTTON_PLAY | 385 | #define DOOMBUTTON_WEAPON BUTTON_PLAY |
408 | |||
409 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD | 386 | #elif CONFIG_KEYPAD == MPIO_HD200_PAD |
410 | #define DOOMBUTTON_UP BUTTON_REW | 387 | #define DOOMBUTTON_UP BUTTON_REW |
411 | #define DOOMBUTTON_DOWN BUTTON_FF | 388 | #define DOOMBUTTON_DOWN BUTTON_FF |
@@ -416,7 +393,6 @@ void I_ShutdownGraphics(void) | |||
416 | #define DOOMBUTTON_ESC BUTTON_REC | 393 | #define DOOMBUTTON_ESC BUTTON_REC |
417 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 394 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
418 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 395 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) |
419 | |||
420 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD | 396 | #elif CONFIG_KEYPAD == MPIO_HD300_PAD |
421 | #define DOOMBUTTON_UP BUTTON_UP | 397 | #define DOOMBUTTON_UP BUTTON_UP |
422 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 398 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
@@ -427,20 +403,16 @@ void I_ShutdownGraphics(void) | |||
427 | #define DOOMBUTTON_ESC BUTTON_REC | 403 | #define DOOMBUTTON_ESC BUTTON_REC |
428 | #define DOOMBUTTON_ENTER BUTTON_PLAY | 404 | #define DOOMBUTTON_ENTER BUTTON_PLAY |
429 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) | 405 | #define DOOMBUTTON_WEAPON (BUTTON_PLAY|BUTTON_REPEAT) |
430 | |||
431 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 406 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
432 | #define DOOMBUTTON_UP BUTTON_UP | 407 | #define DOOMBUTTON_UP BUTTON_UP |
433 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 408 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
434 | #define DOOMBUTTON_LEFT BUTTON_LEFT | 409 | #define DOOMBUTTON_LEFT BUTTON_LEFT |
435 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | 410 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT |
411 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
436 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE | 412 | #define DOOMBUTTON_OPEN BUTTON_PLAYPAUSE |
437 | #define DOOMBUTTON_QUIT BUTTON_POWER | ||
438 | #define DOOMBUTTON_ESC BUTTON_BACK | 413 | #define DOOMBUTTON_ESC BUTTON_BACK |
439 | #define DOOMBUTTON_ENTER BUTTON_SELECT | 414 | #define DOOMBUTTON_ENTER (BUTTON_PLAYPAUSE|BUTTON_REPEAT) |
440 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 415 | #define DOOMBUTTON_WEAPON (BUTTON_SELECT|BUTTON_REPEAT) |
441 | #define DOOMBUTTON_WEAPON BUTTON_BOTTOMLEFT | ||
442 | #define DOOMBUTTON_MAP BUTTON_BOTTOMRIGHT | ||
443 | |||
444 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 416 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
445 | #define DOOMBUTTON_UP BUTTON_UP | 417 | #define DOOMBUTTON_UP BUTTON_UP |
446 | #define DOOMBUTTON_DOWN BUTTON_DOWN | 418 | #define DOOMBUTTON_DOWN BUTTON_DOWN |
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c index 126748dca9..da5a9e8c6b 100644 --- a/apps/plugins/flipit.c +++ b/apps/plugins/flipit.c | |||
@@ -365,7 +365,7 @@ | |||
365 | #define FLIPIT_QUIT BUTTON_POWER | 365 | #define FLIPIT_QUIT BUTTON_POWER |
366 | #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE | 366 | #define FLIPIT_SHUFFLE BUTTON_PLAYPAUSE |
367 | #define FLIPIT_SOLVE BUTTON_BACK | 367 | #define FLIPIT_SOLVE BUTTON_BACK |
368 | #define FLIPIT_STEP_BY_STEP BUTTON_BOTTOMLEFT | 368 | #define FLIPIT_STEP_BY_STEP (BUTTON_BACK|BUTTON_PLAYPAUSE) |
369 | #define FLIPIT_TOGGLE BUTTON_SELECT | 369 | #define FLIPIT_TOGGLE BUTTON_SELECT |
370 | 370 | ||
371 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 371 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
diff --git a/apps/plugins/goban/goban.h b/apps/plugins/goban/goban.h index e305c58dc3..20940d74f0 100644 --- a/apps/plugins/goban/goban.h +++ b/apps/plugins/goban/goban.h | |||
@@ -359,12 +359,10 @@ | |||
359 | #define GBN_BUTTON_DOWN BUTTON_DOWN | 359 | #define GBN_BUTTON_DOWN BUTTON_DOWN |
360 | #define GBN_BUTTON_LEFT BUTTON_LEFT | 360 | #define GBN_BUTTON_LEFT BUTTON_LEFT |
361 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT | 361 | #define GBN_BUTTON_RIGHT BUTTON_RIGHT |
362 | #define GBN_BUTTON_MENU BUTTON_POWER | ||
363 | #define GBN_BUTTON_PLAY BUTTON_SELECT | ||
364 | #define GBN_BUTTON_RETREAT BUTTON_BACK | 362 | #define GBN_BUTTON_RETREAT BUTTON_BACK |
365 | #define GBN_BUTTON_ADVANCE BUTTON_PLAYPAUSE | 363 | #define GBN_BUTTON_ADVANCE BUTTON_PLAYPAUSE |
366 | #define GBN_BUTTON_CONTEXT BUTTON_BOTTOMLEFT | 364 | #define GBN_BUTTON_PLAY BUTTON_SELECT |
367 | #define GBN_BUTTON_NEXT_VAR BUTTON_BOTTOMRIGHT | 365 | #define GBN_BUTTON_MENU BUTTON_POWER |
368 | 366 | ||
369 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | 367 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) |
370 | #define GBN_BUTTON_UP BUTTON_UP | 368 | #define GBN_BUTTON_UP BUTTON_UP |
diff --git a/apps/plugins/jewels.c b/apps/plugins/jewels.c index 6d03c9c654..7d80a536dd 100644 --- a/apps/plugins/jewels.c +++ b/apps/plugins/jewels.c | |||
@@ -311,9 +311,9 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
311 | #define JEWELS_UP BUTTON_UP | 311 | #define JEWELS_UP BUTTON_UP |
312 | #define JEWELS_DOWN BUTTON_DOWN | 312 | #define JEWELS_DOWN BUTTON_DOWN |
313 | #define JEWELS_SELECT BUTTON_SELECT | 313 | #define JEWELS_SELECT BUTTON_SELECT |
314 | #define JEWELS_CANCEL BUTTON_POWER | 314 | #define JEWELS_CANCEL BUTTON_BACK |
315 | #define HK_SELECT "SELECT" | 315 | #define HK_SELECT "SELECT" |
316 | #define HK_CANCEL "POWER" | 316 | #define HK_CANCEL "BACK" |
317 | 317 | ||
318 | #else | 318 | #else |
319 | #error No keymap defined! | 319 | #error No keymap defined! |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index a05fc5e6bc..44a2cd8c03 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -403,7 +403,7 @@ const struct button_mapping pla_main_ctx[] = | |||
403 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 403 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
404 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) | 404 | #elif (CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD) |
405 | {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, | 405 | {PLA_CANCEL, BUTTON_BACK, BUTTON_NONE}, |
406 | {PLA_EXIT, BUTTON_POWER, BUTTON_NONE}, | 406 | {PLA_EXIT, BUTTON_BACK|BUTTON_REPEAT, BUTTON_NONE}, |
407 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, | 407 | {PLA_SELECT, BUTTON_SELECT, BUTTON_NONE}, |
408 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, | 408 | {PLA_SELECT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT}, |
409 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, | 409 | {PLA_SELECT_REPEAT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE}, |
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c index 16114417a8..e0da928b02 100644 --- a/apps/plugins/minesweeper.c +++ b/apps/plugins/minesweeper.c | |||
@@ -295,12 +295,10 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
295 | # define MINESWP_QUIT BUTTON_POWER | 295 | # define MINESWP_QUIT BUTTON_POWER |
296 | # define MINESWP_TOGGLE BUTTON_SELECT | 296 | # define MINESWP_TOGGLE BUTTON_SELECT |
297 | # define MINESWP_DISCOVER BUTTON_PLAYPAUSE | 297 | # define MINESWP_DISCOVER BUTTON_PLAYPAUSE |
298 | # define MINESWP_NEXT BUTTON_BOTTOMRIGHT | ||
299 | # define MINESWP_PREV BUTTON_BOTTOMLEFT | ||
300 | # define MINESWP_INFO BUTTON_BACK | 298 | # define MINESWP_INFO BUTTON_BACK |
301 | 299 | ||
302 | |||
303 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 300 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
301 | |||
304 | # define MINESWP_SCROLLWHEEL | 302 | # define MINESWP_SCROLLWHEEL |
305 | # define MINESWP_LEFT BUTTON_LEFT | 303 | # define MINESWP_LEFT BUTTON_LEFT |
306 | # define MINESWP_RIGHT BUTTON_RIGHT | 304 | # define MINESWP_RIGHT BUTTON_RIGHT |
diff --git a/apps/plugins/pacbox/pacbox.h b/apps/plugins/pacbox/pacbox.h index a3de867c2f..0183b0c3f6 100644 --- a/apps/plugins/pacbox/pacbox.h +++ b/apps/plugins/pacbox/pacbox.h | |||
@@ -250,7 +250,7 @@ | |||
250 | #define PACMAN_LEFT BUTTON_LEFT | 250 | #define PACMAN_LEFT BUTTON_LEFT |
251 | #define PACMAN_RIGHT BUTTON_RIGHT | 251 | #define PACMAN_RIGHT BUTTON_RIGHT |
252 | #define PACMAN_1UP BUTTON_SELECT | 252 | #define PACMAN_1UP BUTTON_SELECT |
253 | #define PACMAN_2UP BUTTON_BOTTOMRIGHT | 253 | #define PACMAN_2UP BUTTON_BACK |
254 | #define PACMAN_COIN BUTTON_PLAYPAUSE | 254 | #define PACMAN_COIN BUTTON_PLAYPAUSE |
255 | #define PACMAN_MENU BUTTON_POWER | 255 | #define PACMAN_MENU BUTTON_POWER |
256 | 256 | ||
diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c index 46af8d8009..430b688f1f 100644 --- a/apps/plugins/pong.c +++ b/apps/plugins/pong.c | |||
@@ -238,12 +238,11 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
238 | #define PONG_RIGHT_DOWN BUTTON_DOWN | 238 | #define PONG_RIGHT_DOWN BUTTON_DOWN |
239 | 239 | ||
240 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 240 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
241 | #define PONG_QUIT BUTTON_POWER | 241 | #define PONG_QUIT BUTTON_POWER |
242 | #define PONG_LEFT_UP BUTTON_BACK | 242 | #define PONG_LEFT_UP BUTTON_LEFT |
243 | #define PONG_LEFT_DOWN BUTTON_BOTTOMLEFT | 243 | #define PONG_LEFT_DOWN BUTTON_DOWN |
244 | #define PONG_RIGHT_UP BUTTON_PLAYPAUSE | 244 | #define PONG_RIGHT_UP BUTTON_UP |
245 | #define PONG_RIGHT_DOWN BUTTON_BOTTOMRIGHT | 245 | #define PONG_RIGHT_DOWN BUTTON_RIGHT |
246 | #define PONG_PAUSE BUTTON_SELECT | ||
247 | 246 | ||
248 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) | 247 | #elif (CONFIG_KEYPAD == SAMSUNG_YPR0_PAD) |
249 | #define PONG_QUIT BUTTON_BACK | 248 | #define PONG_QUIT BUTTON_BACK |
diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index 4c67306543..c23c6b11cb 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c | |||
@@ -360,18 +360,14 @@ | |||
360 | #define ROCKBLOX_RESTART BUTTON_REC | 360 | #define ROCKBLOX_RESTART BUTTON_REC |
361 | 361 | ||
362 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 362 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
363 | #define ROCKBLOX_OFF_PRE BUTTON_POWER | 363 | #define ROCKBLOX_OFF BUTTON_POWER |
364 | #define ROCKBLOX_OFF BUTTON_POWER|BUTTON_REL | 364 | #define ROCKBLOX_ROTATE_CW BUTTON_SELECT |
365 | #define ROCKBLOX_ROTATE_CW BUTTON_BOTTOMRIGHT | 365 | #define ROCKBLOX_ROTATE_CCW BUTTON_UP |
366 | #define ROCKBLOX_ROTATE_CCW BUTTON_BOTTOMLEFT | 366 | #define ROCKBLOX_DOWN BUTTON_DOWN |
367 | #define ROCKBLOX_DOWN BUTTON_SELECT | ||
368 | #define ROCKBLOX_LEFT BUTTON_LEFT | 367 | #define ROCKBLOX_LEFT BUTTON_LEFT |
369 | #define ROCKBLOX_RIGHT BUTTON_RIGHT | 368 | #define ROCKBLOX_RIGHT BUTTON_RIGHT |
370 | #define ROCKBLOX_DROP_PRE BUTTON_DOWN | 369 | #define ROCKBLOX_DROP BUTTON_PLAYPAUSE |
371 | #define ROCKBLOX_DROP BUTTON_DOWN|BUTTON_REL | 370 | #define ROCKBLOX_RESTART BUTTON_BACK |
372 | #define ROCKBLOX_RESTART BUTTON_BACK|BUTTON_REPEAT | ||
373 | #define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_UP | ||
374 | #define ROCKBLOX_ROTATE_CW2 BUTTON_VOL_DOWN | ||
375 | 371 | ||
376 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 372 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
377 | #define ROCKBLOX_OFF BUTTON_POWER | 373 | #define ROCKBLOX_OFF BUTTON_POWER |
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c index 806294b21a..a176f75c91 100644 --- a/apps/plugins/sliding_puzzle.c +++ b/apps/plugins/sliding_puzzle.c | |||
@@ -252,8 +252,8 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
252 | #define PUZZLE_RIGHT BUTTON_RIGHT | 252 | #define PUZZLE_RIGHT BUTTON_RIGHT |
253 | #define PUZZLE_UP BUTTON_UP | 253 | #define PUZZLE_UP BUTTON_UP |
254 | #define PUZZLE_DOWN BUTTON_DOWN | 254 | #define PUZZLE_DOWN BUTTON_DOWN |
255 | #define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE|BUTTON_REPEAT | 255 | #define PUZZLE_SHUFFLE BUTTON_PLAYPAUSE |
256 | #define PUZZLE_PICTURE BUTTON_SELECT|BUTTON_REPEAT | 256 | #define PUZZLE_PICTURE BUTTON_SELECT |
257 | 257 | ||
258 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 258 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
259 | #define PUZZLE_QUIT BUTTON_POWER | 259 | #define PUZZLE_QUIT BUTTON_POWER |
diff --git a/apps/plugins/snake2.c b/apps/plugins/snake2.c index e4d84b2028..bd0257d2be 100644 --- a/apps/plugins/snake2.c +++ b/apps/plugins/snake2.c | |||
@@ -345,7 +345,7 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
345 | #define SNAKE2_DOWN BUTTON_DOWN | 345 | #define SNAKE2_DOWN BUTTON_DOWN |
346 | #define SNAKE2_QUIT BUTTON_POWER | 346 | #define SNAKE2_QUIT BUTTON_POWER |
347 | #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE | 347 | #define SNAKE2_PLAYPAUSE BUTTON_PLAYPAUSE |
348 | #define SNAKE2_PLAYPAUSE_TEXT "Play-Pause" | 348 | #define SNAKE2_PLAYPAUSE_TEXT "Play/Pause" |
349 | 349 | ||
350 | #else | 350 | #else |
351 | #error No keymap defined! | 351 | #error No keymap defined! |
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c index 848f8a76dc..942b101d4c 100644 --- a/apps/plugins/sokoban.c +++ b/apps/plugins/sokoban.c | |||
@@ -501,17 +501,15 @@ | |||
501 | #define SOKOBAN_RIGHT BUTTON_RIGHT | 501 | #define SOKOBAN_RIGHT BUTTON_RIGHT |
502 | #define SOKOBAN_UP BUTTON_UP | 502 | #define SOKOBAN_UP BUTTON_UP |
503 | #define SOKOBAN_DOWN BUTTON_DOWN | 503 | #define SOKOBAN_DOWN BUTTON_DOWN |
504 | #define SOKOBAN_MENU BUTTON_POWER | 504 | #define SOKOBAN_MENU BUTTON_SELECT |
505 | #define SOKOBAN_UNDO_PRE BUTTON_BOTTOMLEFT | 505 | #define SOKOBAN_UNDO (BUTTON_BACK|BUTTON_SELECT) |
506 | #define SOKOBAN_UNDO (BUTTON_BOTTOMLEFT|BUTTON_REL) | 506 | #define SOKOBAN_REDO (BUTTON_PLAYPAUSE|BUTTON_SELECT) |
507 | #define SOKOBAN_REDO_PRE BUTTON_BOTTOMRIGHT | ||
508 | #define SOKOBAN_REDO (BUTTON_BOTTOMRIGHT|BUTTON_REL) | ||
509 | #define SOKOBAN_LEVEL_REPEAT BUTTON_BACK | ||
510 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN | 507 | #define SOKOBAN_LEVEL_DOWN BUTTON_VOL_DOWN |
508 | #define SOKOBAN_LEVEL_REPEAT BUTTON_BACK | ||
511 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP | 509 | #define SOKOBAN_LEVEL_UP BUTTON_VOL_UP |
512 | #define SOKOBAN_PAUSE BUTTON_PLAYPAUSE | 510 | #define SOKOBAN_PAUSE BUTTON_PLAYPAUSE |
513 | #define BUTTON_SAVE (BUTTON_SELECT|BUTTON_REPEAT) | 511 | #define BUTTON_SAVE (BUTTON_SELECT|BUTTON_REPEAT) |
514 | #define BUTTON_SAVE_NAME "SELECT LONG" | 512 | #define BUTTON_SAVE_NAME "SELECT LONG" |
515 | 513 | ||
516 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD | 514 | #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD |
517 | #define SOKOBAN_LEFT BUTTON_LEFT | 515 | #define SOKOBAN_LEFT BUTTON_LEFT |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index b4c720065e..a1e8b7694b 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -511,18 +511,20 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
511 | # define SOL_QUIT BUTTON_POWER | 511 | # define SOL_QUIT BUTTON_POWER |
512 | # define SOL_UP BUTTON_UP | 512 | # define SOL_UP BUTTON_UP |
513 | # define SOL_DOWN BUTTON_DOWN | 513 | # define SOL_DOWN BUTTON_DOWN |
514 | # define SOL_LEFT BUTTON_LEFT | 514 | # define SOL_LEFT BUTTON_VOL_UP |
515 | # define SOL_RIGHT BUTTON_RIGHT | 515 | # define SOL_RIGHT BUTTON_VOL_DOWN |
516 | # define SOL_MOVE BUTTON_SELECT | 516 | # define SOL_MOVE (BUTTON_SELECT|BUTTON_REL) |
517 | # define SOL_DRAW BUTTON_BACK | 517 | # define SOL_DRAW (BUTTON_PLAYPAUSE|BUTTON_REL) |
518 | # define SOL_REM2CUR BUTTON_BOTTOMLEFT | 518 | # define SOL_REM2CUR BUTTON_LEFT |
519 | # define SOL_CUR2STACK BUTTON_PLAYPAUSE|BUTTON_REL | 519 | # define SOL_CUR2STACK_PRE (BUTTON_RIGHT | BUTTON_REPEAT) |
520 | # define SOL_REM2STACK BUTTON_PLAYPAUSE|BUTTON_REPEAT | 520 | # define SOL_CUR2STACK BUTTON_RIGHT |
521 | # define HK_MOVE "SELECT" | 521 | # define SOL_REM2STACK (BUTTON_LEFT|BUTTON_REPEAT) |
522 | # define HK_DRAW "BACK" | 522 | # define SOL_REM2STACK_PRE BUTTON_LEFT |
523 | # define HK_REM2CUR "BOTTOM-LEFT" | 523 | # define HK_MOVE "SHORT SELECT" |
524 | # define HK_CUR2STACK "PLAY-PAUSE" | 524 | # define HK_DRAW "SHORT PLAYPAUSE" |
525 | # define HK_REM2STACK "BOTTOM-RIGHT" | 525 | # define HK_REM2CUR "LEFT" |
526 | # define HK_CUR2STACK "DOUBLE SELECT" | ||
527 | # define HK_REM2STACK "LEFT" | ||
526 | 528 | ||
527 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 529 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
528 | # define SOL_QUIT BUTTON_POWER | 530 | # define SOL_QUIT BUTTON_POWER |
diff --git a/apps/plugins/spacerocks.c b/apps/plugins/spacerocks.c index 0ab5741b06..946d97d075 100644 --- a/apps/plugins/spacerocks.c +++ b/apps/plugins/spacerocks.c | |||
@@ -263,7 +263,7 @@ | |||
263 | #define AST_PAUSE BUTTON_PLAYPAUSE | 263 | #define AST_PAUSE BUTTON_PLAYPAUSE |
264 | #define AST_QUIT BUTTON_POWER | 264 | #define AST_QUIT BUTTON_POWER |
265 | #define AST_THRUST BUTTON_UP | 265 | #define AST_THRUST BUTTON_UP |
266 | #define AST_HYPERSPACE BUTTON_BACK | 266 | #define AST_HYPERSPACE BUTTON_DOWN |
267 | #define AST_LEFT BUTTON_LEFT | 267 | #define AST_LEFT BUTTON_LEFT |
268 | #define AST_RIGHT BUTTON_RIGHT | 268 | #define AST_RIGHT BUTTON_RIGHT |
269 | #define AST_FIRE BUTTON_SELECT | 269 | #define AST_FIRE BUTTON_SELECT |
diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 4b3bcef98f..cf04e02edc 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c | |||
@@ -453,7 +453,7 @@ | |||
453 | #define STAR_RIGHT BUTTON_RIGHT | 453 | #define STAR_RIGHT BUTTON_RIGHT |
454 | #define STAR_UP BUTTON_UP | 454 | #define STAR_UP BUTTON_UP |
455 | #define STAR_DOWN BUTTON_DOWN | 455 | #define STAR_DOWN BUTTON_DOWN |
456 | #define STAR_TOGGLE_CONTROL BUTTON_PLAYPAUSE | 456 | #define STAR_TOGGLE_CONTROL BUTTON_SELECT |
457 | #define STAR_LEVEL_UP BUTTON_VOL_UP | 457 | #define STAR_LEVEL_UP BUTTON_VOL_UP |
458 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN | 458 | #define STAR_LEVEL_DOWN BUTTON_VOL_DOWN |
459 | #define STAR_LEVEL_REPEAT (BUTTON_BACK | BUTTON_REPEAT) | 459 | #define STAR_LEVEL_REPEAT (BUTTON_BACK | BUTTON_REPEAT) |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index adf06c7ded..07147185ae 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -310,16 +310,13 @@ | |||
310 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY | 310 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAY |
311 | 311 | ||
312 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD | 312 | #elif CONFIG_KEYPAD == SANSA_FUZEPLUS_PAD |
313 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | ||
314 | #define SUDOKU_BUTTON_MENU BUTTON_BACK | 313 | #define SUDOKU_BUTTON_MENU BUTTON_BACK |
315 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 314 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
316 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 315 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
317 | #define SUDOKU_BUTTON_UP BUTTON_UP | 316 | #define SUDOKU_BUTTON_CHANGEDIR BUTTON_SELECT |
318 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 317 | #define SUDOKU_BUTTON_TOGGLE BUTTON_UP |
319 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SELECT | 318 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_DOWN |
320 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_BOTTOMLEFT | ||
321 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAYPAUSE | 319 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_PLAYPAUSE |
322 | #define SUDOKU_BUTTON_ALTTOGGLE BUTTON_BOTTOMRIGHT | ||
323 | 320 | ||
324 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 321 | #elif (CONFIG_KEYPAD == SANSA_CONNECT_PAD) |
325 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER | 322 | #define SUDOKU_BUTTON_QUIT BUTTON_POWER |