summaryrefslogtreecommitdiff
path: root/apps/plugins/oscilloscope.c
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2015-07-20 01:50:26 +0200
committerGerrit Rockbox <gerrit@rockbox.org>2015-11-15 23:46:39 +0100
commita507bb283782ee3adb1fc9ba0c6f094108ef558c (patch)
treeacae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/oscilloscope.c
parenta8758c953d50fb020b245d5739c41de113638b49 (diff)
downloadrockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.tar.gz
rockbox-a507bb283782ee3adb1fc9ba0c6f094108ef558c.zip
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
Diffstat (limited to 'apps/plugins/oscilloscope.c')
-rw-r--r--apps/plugins/oscilloscope.c25
1 files changed, 19 insertions, 6 deletions
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 @@
349#elif CONFIG_KEYPAD == MROBE500_PAD 349#elif CONFIG_KEYPAD == MROBE500_PAD
350#define OSCILLOSCOPE_QUIT BUTTON_POWER 350#define OSCILLOSCOPE_QUIT BUTTON_POWER
351 351
352#elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ 352#elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD
353 (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) 353#define OSCILLOSCOPE_QUIT BUTTON_REW
354#define OSCILLOSCOPE_QUIT BUTTON_REC 354#define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD
355#define OSCILLOSCOPE_DRAWMODE (BUTTON_PLAY|BUTTON_LEFT)
356#define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT) 355#define OSCILLOSCOPE_ADVMODE (BUTTON_PLAY|BUTTON_RIGHT)
357#define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP) 356#define OSCILLOSCOPE_ORIENTATION (BUTTON_PLAY|BUTTON_UP)
358#define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_DOWN) 357#define OSCILLOSCOPE_GRAPHMODE (BUTTON_PLAY|BUTTON_LEFT)
358#define OSCILLOSCOPE_PAUSE_PRE BUTTON_PLAY
359#define OSCILLOSCOPE_PAUSE (BUTTON_PLAY|BUTTON_REL)
360#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
361#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
362#define OSCILLOSCOPE_VOL_UP BUTTON_UP
363#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
364#define NEED_LASTBUTTON
365
366#elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD
367#define OSCILLOSCOPE_QUIT BUTTON_REW
368#define OSCILLOSCOPE_DRAWMODE BUTTON_FFWD
369#define OSCILLOSCOPE_ADVMODE (BUTTON_REC|BUTTON_RIGHT)
370#define OSCILLOSCOPE_ORIENTATION (BUTTON_REC|BUTTON_UP)
371#define OSCILLOSCOPE_GRAPHMODE (BUTTON_REC|BUTTON_LEFT)
372#define OSCILLOSCOPE_PAUSE BUTTON_PLAY
359#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT 373#define OSCILLOSCOPE_SPEED_UP BUTTON_RIGHT
360#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT 374#define OSCILLOSCOPE_SPEED_DOWN BUTTON_LEFT
361#define OSCILLOSCOPE_VOL_UP BUTTON_UP 375#define OSCILLOSCOPE_VOL_UP BUTTON_UP
362#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN 376#define OSCILLOSCOPE_VOL_DOWN BUTTON_DOWN
363/* Need GRAPHMODE */
364 377
365#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD 378#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
366#define OSCILLOSCOPE_QUIT BUTTON_REC 379#define OSCILLOSCOPE_QUIT BUTTON_REC