diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-07-20 01:50:26 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-11-15 23:46:39 +0100 |
commit | a507bb283782ee3adb1fc9ba0c6f094108ef558c (patch) | |
tree | acae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/pegbox.c | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip |
YH8xx,YH9xx: Keymap improvement
The main "innovation" in this patch are two "virtual buttons"
for the record switch on YH92x targets. When the switch state
changes, a single BUTTON_REC_SW_ON or .._OFF button event will
be generated. Thus keymap code can react on switching, but
not on the actual state of the switch.
Wherever sensible, the following user scheme is applied:
- use PLAY as confirm button
- use REW button or Long REW to exit
- use REC (YH820) or FFWD (YH92X) as modifier key for button combos
Change-Id: Ic8d1db9cc6869daed8dda98990dfdf7f6fd5d5a1
Diffstat (limited to 'apps/plugins/pegbox.c')
-rw-r--r-- | apps/plugins/pegbox.c | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/apps/plugins/pegbox.c b/apps/plugins/pegbox.c index 25f374b37f..5820d54fcd 100644 --- a/apps/plugins/pegbox.c +++ b/apps/plugins/pegbox.c | |||
@@ -414,23 +414,39 @@ CONFIG_KEYPAD == MROBE500_PAD | |||
414 | 414 | ||
415 | #define QUIT_TEXT "POWER" | 415 | #define QUIT_TEXT "POWER" |
416 | 416 | ||
417 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \ | 417 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD |
418 | CONFIG_KEYPAD == SAMSUNG_YH920_PAD | 418 | #define PEGBOX_QUIT BUTTON_REW |
419 | #define PEGBOX_QUIT BUTTON_REC | 419 | #define PEGBOX_RESTART BUTTON_FFWD |
420 | #define PEGBOX_RESTART BUTTON_REW | 420 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_UP) |
421 | #define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD) | 421 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_DOWN) |
422 | #define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_REW) | ||
423 | #define PEGBOX_UP BUTTON_UP | 422 | #define PEGBOX_UP BUTTON_UP |
424 | #define PEGBOX_DOWN BUTTON_DOWN | 423 | #define PEGBOX_DOWN BUTTON_DOWN |
425 | #define PEGBOX_RIGHT BUTTON_RIGHT | 424 | #define PEGBOX_RIGHT BUTTON_RIGHT |
426 | #define PEGBOX_LEFT BUTTON_LEFT | 425 | #define PEGBOX_LEFT BUTTON_LEFT |
427 | #define PEGBOX_SELECT BUTTON_PLAY | 426 | #define PEGBOX_SELECT BUTTON_PLAY |
428 | 427 | ||
429 | #define QUIT_TEXT "REC" | 428 | #define QUIT_TEXT "REW" |
430 | #define RESTART_TEXT "REW" | 429 | #define RESTART_TEXT "FFWD" |
431 | #define LVL_UP_TEXT "PLAY+FFWD" | 430 | #define LVL_UP_TEXT "PLAY+UP" |
432 | #define LVL_DOWN_TEXT "PLAY+REW" | 431 | #define LVL_DOWN_TEXT "PLAY+DOWN" |
433 | #define SELECT_TEXT "PLAY" | 432 | #define SELECT_TEXT "PLAY" |
433 | |||
434 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD | ||
435 | #define PEGBOX_QUIT BUTTON_REW | ||
436 | #define PEGBOX_RESTART BUTTON_FFWD | ||
437 | #define PEGBOX_LVL_UP (BUTTON_REC|BUTTON_UP) | ||
438 | #define PEGBOX_LVL_DOWN (BUTTON_REC|BUTTON_DOWN) | ||
439 | #define PEGBOX_UP BUTTON_UP | ||
440 | #define PEGBOX_DOWN BUTTON_DOWN | ||
441 | #define PEGBOX_RIGHT BUTTON_RIGHT | ||
442 | #define PEGBOX_LEFT BUTTON_LEFT | ||
443 | #define PEGBOX_SELECT BUTTON_PLAY | ||
444 | |||
445 | #define QUIT_TEXT "REW" | ||
446 | #define RESTART_TEXT "FFWD" | ||
447 | #define LVL_UP_TEXT "REC+UP" | ||
448 | #define LVL_DOWN_TEXT "REC+DOWN" | ||
449 | #define SELECT_TEXT "PLAY" | ||
434 | 450 | ||
435 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 451 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
436 | #define PEGBOX_QUIT BUTTON_REC | 452 | #define PEGBOX_QUIT BUTTON_REC |