summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNils Wallménius <nils@rockbox.org>2010-08-17 14:30:10 +0000
committerNils Wallménius <nils@rockbox.org>2010-08-17 14:30:10 +0000
commit8799af3d738d80092f89f4f3a12a730dc57ce8c0 (patch)
treed8856d07ca2bf4914a551bed827362bdbcc7dc65
parentf3774df8be9420d748784fc0fcc6d181bdd63ad8 (diff)
downloadrockbox-8799af3d738d80092f89f4f3a12a730dc57ce8c0.tar.gz
rockbox-8799af3d738d80092f89f4f3a12a730dc57ce8c0.zip
Small change to sansa fuze keymap.
Move stop from long home to long play/pause in wps, browsers and fm screen. In the fm screen that means switching between scan and preset is now on long home. Move stop from the power switch to long play/pause in the hid multimedia mode. Update manual keymaps. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27836 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/keymaps/keymap-fuze.c12
-rw-r--r--manual/platform/keymap-sansafuze.tex8
2 files changed, 10 insertions, 10 deletions
diff --git a/apps/keymaps/keymap-fuze.c b/apps/keymaps/keymap-fuze.c
index 9e78494ae2..12c73575d0 100644
--- a/apps/keymaps/keymap-fuze.c
+++ b/apps/keymaps/keymap-fuze.c
@@ -55,7 +55,7 @@ static const struct button_mapping button_context_standard[] = {
55 55
56static const struct button_mapping button_context_wps[] = { 56static const struct button_mapping button_context_wps[] = {
57 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 57 { ACTION_WPS_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
58 { ACTION_WPS_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 58 { ACTION_WPS_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
59 59
60 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 60 { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
61 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 61 { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE },
@@ -113,7 +113,7 @@ static const struct button_mapping button_context_list[] = {
113 113
114static const struct button_mapping button_context_tree[] = { 114static const struct button_mapping button_context_tree[] = {
115 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 115 { ACTION_TREE_WPS, BUTTON_UP|BUTTON_REL, BUTTON_UP },
116 { ACTION_TREE_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 116 { ACTION_TREE_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
117 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 117 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
118 118
119 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), 119 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
@@ -238,12 +238,12 @@ static const struct button_mapping button_context_radio[] = {
238 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 238 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE },
239 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 239 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
240 { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE }, 240 { ACTION_FM_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_NONE },
241 { ACTION_FM_STOP, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, 241 { ACTION_FM_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
242 { ACTION_FM_MODE, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, 242 { ACTION_FM_MODE, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
243 { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 243 { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
244 { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 244 { ACTION_FM_EXIT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
245 { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 245 { ACTION_FM_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP },
246 { ACTION_FM_PRESET, BUTTON_HOME|BUTTON_REL, BUTTON_NONE }, 246 { ACTION_FM_PRESET, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
247 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) 247 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
248}; /* button_context_radio */ 248}; /* button_context_radio */
249 249
@@ -294,7 +294,7 @@ static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
294 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 294 { ACTION_USB_HID_MULTIMEDIA_VOLUME_UP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
295 { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 295 { ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
296 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 296 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
297 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 297 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
298 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 298 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
299 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, 299 { ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT },
300 300
diff --git a/manual/platform/keymap-sansafuze.tex b/manual/platform/keymap-sansafuze.tex
index 4c0d289031..1ae29d8e42 100644
--- a/manual/platform/keymap-sansafuze.tex
+++ b/manual/platform/keymap-sansafuze.tex
@@ -31,7 +31,7 @@
31\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} 31\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft}
32\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} 32\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight}
33 33
34\newcommand{\ActionWpsStop}{Long \ButtonHome} 34\newcommand{\ActionWpsStop}{Long \ButtonUp}
35\newcommand{\ActionWpsVolDown}{\ButtonScrollBack} 35\newcommand{\ActionWpsVolDown}{\ButtonScrollBack}
36\newcommand{\ActionWpsVolUp}{\ButtonScrollFwd} 36\newcommand{\ActionWpsVolUp}{\ButtonScrollFwd}
37 37
@@ -49,7 +49,7 @@
49 49
50%Button actions, tree context 50%Button actions, tree context
51\newcommand{\ActionTreeWps}{\ButtonUp} 51\newcommand{\ActionTreeWps}{\ButtonUp}
52\newcommand{\ActionTreeStop}{Long \ButtonHome} 52\newcommand{\ActionTreeStop}{Long \ButtonUp}
53\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} 53\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight}
54\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} 54\newcommand{\ActionTreeParentDirectory}{\ButtonLeft}
55\newcommand{\ActionTreeHotkey}{\ButtonHome} 55\newcommand{\ActionTreeHotkey}{\ButtonHome}
@@ -99,8 +99,8 @@
99%Button actions, FM radio context 99%Button actions, FM radio context
100\newcommand{\ActionFMPreset}{\ButtonHome} 100\newcommand{\ActionFMPreset}{\ButtonHome}
101\newcommand{\ActionFMMenu}{Long \ButtonSelect} 101\newcommand{\ActionFMMenu}{Long \ButtonSelect}
102\newcommand{\ActionFMMode}{Long \ButtonUp} 102\newcommand{\ActionFMMode}{Long \ButtonHome}
103\newcommand{\ActionFMStop}{Long \ButtonHome} 103\newcommand{\ActionFMStop}{Long \ButtonUp}
104\newcommand{\ActionFMExit}{\ButtonDown} 104\newcommand{\ActionFMExit}{\ButtonDown}
105\newcommand{\ActionFMPlay}{\ButtonUp} 105\newcommand{\ActionFMPlay}{\ButtonUp}
106\newcommand{\ActionFMSettingsInc}{\ButtonScrollFwd} 106\newcommand{\ActionFMSettingsInc}{\ButtonScrollFwd}