From aa8ba60fea6b08957fc29cd28a9759ee7ecfdaf6 Mon Sep 17 00:00:00 2001 From: Szymon Dziok Date: Wed, 8 Oct 2014 16:29:40 +0200 Subject: YH820/YH92X: Properly enable morse input. Change-Id: I6a35d64d0859b7ef429919c260a69974d6fdfafb --- apps/keymaps/keymap-yh8xx_yh9xx.c | 7 +++---- apps/recorder/keyboard.c | 4 +++- firmware/export/config/samsungyh820.h | 3 +++ firmware/export/config/samsungyh920.h | 3 +++ 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[] = { { ACTION_KBD_CURSOR_LEFT, BUTTON_FFWD|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_NONE }, { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, - { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, - { ACTION_KBD_PAGE_FLIP, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, - { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, - { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_PLAY, BUTTON_NONE }, + { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, + { ACTION_KBD_DONE, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_NONE }, { ACTION_KBD_ABORT, BUTTON_REC, BUTTON_NONE }, { ACTION_KBD_BACKSPACE, BUTTON_REW|BUTTON_REL, BUTTON_REW }, @@ -422,6 +420,7 @@ const struct button_mapping* get_context_mapping(int context) case CONTEXT_RECSCREEN: return button_context_recscreen; case CONTEXT_KEYBOARD: + case CONTEXT_MORSE_INPUT: return button_context_keyboard; #if CONFIG_TUNER 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 @@ || (CONFIG_KEYPAD == PHILIPS_HDD6330_PAD) \ || (CONFIG_KEYPAD == PHILIPS_SA9200_PAD) \ || (CONFIG_KEYPAD == PBELL_VIBE500_PAD) \ - || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) + || (CONFIG_KEYPAD == SANSA_CONNECT_PAD) \ + || (CONFIG_KEYPAD == SAMSUNG_YH920_PAD) + /* certain key combos toggle input mode between keyboard input and Morse input */ #define KBD_TOGGLE_INPUT #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 @@ #define CONFIG_KEYPAD SAMSUNG_YH820_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC 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 @@ #define CONFIG_KEYPAD SAMSUNG_YH920_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC 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 @@ #define CONFIG_KEYPAD SAMSUNG_YH920_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC -- cgit v1.2.3