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/calendar.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) (limited to 'apps/plugins/calendar.c') diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c index 91613fcf88..d2744ea9f6 100644 --- a/apps/plugins/calendar.c +++ b/apps/plugins/calendar.c @@ -258,16 +258,25 @@ #elif CONFIG_KEYPAD == MROBE500_PAD #define CALENDAR_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) -#define CALENDAR_QUIT BUTTON_REC +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD +#define CALENDAR_QUIT BUTTON_REW #define CALENDAR_SELECT BUTTON_PLAY #define CALENDAR_NEXT_WEEK BUTTON_DOWN #define CALENDAR_PREV_WEEK BUTTON_UP #define CALENDAR_NEXT_DAY BUTTON_RIGHT #define CALENDAR_PREV_DAY BUTTON_LEFT -#define CALENDAR_NEXT_MONTH BUTTON_FFWD -#define CALENDAR_PREV_MONTH BUTTON_REW +#define CALENDAR_NEXT_MONTH (BUTTON_FFWD|BUTTON_DOWN) +#define CALENDAR_PREV_MONTH (BUTTON_FFWD|BUTTON_UP) + +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD +#define CALENDAR_QUIT BUTTON_REW +#define CALENDAR_SELECT BUTTON_PLAY +#define CALENDAR_NEXT_WEEK BUTTON_DOWN +#define CALENDAR_PREV_WEEK BUTTON_UP +#define CALENDAR_NEXT_DAY BUTTON_RIGHT +#define CALENDAR_PREV_DAY BUTTON_LEFT +#define CALENDAR_NEXT_MONTH (BUTTON_REC|BUTTON_DOWN) +#define CALENDAR_PREV_MONTH (BUTTON_REC|BUTTON_UP) #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define CALENDAR_QUIT BUTTON_REC -- cgit v1.2.3