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/calculator.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'apps/plugins/calculator.c') diff --git a/apps/plugins/calculator.c b/apps/plugins/calculator.c index c378ecbb81..f516cef1c3 100644 --- a/apps/plugins/calculator.c +++ b/apps/plugins/calculator.c @@ -380,17 +380,28 @@ F3: equal to "=" #elif CONFIG_KEYPAD == MROBE500_PAD #define CALCULATOR_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD #define CALCULATOR_LEFT BUTTON_LEFT #define CALCULATOR_RIGHT BUTTON_RIGHT #define CALCULATOR_UP BUTTON_UP #define CALCULATOR_DOWN BUTTON_DOWN -#define CALCULATOR_QUIT BUTTON_REC +#define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) +#define CALCULATOR_INPUT BUTTON_PLAY +#define CALCULATOR_CALC BUTTON_FFWD +#define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) +#define CALCULATOR_OPERATORS BUTTON_REC + +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD + +#define CALCULATOR_LEFT BUTTON_LEFT +#define CALCULATOR_RIGHT BUTTON_RIGHT +#define CALCULATOR_UP BUTTON_UP +#define CALCULATOR_DOWN BUTTON_DOWN +#define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) #define CALCULATOR_INPUT BUTTON_PLAY #define CALCULATOR_CALC BUTTON_FFWD -#define CALCULATOR_CLEAR BUTTON_REW +#define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD -- cgit v1.2.3