diff options
author | Sebastian Leonhardt <sebastian.leonhardt@web.de> | 2015-07-20 01:50:26 +0200 |
---|---|---|
committer | Gerrit Rockbox <gerrit@rockbox.org> | 2015-11-15 23:46:39 +0100 |
commit | a507bb283782ee3adb1fc9ba0c6f094108ef558c (patch) | |
tree | acae6cf04f8e34172375061b6fbdc11b6ffb84cb /apps/plugins/calculator.c | |
parent | a8758c953d50fb020b245d5739c41de113638b49 (diff) | |
download | rockbox-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/calculator.c')
-rw-r--r-- | apps/plugins/calculator.c | 19 |
1 files changed, 15 insertions, 4 deletions
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 "=" | |||
380 | #elif CONFIG_KEYPAD == MROBE500_PAD | 380 | #elif CONFIG_KEYPAD == MROBE500_PAD |
381 | #define CALCULATOR_QUIT BUTTON_POWER | 381 | #define CALCULATOR_QUIT BUTTON_POWER |
382 | 382 | ||
383 | #elif (CONFIG_KEYPAD == SAMSUNG_YH820_PAD) || \ | 383 | #elif CONFIG_KEYPAD == SAMSUNG_YH820_PAD |
384 | (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
385 | 384 | ||
386 | #define CALCULATOR_LEFT BUTTON_LEFT | 385 | #define CALCULATOR_LEFT BUTTON_LEFT |
387 | #define CALCULATOR_RIGHT BUTTON_RIGHT | 386 | #define CALCULATOR_RIGHT BUTTON_RIGHT |
388 | #define CALCULATOR_UP BUTTON_UP | 387 | #define CALCULATOR_UP BUTTON_UP |
389 | #define CALCULATOR_DOWN BUTTON_DOWN | 388 | #define CALCULATOR_DOWN BUTTON_DOWN |
390 | #define CALCULATOR_QUIT BUTTON_REC | 389 | #define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) |
390 | #define CALCULATOR_INPUT BUTTON_PLAY | ||
391 | #define CALCULATOR_CALC BUTTON_FFWD | ||
392 | #define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) | ||
393 | #define CALCULATOR_OPERATORS BUTTON_REC | ||
394 | |||
395 | #elif CONFIG_KEYPAD == SAMSUNG_YH920_PAD | ||
396 | |||
397 | #define CALCULATOR_LEFT BUTTON_LEFT | ||
398 | #define CALCULATOR_RIGHT BUTTON_RIGHT | ||
399 | #define CALCULATOR_UP BUTTON_UP | ||
400 | #define CALCULATOR_DOWN BUTTON_DOWN | ||
401 | #define CALCULATOR_QUIT (BUTTON_REW|BUTTON_REPEAT) | ||
391 | #define CALCULATOR_INPUT BUTTON_PLAY | 402 | #define CALCULATOR_INPUT BUTTON_PLAY |
392 | #define CALCULATOR_CALC BUTTON_FFWD | 403 | #define CALCULATOR_CALC BUTTON_FFWD |
393 | #define CALCULATOR_CLEAR BUTTON_REW | 404 | #define CALCULATOR_CLEAR (BUTTON_REW|BUTTON_REL) |
394 | 405 | ||
395 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD | 406 | #elif CONFIG_KEYPAD == PBELL_VIBE500_PAD |
396 | 407 | ||