diff options
-rw-r--r-- | apps/keymaps/keymap-clip.c | 7 | ||||
-rw-r--r-- | firmware/export/config/sansaclip.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipzip.h | 2 | ||||
-rw-r--r-- | manual/platform/keymap-sansaclip.tex | 2 |
6 files changed, 9 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 378c8a7439..7c8fb69471 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -84,10 +84,9 @@ static const struct button_mapping button_context_wps[] = { | |||
84 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, | 84 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_SELECT }, |
85 | 85 | ||
86 | #ifdef HAVE_HOTKEY /* down|repeat doesn't work in the file browser */ | 86 | #ifdef HAVE_HOTKEY /* down|repeat doesn't work in the file browser */ |
87 | { ACTION_WPS_HOTKEY, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 87 | { ACTION_WPS_HOTKEY, BUTTON_DOWN, BUTTON_NONE }, |
88 | #else | ||
89 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
90 | #endif | 88 | #endif |
89 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
91 | 90 | ||
92 | #ifndef HAS_BUTTON_HOLD /* Clip+ */ | 91 | #ifndef HAS_BUTTON_HOLD /* Clip+ */ |
93 | { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, | 92 | { ACTION_STD_KEYLOCK, BUTTON_HOME|BUTTON_SELECT, BUTTON_NONE }, |
@@ -137,7 +136,7 @@ static const struct button_mapping button_context_tree[] = { | |||
137 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, | 136 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_SELECT, BUTTON_HOME }, |
138 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 137 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
139 | #ifdef HAVE_HOTKEY | 138 | #ifdef HAVE_HOTKEY |
140 | // { ACTION_TREE_HOTKEY, BUTTON_NONE, BUTTON_NONE }, | 139 | { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_DOWN, BUTTON_HOME }, |
141 | #endif | 140 | #endif |
142 | 141 | ||
143 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h index cdee43d44a..35496e5fda 100644 --- a/firmware/export/config/sansaclip.h +++ b/firmware/export/config/sansaclip.h | |||
@@ -207,4 +207,4 @@ | |||
207 | #define DEFAULT_REC_RIGHT_GAIN 23 | 207 | #define DEFAULT_REC_RIGHT_GAIN 23 |
208 | 208 | ||
209 | /* Define this if a programmable hotkey is mapped */ | 209 | /* Define this if a programmable hotkey is mapped */ |
210 | //#define HAVE_HOTKEY | 210 | #define HAVE_HOTKEY |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index addf7d86c0..851884da36 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -229,4 +229,4 @@ | |||
229 | #define DEFAULT_REC_RIGHT_GAIN 23 | 229 | #define DEFAULT_REC_RIGHT_GAIN 23 |
230 | 230 | ||
231 | /* Define this if a programmable hotkey is mapped */ | 231 | /* Define this if a programmable hotkey is mapped */ |
232 | //#define HAVE_HOTKEY | 232 | #define HAVE_HOTKEY |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index cf3f90e363..581f6e900f 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -223,4 +223,4 @@ | |||
223 | #define DEFAULT_REC_RIGHT_GAIN 23 | 223 | #define DEFAULT_REC_RIGHT_GAIN 23 |
224 | 224 | ||
225 | /* Define this if a programmable hotkey is mapped */ | 225 | /* Define this if a programmable hotkey is mapped */ |
226 | //#define HAVE_HOTKEY | 226 | #define HAVE_HOTKEY |
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h index fc9f558eef..8c2e3404d4 100644 --- a/firmware/export/config/sansaclipzip.h +++ b/firmware/export/config/sansaclipzip.h | |||
@@ -228,4 +228,4 @@ | |||
228 | #define DEFAULT_REC_RIGHT_GAIN 23 | 228 | #define DEFAULT_REC_RIGHT_GAIN 23 |
229 | 229 | ||
230 | /* Define this if a programmable hotkey is mapped */ | 230 | /* Define this if a programmable hotkey is mapped */ |
231 | //#define HAVE_HOTKEY | 231 | #define HAVE_HOTKEY |
diff --git a/manual/platform/keymap-sansaclip.tex b/manual/platform/keymap-sansaclip.tex index 49a98fd67a..83a16135ed 100644 --- a/manual/platform/keymap-sansaclip.tex +++ b/manual/platform/keymap-sansaclip.tex | |||
@@ -42,6 +42,7 @@ | |||
42 | \newcommand{\ActionWpsPitchScreen}{Long \ButtonUp} | 42 | \newcommand{\ActionWpsPitchScreen}{Long \ButtonUp} |
43 | \newcommand{\ActionWpsPlaylist}{Long \ButtonDown} | 43 | \newcommand{\ActionWpsPlaylist}{Long \ButtonDown} |
44 | \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} | 44 | \newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} |
45 | \newcommand{\ActionWpsHotkey}{\ButtonDown} | ||
45 | 46 | ||
46 | \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} | 47 | \newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} |
47 | \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} | 48 | \newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} |
@@ -52,6 +53,7 @@ | |||
52 | \newcommand{\ActionTreeStop}{\ButtonPower} | 53 | \newcommand{\ActionTreeStop}{\ButtonPower} |
53 | \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} | 54 | \newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} |
54 | \newcommand{\ActionTreeParentDirectory}{\ButtonLeft} | 55 | \newcommand{\ActionTreeParentDirectory}{\ButtonLeft} |
56 | \newcommand{\ActionTreeHotkey}{\ButtonHome{} + \ButtonDown} | ||
55 | 57 | ||
56 | %Button actions, YesNo context | 58 | %Button actions, YesNo context |
57 | \newcommand{\ActionYesNoAccept}{\ButtonSelect} | 59 | \newcommand{\ActionYesNoAccept}{\ButtonSelect} |