summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/keymaps/keymap-clip.c6
-rw-r--r--manual/rockbox_interface/wps.tex2
2 files changed, 2 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index d871ea4f6c..a8766b5643 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -77,11 +77,7 @@ static const struct button_mapping button_context_wps[] = {
77 { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 77 { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
78 { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, 78 { ACTION_WPS_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
79 79
80#ifndef HAS_BUTTON_HOLD /* Clip+ */
81 { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME },
82#else
83 { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 80 { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
84#endif
85 { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 81 { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
86 82
87 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT }, 83 { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_UP, BUTTON_SELECT },
@@ -93,7 +89,7 @@ static const struct button_mapping button_context_wps[] = {
93#endif 89#endif
94 90
95#ifndef HAS_BUTTON_HOLD /* Clip+ */ 91#ifndef HAS_BUTTON_HOLD /* Clip+ */
96 { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 92 { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE },
97#endif /* HAS_BUTTON_HOLD */ 93#endif /* HAS_BUTTON_HOLD */
98 94
99 LAST_ITEM_IN_LIST 95 LAST_ITEM_IN_LIST
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 67b2a981df..cdfde8d3fc 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -110,7 +110,7 @@ your WPS (While Playing Screen).
110 \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown} 110 \opt{RECORDER_PAD}{\ButtonFOne+\ButtonDown}
111 \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop} 111 \opt{PLAYER_PAD}{\ButtonMenu+\ButtonStop}
112 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown} 112 \opt{ONDIO_PAD}{\ButtonMenu+\ButtonDown}
113 \opt{SANSA_CLIP_PAD}{Long \ButtonHome} 113 \opt{SANSA_CLIP_PAD}{\ButtonHome+\ButtonSelect}
114 & Key lock on/off.\\ 114 & Key lock on/off.\\
115 }% 115 }%
116 %These actions need definitions for the other targets 116 %These actions need definitions for the other targets