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/oscilloscope.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) (limited to 'apps/plugins/oscilloscope.c') diff --git a/apps/plugins/oscilloscope.c b/apps/plugins/oscilloscope.c index a0b976f466..344a40f9bf 100644 --- a/apps/plugins/oscilloscope.c +++ b/apps/plugins/oscilloscope.c @@ -349,18 +349,31 @@ #elif CONFIG_KEYPAD == MROBE500_PAD #define OSCILLOSCOPE_QUIT BUTTON_POWER -#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ - (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) -#define OSCILLOSCOPE_QUIT BUTTON_REC -#define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT) +#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD +#define OSCILLOSCOPE_QUIT BUTTON_REW +#define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD #define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) #define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP) -#define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_DOWN) +#define OSCILLOSCOPE_GRAPHMODE (BUTTON_PLAY|BUTTON_LEFT) +#define OSCILLOSCOPE_PAUSE_PRE BUTTON_PLAY +#define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_REL) +#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT +#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT +#define OSCILLOSCOPE_VOL_UP BUTTON_UP +#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN +#define NEED_LASTBUTTON + +#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD +#define OSCILLOSCOPE_QUIT BUTTON_REW +#define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD +#define OSCILLOSCOPE_ADVMODE (BUTTON_REC|BUTTON_RIGHT) +#define OSCILLOSCOPE_ORIENTATION (BUTTON_REC|BUTTON_UP) +#define OSCILLOSCOPE_GRAPHMODE (BUTTON_REC|BUTTON_LEFT) +#define OSCILLOSCOPE_PAUSE BUTTON_PLAY #define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT #define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT #define OSCILLOSCOPE_VOL_UP BUTTON_UP #define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN -/* Need GRAPHMODE */ #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD #define OSCILLOSCOPE_QUIT BUTTON_REC -- cgit v1.2.3