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/fractals/fractal.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'apps/plugins/fractals') diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h index 7e13657595..51296b07f0 100644 --- a/apps/plugins/fractals/fractal.h +++ b/apps/plugins/fractals/fractal.h @@ -318,15 +318,28 @@ #elif CONFIG_KEYPAD == ONDAVX777_PAD #define FRACTAL_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) -#define FRACTAL_QUIT BUTTON_REC +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD +#define FRACTAL_QUIT (BUTTON_REW | BUTTON_REPEAT) +#define FRACTAL_UP BUTTON_UP +#define FRACTAL_DOWN BUTTON_DOWN +#define FRACTAL_LEFT BUTTON_LEFT +#define FRACTAL_RIGHT BUTTON_RIGHT +#define FRACTAL_ZOOM_IN BUTTON_FFWD +#define FRACTAL_ZOOM_OUT_PRE BUTTON_REW +#define FRACTAL_ZOOM_OUT (BUTTON_REW | BUTTON_REL) +#define FRACTAL_PRECISION_INC (BUTTON_REC | BUTTON_UP) +#define FRACTAL_PRECISION_DEC (BUTTON_REC | BUTTON_DOWN) +#define FRACTAL_RESET BUTTON_PLAY + +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD +#define FRACTAL_QUIT (BUTTON_REW | BUTTON_REPEAT) #define FRACTAL_UP BUTTON_UP #define FRACTAL_DOWN BUTTON_DOWN #define FRACTAL_LEFT BUTTON_LEFT #define FRACTAL_RIGHT BUTTON_RIGHT #define FRACTAL_ZOOM_IN BUTTON_FFWD -#define FRACTAL_ZOOM_OUT BUTTON_REW +#define FRACTAL_ZOOM_OUT_PRE BUTTON_REW +#define FRACTAL_ZOOM_OUT (BUTTON_REW | BUTTON_REL) #define FRACTAL_PRECISION_INC (BUTTON_PLAY | BUTTON_UP) #define FRACTAL_PRECISION_DEC (BUTTON_PLAY | BUTTON_DOWN) #define FRACTAL_RESET (BUTTON_PLAY | BUTTON_RIGHT) -- cgit v1.2.3