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/rockpaint.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'apps/plugins/rockpaint.c') diff --git a/apps/plugins/rockpaint.c b/apps/plugins/rockpaint.c index f3647c6024..725382c165 100644 --- a/apps/plugins/rockpaint.c +++ b/apps/plugins/rockpaint.c @@ -199,13 +199,23 @@ #elif CONFIG_KEYPAD == MROBE500_PAD #define ROCKPAINT_QUIT BUTTON_POWER -#elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) || \ - ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD ) -#define ROCKPAINT_QUIT BUTTON_REC +#elif ( CONFIG_KEYPAD == SAMSUNG_YH920_PAD ) +#define ROCKPAINT_QUIT ( BUTTON_REW | BUTTON_REPEAT ) #define ROCKPAINT_DRAW BUTTON_PLAY -#define ROCKPAINT_MENU BUTTON_FFWD -#define ROCKPAINT_TOOLBAR BUTTON_REW -#define ROCKPAINT_TOOLBAR2 ( BUTTON_REW | BUTTON_LEFT ) +#define ROCKPAINT_MENU ( BUTTON_REW | BUTTON_REL ) +#define ROCKPAINT_TOOLBAR BUTTON_FFWD +#define ROCKPAINT_TOOLBAR2 ( BUTTON_FFWD | BUTTON_LEFT ) +#define ROCKPAINT_UP BUTTON_UP +#define ROCKPAINT_DOWN BUTTON_DOWN +#define ROCKPAINT_LEFT BUTTON_LEFT +#define ROCKPAINT_RIGHT BUTTON_RIGHT + +#elif ( CONFIG_KEYPAD == SAMSUNG_YH820_PAD ) +#define ROCKPAINT_QUIT ( BUTTON_REW | BUTTON_REPEAT ) +#define ROCKPAINT_DRAW BUTTON_PLAY +#define ROCKPAINT_MENU ( BUTTON_REW | BUTTON_REL ) +#define ROCKPAINT_TOOLBAR BUTTON_FFWD +#define ROCKPAINT_TOOLBAR2 BUTTON_REC #define ROCKPAINT_UP BUTTON_UP #define ROCKPAINT_DOWN BUTTON_DOWN #define ROCKPAINT_LEFT BUTTON_LEFT -- cgit v1.2.3