diff options
author | Szymon Dziok <b0hoon@o2.pl> | 2014-10-08 16:29:40 +0200 |
---|---|---|
committer | Szymon Dziok <b0hoon@o2.pl> | 2014-10-08 16:31:39 +0200 |
commit | aa8ba60fea6b08957fc29cd28a9759ee7ecfdaf6 (patch) | |
tree | 5480554c2d0ffceba840e420d720a283ac3a151e /apps | |
parent | 91bd7f1ebadf532853d587534c873b2b402bbc88 (diff) | |
download | rockbox-aa8ba60fea6b08957fc29cd28a9759ee7ecfdaf6.tar.gz rockbox-aa8ba60fea6b08957fc29cd28a9759ee7ecfdaf6.zip |
YH820/YH92X: Properly enable morse input.
Change-Id: I6a35d64d0859b7ef429919c260a69974d6fdfafb
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 7 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 32a81fad22..f96861d48f 100644 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -255,10 +255,8 @@ static const struct button_mapping button_context_keyboard[] = { | |||
255 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 255 | { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
256 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, | 256 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, |
257 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 257 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
258 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 258 | { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, |
259 | { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, | 259 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
260 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
261 | { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_PLAY, BUTTON_NONE }, | ||
262 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, | 260 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, |
263 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, | 261 | { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, |
264 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, | 262 | { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
@@ -422,6 +420,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
422 | case CONTEXT_RECSCREEN: | 420 | case CONTEXT_RECSCREEN: |
423 | return button_context_recscreen; | 421 | return button_context_recscreen; |
424 | case CONTEXT_KEYBOARD: | 422 | case CONTEXT_KEYBOARD: |
423 | case CONTEXT_MORSE_INPUT: | ||
425 | return button_context_keyboard; | 424 | return button_context_keyboard; |
426 | #if CONFIG_TUNER | 425 | #if CONFIG_TUNER |
427 | case CONTEXT_FM: | 426 | case CONTEXT_FM: |
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c index 0b51bc42c0..84cab9ae00 100644 --- a/apps/recorder/keyboard.c +++ b/apps/recorder/keyboard.c | |||
@@ -67,7 +67,9 @@ | |||
67 | || (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) \ | 67 | || (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) \ |
68 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ | 68 | || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ |
69 | || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \ | 69 | || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \ |
70 | || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) | 70 | || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ |
71 | || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) | ||
72 | |||
71 | /* certain key combos toggle input mode between keyboard input and Morse input */ | 73 | /* certain key combos toggle input mode between keyboard input and Morse input */ |
72 | #define KBD_TOGGLE_INPUT | 74 | #define KBD_TOGGLE_INPUT |
73 | #endif | 75 | #endif |