summaryrefslogtreecommitdiffstats
path: root/apps/plugins/pegbox.c
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2015-07-20 01:50:26 +0200
committerGerrit Rockbox <gerrit@rockbox.org>2015-11-15 23:46:39 +0100
commita507bb283782ee3adb1fc9ba0c6f094108ef558c (patch)
treeacae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/pegbox.c
parenta8758c953d50fb020b245d5739c41de113638b49 (diff)
downloadrockbox-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.c38
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
#define QUIT_TEXT "POWER"
-#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD || \
-CONFIG_KEYPAD == SAMSUNG_YH920_PAD
-#define PEGBOX_QUIT BUTTON_REC
-#define PEGBOX_RESTART BUTTON_REW
-#define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_FFWD)
-#define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_REW)
+#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
+#define PEGBOX_QUIT BUTTON_REW
+#define PEGBOX_RESTART BUTTON_FFWD
+#define PEGBOX_LVL_UP (BUTTON_PLAY|BUTTON_UP)
+#define PEGBOX_LVL_DOWN (BUTTON_PLAY|BUTTON_DOWN)
#define PEGBOX_UP BUTTON_UP
#define PEGBOX_DOWN BUTTON_DOWN
#define PEGBOX_RIGHT BUTTON_RIGHT
#define PEGBOX_LEFT BUTTON_LEFT
#define PEGBOX_SELECT BUTTON_PLAY
-#define QUIT_TEXT "REC"
-#define RESTART_TEXT "REW"
-#define LVL_UP_TEXT "PLAY+FFWD"
-#define LVL_DOWN_TEXT "PLAY+REW"
-#define SELECT_TEXT "PLAY"
+#define QUIT_TEXT "REW"
+#define RESTART_TEXT "FFWD"
+#define LVL_UP_TEXT "PLAY+UP"
+#define LVL_DOWN_TEXT "PLAY+DOWN"
+#define SELECT_TEXT "PLAY"
+
+#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
+#define PEGBOX_QUIT BUTTON_REW
+#define PEGBOX_RESTART BUTTON_FFWD
+#define PEGBOX_LVL_UP (BUTTON_REC|BUTTON_UP)
+#define PEGBOX_LVL_DOWN (BUTTON_REC|BUTTON_DOWN)
+#define PEGBOX_UP BUTTON_UP
+#define PEGBOX_DOWN BUTTON_DOWN
+#define PEGBOX_RIGHT BUTTON_RIGHT
+#define PEGBOX_LEFT BUTTON_LEFT
+#define PEGBOX_SELECT BUTTON_PLAY
+
+#define QUIT_TEXT "REW"
+#define RESTART_TEXT "FFWD"
+#define LVL_UP_TEXT "REC+UP"
+#define LVL_DOWN_TEXT "REC+DOWN"
+#define SELECT_TEXT "PLAY"
#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
#define PEGBOX_QUIT BUTTON_REC