summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Giacomelli <giac2000@hotmail.com>2012-11-24 02:54:35 +0100
committerMichael Giacomelli <giac2000@hotmail.com>2012-11-25 22:08:11 +0100
commitf6d088c232faef38b27dc74b41f78ce50076ee17 (patch)
treedc73c9346518abc2f4da7fd6813c3d0f598377a2
parentd397cca942e783ebf84ec30f947d80141aa9b82a (diff)
downloadrockbox-f6d088c232faef38b27dc74b41f78ce50076ee17.tar.gz
rockbox-f6d088c232faef38b27dc74b41f78ce50076ee17.zip
Clip radio keymap update by Shiloh Hawley and myself.
Makes FM radio keys consistent with the updated Clip keymap in the rest of rockbox. Home now goes to the main menu, power stops the radio, and several other keys are a little more obvious. Change-Id: Iaab207acf936820d5602ae1ce4ffbbe30bf7877e
-rwxr-xr-xapps/keymaps/keymap-clip.c16
-rwxr-xr-xmanual/platform/keymap-sansaclip.tex8
2 files changed, 12 insertions, 12 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 83e1b4b86a..0caf0de360 100755
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -242,14 +242,14 @@ static const struct button_mapping button_context_recscreen[] = {
242 242
243/** FM Radio Screen **/ 243/** FM Radio Screen **/
244static const struct button_mapping button_context_radio[] = { 244static const struct button_mapping button_context_radio[] = {
245 /* Copied from keymap-c200.c 20081207. Feel free to suggest a better one.*/ 245 { ACTION_NONE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP},
246 { ACTION_NONE, BUTTON_UP, BUTTON_NONE }, 246 { ACTION_NONE, BUTTON_SELECT, BUTTON_NONE },
247 { ACTION_FM_MENU, BUTTON_DOWN, BUTTON_NONE }, 247 { ACTION_FM_MODE, BUTTON_DOWN, BUTTON_NONE },
248 { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, 248 { ACTION_FM_PRESET, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
249 { ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 249 { ACTION_FM_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
250 { ACTION_FM_MODE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 250 { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
251 { ACTION_FM_EXIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 251 { ACTION_FM_EXIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
252 { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 252 { ACTION_FM_PLAY, BUTTON_UP, BUTTON_NONE },
253 { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, 253 { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE },
254 { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, 254 { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
255 { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, 255 { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE },
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex
index 7fbe5fd15a..49a98fd67a 100755
--- a/manual/platform/keymap-sansaclip.tex
+++ b/manual/platform/keymap-sansaclip.tex
@@ -96,10 +96,10 @@
96 96
97%Button actions, FM radio context 97%Button actions, FM radio context
98\newcommand{\ActionFMPreset}{\ButtonSelect} 98\newcommand{\ActionFMPreset}{\ButtonSelect}
99\newcommand{\ActionFMMenu}{\ButtonDown} 99\newcommand{\ActionFMMenu}{Long \ButtonSelect}
100\newcommand{\ActionFMMode}{\ButtonHome} 100\newcommand{\ActionFMMode}{\ButtonDown}
101\newcommand{\ActionFMStop}{Long \ButtonUp} 101\newcommand{\ActionFMStop}{\ButtonPower}
102\newcommand{\ActionFMExit}{\ButtonPower} 102\newcommand{\ActionFMExit}{\ButtonHome}
103\newcommand{\ActionFMPlay}{\ButtonUp} 103\newcommand{\ActionFMPlay}{\ButtonUp}
104\newcommand{\ActionFMSettingsInc}{\ButtonVolUp} %? 104\newcommand{\ActionFMSettingsInc}{\ButtonVolUp} %?
105\newcommand{\ActionFMSettingsDec}{\ButtonVolDown} %? 105\newcommand{\ActionFMSettingsDec}{\ButtonVolDown} %?