From a507bb283782ee3adb1fc9ba0c6f094108ef558c Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Mon, 20 Jul 2015 01:50:26 +0200 Subject: 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 --- apps/plugins/star.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) (limited to 'apps/plugins/star.c') diff --git a/apps/plugins/star.c b/apps/plugins/star.c index 3cb2779..9d27432 100644 --- a/apps/plugins/star.c +++ b/apps/plugins/star.c @@ -391,23 +391,41 @@ #define STAR_QUIT BUTTON_POWER #define STAR_QUIT_NAME "POWER" -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD -#define STAR_QUIT BUTTON_REC +#define STAR_QUIT (BUTTON_REW|BUTTON_REPEAT) #define STAR_LEFT BUTTON_LEFT #define STAR_RIGHT BUTTON_RIGHT #define STAR_UP BUTTON_UP #define STAR_DOWN BUTTON_DOWN -#define STAR_LEVEL_UP BUTTON_FFWD -#define STAR_LEVEL_DOWN BUTTON_REW +#define STAR_LEVEL_UP (BUTTON_REC|BUTTON_UP) +#define STAR_LEVEL_DOWN (BUTTON_REC|BUTTON_DOWN) #define STAR_TOGGLE_CONTROL BUTTON_PLAY -#define STAR_LEVEL_REPEAT (BUTTON_REW|BUTTON_FFWD) +#define STAR_LEVEL_REPEAT_PRE BUTTON_FFWD +#define STAR_LEVEL_REPEAT (BUTTON_FFWD|BUTTON_REPEAT) #define STAR_TOGGLE_CONTROL_NAME "PLAY" -#define STAR_QUIT_NAME "REC" -#define STAR_LEVEL_UP_NAME "FF" -#define STAR_LEVEL_DOWN_NAME "REW" -#define STAR_LEVEL_REPEAT_NAME "REW+FF" +#define STAR_QUIT_NAME "LONG REW" +#define STAR_LEVEL_UP_NAME "REC+UP" +#define STAR_LEVEL_DOWN_NAME "REC+DOWN" +#define STAR_LEVEL_REPEAT_NAME "LONG FFWD" + +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD + +#define STAR_QUIT (BUTTON_REW|BUTTON_REPEAT) +#define STAR_LEFT BUTTON_LEFT +#define STAR_RIGHT BUTTON_RIGHT +#define STAR_UP BUTTON_UP +#define STAR_DOWN BUTTON_DOWN +#define STAR_LEVEL_UP (BUTTON_FFWD|BUTTON_UP) +#define STAR_LEVEL_DOWN (BUTTON_FFWD|BUTTON_DOWN) +#define STAR_TOGGLE_CONTROL (BUTTON_PLAY|BUTTON_REL) +#define STAR_LEVEL_REPEAT_PRE (BUTTON_FFWD|BUTTON_REPEAT) +#define STAR_LEVEL_REPEAT (BUTTON_FFWD|BUTTON_REL) +#define STAR_TOGGLE_CONTROL_NAME "PLAY" +#define STAR_QUIT_NAME "LONG REW" +#define STAR_LEVEL_UP_NAME "FFWD+UP" +#define STAR_LEVEL_DOWN_NAME "FFWD+DOWN" +#define STAR_LEVEL_REPEAT_NAME "LONG FFWD" #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD -- cgit v1.1