diff options
-rw-r--r-- | apps/keymaps/keymap-yh8xx_yh9xx.c | 7 | ||||
-rw-r--r-- | apps/recorder/keyboard.c | 4 | ||||
-rw-r--r-- | firmware/export/config/samsungyh820.h | 3 | ||||
-rw-r--r-- | firmware/export/config/samsungyh920.h | 3 | ||||
-rw-r--r-- | firmware/export/config/samsungyh925.h | 3 |
5 files changed, 15 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 |
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h index 74b5a77004..fef914e445 100644 --- a/firmware/export/config/samsungyh820.h +++ b/firmware/export/config/samsungyh820.h | |||
@@ -92,6 +92,9 @@ | |||
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH820_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH820_PAD |
94 | 94 | ||
95 | /* Define this to enable morse code input */ | ||
96 | #define HAVE_MORSE_INPUT | ||
97 | |||
95 | /* Define this if you do software codec */ | 98 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 99 | #define CONFIG_CODEC SWCODEC |
97 | 100 | ||
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h index 9b378c8ffe..a05ee94ddd 100644 --- a/firmware/export/config/samsungyh920.h +++ b/firmware/export/config/samsungyh920.h | |||
@@ -92,6 +92,9 @@ | |||
92 | 92 | ||
93 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD | 93 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
94 | 94 | ||
95 | /* Define this to enable morse code input */ | ||
96 | #define HAVE_MORSE_INPUT | ||
97 | |||
95 | /* Define this if you do software codec */ | 98 | /* Define this if you do software codec */ |
96 | #define CONFIG_CODEC SWCODEC | 99 | #define CONFIG_CODEC SWCODEC |
97 | 100 | ||
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h index 45a2d5937e..4816117fb3 100644 --- a/firmware/export/config/samsungyh925.h +++ b/firmware/export/config/samsungyh925.h | |||
@@ -89,6 +89,9 @@ | |||
89 | 89 | ||
90 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD | 90 | #define CONFIG_KEYPAD SAMSUNG_YH920_PAD |
91 | 91 | ||
92 | /* Define this to enable morse code input */ | ||
93 | #define HAVE_MORSE_INPUT | ||
94 | |||
92 | /* Define this if you do software codec */ | 95 | /* Define this if you do software codec */ |
93 | #define CONFIG_CODEC SWCODEC | 96 | #define CONFIG_CODEC SWCODEC |
94 | 97 | ||