From 92fb1df03aa1d7cd33bb07f7222e36e954409e52 Mon Sep 17 00:00:00 2001 From: Teruaki Kawashima Date: Sun, 8 Nov 2009 13:14:50 +0000 Subject: FS#10338: Add "use morse input " entry to settings menu * Remember last used text input mode (keyboard or morse input) in settings. * Add setting "Use Morse Code Input" under Settings -> General Settings -> System. Now it is possible for some of targets without button combo for changing input mode to use morse input by changing the setting. it's not possible for them to change input mode during in the keyboard screen of course. There are still targets without morse input mode. Flyspray: FS#10338 Author: myself, David Johnston git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23567 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-creativezv.h | 3 +++ firmware/export/config-creativezvm.h | 3 +++ firmware/export/config-creativezvm60gb.h | 3 +++ firmware/export/config-e200.h | 3 +++ firmware/export/config-e200v2.h | 3 +++ firmware/export/config-fmrecorder.h | 3 +++ firmware/export/config-fuze.h | 3 +++ firmware/export/config-gigabeat-s.h | 6 ++---- firmware/export/config-gigabeat.h | 3 +++ firmware/export/config-h10.h | 3 +++ firmware/export/config-h100.h | 3 +++ firmware/export/config-h10_5gb.h | 3 +++ firmware/export/config-h120.h | 3 +++ firmware/export/config-h300.h | 3 +++ firmware/export/config-hdd1630.h | 3 +++ firmware/export/config-iaudiom5.h | 3 +++ firmware/export/config-iaudiox5.h | 3 +++ firmware/export/config-ipod1g2g.h | 3 +++ firmware/export/config-ipod3g.h | 3 +++ firmware/export/config-ipod4g.h | 3 +++ firmware/export/config-ipodcolor.h | 3 +++ firmware/export/config-ipodmini.h | 3 +++ firmware/export/config-ipodmini2g.h | 3 +++ firmware/export/config-ipodnano.h | 3 +++ firmware/export/config-ipodnano2g.h | 3 +++ firmware/export/config-ipodvideo.h | 3 +++ firmware/export/config-m200.h | 3 +++ firmware/export/config-m200v4.h | 3 +++ firmware/export/config-mrobe100.h | 3 +++ firmware/export/config-mrobe500.h | 3 +++ firmware/export/config-recorder.h | 3 +++ firmware/export/config-recorderv2.h | 3 +++ firmware/export/config-sa9200.h | 3 +++ firmware/export/config-view.h | 3 +++ 34 files changed, 101 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/export/config-creativezv.h b/firmware/export/config-creativezv.h index 5454038f0c..eff5a506c0 100644 --- a/firmware/export/config-creativezv.h +++ b/firmware/export/config-creativezv.h @@ -76,6 +76,9 @@ #define HAVE_HEADPHONE_DETECTION //#define HAVE_TOUCHPAD +/* 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-creativezvm.h b/firmware/export/config-creativezvm.h index 37d2eb48cf..d8005bb83d 100644 --- a/firmware/export/config-creativezvm.h +++ b/firmware/export/config-creativezvm.h @@ -77,6 +77,9 @@ #define HAVE_HEADPHONE_DETECTION //#define HAVE_TOUCHPAD +/* 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-creativezvm60gb.h b/firmware/export/config-creativezvm60gb.h index e34515ca44..3e95ae7be7 100644 --- a/firmware/export/config-creativezvm60gb.h +++ b/firmware/export/config-creativezvm60gb.h @@ -76,6 +76,9 @@ #define HAVE_HEADPHONE_DETECTION //#define HAVE_TOUCHPAD +/* 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-e200.h b/firmware/export/config-e200.h index dd65e6a37d..687878ce06 100644 --- a/firmware/export/config-e200.h +++ b/firmware/export/config-e200.h @@ -73,6 +73,9 @@ #define CONFIG_KEYPAD SANSA_E200_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC /* There is no hardware tone control */ diff --git a/firmware/export/config-e200v2.h b/firmware/export/config-e200v2.h index b4985ecd6d..d42f28ac2f 100644 --- a/firmware/export/config-e200v2.h +++ b/firmware/export/config-e200v2.h @@ -73,6 +73,9 @@ #define CONFIG_KEYPAD SANSA_E200_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-fmrecorder.h b/firmware/export/config-fmrecorder.h index 97dc52ebb5..d9f3a95f3e 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -48,6 +48,9 @@ /* define this if you have a Recorder style 10-key keyboard */ #define CONFIG_KEYPAD RECORDER_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_M41ST84W diff --git a/firmware/export/config-fuze.h b/firmware/export/config-fuze.h index e9b54e14fd..cc6669af39 100644 --- a/firmware/export/config-fuze.h +++ b/firmware/export/config-fuze.h @@ -78,6 +78,9 @@ #define CONFIG_KEYPAD SANSA_FUZE_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-gigabeat-s.h b/firmware/export/config-gigabeat-s.h index 344c572e40..7f55797a07 100644 --- a/firmware/export/config-gigabeat-s.h +++ b/firmware/export/config-gigabeat-s.h @@ -49,10 +49,8 @@ #define CONFIG_KEYPAD GIGABEAT_S_PAD -/* Define keyboard features */ -#define KBD_CURSOR_KEYS /* allow non-line edit cursor movement */ -#define KBD_MODES /* enable line edit */ -#define KBD_MORSE_INPUT /* enable morse code input */ +/* 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-gigabeat.h b/firmware/export/config-gigabeat.h index a20a5d87ff..363312a415 100644 --- a/firmware/export/config-gigabeat.h +++ b/firmware/export/config-gigabeat.h @@ -65,6 +65,9 @@ #define CONFIG_KEYPAD GIGABEAT_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-h10.h b/firmware/export/config-h10.h index 6ad7a8ddc5..cde1b6075e 100644 --- a/firmware/export/config-h10.h +++ b/firmware/export/config-h10.h @@ -76,6 +76,9 @@ #define CONFIG_KEYPAD IRIVER_H10_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-h100.h b/firmware/export/config-h100.h index 520079b8a0..d01ee1f3f9 100644 --- a/firmware/export/config-h100.h +++ b/firmware/export/config-h100.h @@ -69,6 +69,9 @@ #define CONFIG_REMOTE_KEYPAD H100_REMOTE +/* 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-h10_5gb.h b/firmware/export/config-h10_5gb.h index e39c6a6bbf..e69f6c2b20 100644 --- a/firmware/export/config-h10_5gb.h +++ b/firmware/export/config-h10_5gb.h @@ -59,6 +59,9 @@ #define CONFIG_KEYPAD IRIVER_H10_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-h120.h b/firmware/export/config-h120.h index da75c60ecf..8751c121cc 100644 --- a/firmware/export/config-h120.h +++ b/firmware/export/config-h120.h @@ -68,6 +68,9 @@ #define CONFIG_REMOTE_KEYPAD H100_REMOTE +/* 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-h300.h b/firmware/export/config-h300.h index 09fce49b10..d2348397d2 100644 --- a/firmware/export/config-h300.h +++ b/firmware/export/config-h300.h @@ -61,6 +61,9 @@ #define CONFIG_REMOTE_KEYPAD H300_REMOTE +/* 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-hdd1630.h b/firmware/export/config-hdd1630.h index f44f7d1729..c9a3b035ca 100644 --- a/firmware/export/config-hdd1630.h +++ b/firmware/export/config-hdd1630.h @@ -77,6 +77,9 @@ #define CONFIG_KEYPAD PHILIPS_HDD1630_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if the target has volume keys which can be used in the lists */ #define HAVE_VOLUME_IN_LIST diff --git a/firmware/export/config-iaudiom5.h b/firmware/export/config-iaudiom5.h index 00e07a92cd..03add43dbf 100644 --- a/firmware/export/config-iaudiom5.h +++ b/firmware/export/config-iaudiom5.h @@ -83,6 +83,9 @@ #define CONFIG_KEYPAD IAUDIO_X5M5_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h index a6b48b98a8..bafe51f12d 100644 --- a/firmware/export/config-iaudiox5.h +++ b/firmware/export/config-iaudiox5.h @@ -85,6 +85,9 @@ #define CONFIG_KEYPAD IAUDIO_X5M5_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + #define AB_REPEAT_ENABLE 1 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE diff --git a/firmware/export/config-ipod1g2g.h b/firmware/export/config-ipod1g2g.h index 835b75bd85..cde745e874 100644 --- a/firmware/export/config-ipod1g2g.h +++ b/firmware/export/config-ipod1g2g.h @@ -77,6 +77,9 @@ #define HAVE_SCROLLWHEEL +/* 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-ipod3g.h b/firmware/export/config-ipod3g.h index 7cab8846ef..e82cc92f56 100644 --- a/firmware/export/config-ipod3g.h +++ b/firmware/export/config-ipod3g.h @@ -78,6 +78,9 @@ #define HAVE_SCROLLWHEEL +/* 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-ipod4g.h b/firmware/export/config-ipod4g.h index 6195e0c1b6..c00a6788c6 100644 --- a/firmware/export/config-ipod4g.h +++ b/firmware/export/config-ipod4g.h @@ -76,6 +76,9 @@ #define CONFIG_KEYPAD IPOD_4G_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-ipodcolor.h b/firmware/export/config-ipodcolor.h index 7c7897b67b..751522d47b 100644 --- a/firmware/export/config-ipodcolor.h +++ b/firmware/export/config-ipodcolor.h @@ -60,6 +60,9 @@ #define CONFIG_KEYPAD IPOD_4G_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-ipodmini.h b/firmware/export/config-ipodmini.h index be3ab2bc96..129829ffbb 100644 --- a/firmware/export/config-ipodmini.h +++ b/firmware/export/config-ipodmini.h @@ -77,6 +77,9 @@ #define HAVE_SCROLLWHEEL +/* 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-ipodmini2g.h b/firmware/export/config-ipodmini2g.h index 53476b177f..8087269485 100644 --- a/firmware/export/config-ipodmini2g.h +++ b/firmware/export/config-ipodmini2g.h @@ -75,6 +75,9 @@ #define CONFIG_KEYPAD IPOD_4G_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-ipodnano.h b/firmware/export/config-ipodnano.h index f1a4d6a65e..68ed152cda 100644 --- a/firmware/export/config-ipodnano.h +++ b/firmware/export/config-ipodnano.h @@ -60,6 +60,9 @@ #define CONFIG_KEYPAD IPOD_4G_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-ipodnano2g.h b/firmware/export/config-ipodnano2g.h index bcc98e0da3..2e044335da 100644 --- a/firmware/export/config-ipodnano2g.h +++ b/firmware/export/config-ipodnano2g.h @@ -94,6 +94,9 @@ //#define AB_REPEAT_ENABLE 1 //#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE +/* 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-ipodvideo.h b/firmware/export/config-ipodvideo.h index 9762e71a73..f00de9cbfd 100644 --- a/firmware/export/config-ipodvideo.h +++ b/firmware/export/config-ipodvideo.h @@ -62,6 +62,9 @@ #define CONFIG_KEYPAD IPOD_4G_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-m200.h b/firmware/export/config-m200.h index 59f5ad7cfb..0f071e18ab 100644 --- a/firmware/export/config-m200.h +++ b/firmware/export/config-m200.h @@ -58,6 +58,9 @@ /* define this to indicate your device's keypad */ #define CONFIG_KEYPAD SANSA_M200_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_TCC77X diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index 13dcec92ff..af9f1aedc6 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h @@ -61,6 +61,9 @@ /* define this to indicate your device's keypad */ #define CONFIG_KEYPAD SANSA_M200_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if you have a real-time clock */ #ifndef BOOTLOADER #define CONFIG_RTC RTC_AS3514 diff --git a/firmware/export/config-mrobe100.h b/firmware/export/config-mrobe100.h index 5a2790062d..90419914b2 100644 --- a/firmware/export/config-mrobe100.h +++ b/firmware/export/config-mrobe100.h @@ -64,6 +64,9 @@ #define CONFIG_KEYPAD MROBE100_PAD #define CONFIG_REMOTE_KEYPAD MROBE_REMOTE +/* 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-mrobe500.h b/firmware/export/config-mrobe500.h index 82ba8a8e83..96e25c9247 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h @@ -138,6 +138,9 @@ #define HAVE_TOUCHSCREEN #define HAVE_BUTTON_DATA +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if the target has volume keys which can be used in the lists */ #define HAVE_VOLUME_IN_LIST diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h index 88ff2c2006..ef9f523c49 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -48,6 +48,9 @@ /* define this if you have the Recorder's 10-key keyboard */ #define CONFIG_KEYPAD RECORDER_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_M41ST84W diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h index 6a5564487e..c530fa5815 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -48,6 +48,9 @@ /* define this if you have a Recorder style 10-key keyboard */ #define CONFIG_KEYPAD RECORDER_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if you have a real-time clock */ #define CONFIG_RTC RTC_M41ST84W diff --git a/firmware/export/config-sa9200.h b/firmware/export/config-sa9200.h index ce233184cb..d9b9462880 100644 --- a/firmware/export/config-sa9200.h +++ b/firmware/export/config-sa9200.h @@ -62,6 +62,9 @@ #define CONFIG_KEYPAD PHILIPS_SA9200_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* define this if the target has volume keys which can be used in the lists */ #define HAVE_VOLUME_IN_LIST diff --git a/firmware/export/config-view.h b/firmware/export/config-view.h index 7b13bf74ba..4111b8380a 100644 --- a/firmware/export/config-view.h +++ b/firmware/export/config-view.h @@ -74,6 +74,9 @@ /* The only difference is that the power/hold is on the left instead of right on Fuze */ #define CONFIG_KEYPAD SANSA_FUZE_PAD +/* Define this to enable morse code input */ +#define HAVE_MORSE_INPUT + /* Define this if you do software codec */ #define CONFIG_CODEC SWCODEC /* There is no hardware tone control */ -- cgit v1.2.3