diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-m200.c | 72 |
1 files changed, 39 insertions, 33 deletions
diff --git a/apps/keymaps/keymap-m200.c b/apps/keymaps/keymap-m200.c index 46a109815c..20c2fb931f 100644 --- a/apps/keymaps/keymap-m200.c +++ b/apps/keymaps/keymap-m200.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * KIND, either express or implied. | 18 | * KIND, either express or implied. |
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | /* Button Code Definitions for Sandisk c200 target */ | 21 | /* Button Code Definitions for Sandisk m200 target */ |
22 | 22 | ||
23 | #include "config.h" | 23 | #include "config.h" |
24 | #include "action.h" | 24 | #include "action.h" |
@@ -34,11 +34,11 @@ | |||
34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 34 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
35 | */ | 35 | */ |
36 | static const struct button_mapping button_context_standard[] = { | 36 | static const struct button_mapping button_context_standard[] = { |
37 | { ACTION_STD_PREV, BUTTON_VOLUP, BUTTON_NONE }, | 37 | { ACTION_STD_PREV, BUTTON_PLAYPAUSE, BUTTON_NONE }, |
38 | { ACTION_STD_PREVREPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 38 | { ACTION_STD_PREVREPEAT, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
39 | 39 | ||
40 | { ACTION_STD_NEXT, BUTTON_VOLDOWN, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_REPEATAB, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, |
42 | 42 | ||
43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 43 | { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
44 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, | 44 | { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, |
@@ -53,8 +53,8 @@ static const struct button_mapping button_context_standard[] = { | |||
53 | 53 | ||
54 | 54 | ||
55 | static const struct button_mapping button_context_wps[] = { | 55 | static const struct button_mapping button_context_wps[] = { |
56 | { ACTION_WPS_PLAY, BUTTON_VOLUP|BUTTON_REL, BUTTON_VOLUP }, | 56 | { ACTION_WPS_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, |
57 | { ACTION_WPS_STOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_VOLUP }, | 57 | { ACTION_WPS_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_PLAYPAUSE }, |
58 | 58 | ||
59 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 59 | { ACTION_WPS_SKIPPREV, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
60 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 60 | { ACTION_WPS_SEEKBACK, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -66,14 +66,20 @@ static const struct button_mapping button_context_wps[] = { | |||
66 | 66 | ||
67 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU }, | 67 | { ACTION_WPS_ABSETB_NEXTDIR,BUTTON_MENU|BUTTON_RIGHT, BUTTON_MENU }, |
68 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU }, | 68 | { ACTION_WPS_ABSETA_PREVDIR,BUTTON_MENU|BUTTON_LEFT, BUTTON_MENU }, |
69 | { ACTION_WPS_ABRESET, BUTTON_MENU|BUTTON_VOLUP, BUTTON_MENU }, | 69 | { ACTION_WPS_ABRESET, BUTTON_MENU|BUTTON_PLAYPAUSE, BUTTON_MENU }, |
70 | |||
71 | { ACTION_WPS_VOLUP, BUTTON_VOLUP, BUTTON_NONE }, | ||
72 | { ACTION_WPS_VOLUP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | ||
73 | |||
74 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN, BUTTON_NONE }, | ||
75 | { ACTION_WPS_VOLDOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
70 | 76 | ||
71 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 77 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
72 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | 78 | { ACTION_WPS_BROWSE, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
73 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_VOLUP, BUTTON_SELECT }, | 79 | { ACTION_WPS_PITCHSCREEN, BUTTON_SELECT|BUTTON_PLAYPAUSE, BUTTON_SELECT }, |
74 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_VOLDOWN, BUTTON_SELECT }, | 80 | { ACTION_WPS_ID3SCREEN, BUTTON_SELECT|BUTTON_REPEATAB, BUTTON_SELECT }, |
75 | { ACTION_WPS_CONTEXT, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_VOLDOWN }, | 81 | { ACTION_WPS_CONTEXT, BUTTON_REPEATAB|BUTTON_REL, BUTTON_REPEATAB }, |
76 | { ACTION_WPS_QUICKSCREEN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_VOLDOWN }, | 82 | { ACTION_WPS_QUICKSCREEN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_REPEATAB }, |
77 | 83 | ||
78 | LAST_ITEM_IN_LIST | 84 | LAST_ITEM_IN_LIST |
79 | }; /* button_context_wps */ | 85 | }; /* button_context_wps */ |
@@ -82,11 +88,11 @@ static const struct button_mapping button_context_settings[] = { | |||
82 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 88 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
83 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, | 89 | { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, |
84 | 90 | ||
85 | { ACTION_SETTINGS_INC, BUTTON_VOLUP, BUTTON_NONE }, | 91 | { ACTION_SETTINGS_INC, BUTTON_PLAYPAUSE, BUTTON_NONE }, |
86 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 92 | { ACTION_SETTINGS_INCREPEAT,BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
87 | 93 | ||
88 | { ACTION_SETTINGS_DEC, BUTTON_VOLDOWN, BUTTON_NONE }, | 94 | { ACTION_SETTINGS_DEC, BUTTON_REPEATAB, BUTTON_NONE }, |
89 | { ACTION_SETTINGS_DECREPEAT,BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 95 | { ACTION_SETTINGS_DECREPEAT,BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, |
90 | 96 | ||
91 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 97 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
92 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 98 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -132,7 +138,7 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ | |||
132 | }; /* button_context_listtree_scroll_without_combo */ | 138 | }; /* button_context_listtree_scroll_without_combo */ |
133 | 139 | ||
134 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 140 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
135 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 141 | // { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
136 | 142 | ||
137 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, | 143 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT, BUTTON_REC }, |
138 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 144 | // { ACTION_TREE_PGLEFT, BUTTON_REC|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -153,11 +159,11 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
153 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 159 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
154 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | 160 | { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, |
155 | 161 | ||
156 | { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE }, | 162 | { ACTION_QS_DOWNINV, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_NONE }, |
157 | { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 163 | { ACTION_QS_DOWNINV, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
158 | 164 | ||
159 | { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE }, | 165 | { ACTION_QS_DOWN, BUTTON_REPEATAB|BUTTON_REL, BUTTON_NONE }, |
160 | { ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 166 | { ACTION_QS_DOWN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, |
161 | 167 | ||
162 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 168 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
163 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 169 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -181,11 +187,11 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
181 | }; /* button_context_settings_right_is_inc */ | 187 | }; /* button_context_settings_right_is_inc */ |
182 | 188 | ||
183 | static const struct button_mapping button_context_pitchscreen[] = { | 189 | static const struct button_mapping button_context_pitchscreen[] = { |
184 | { ACTION_PS_INC_SMALL, BUTTON_VOLUP, BUTTON_NONE }, | 190 | { ACTION_PS_INC_SMALL, BUTTON_PLAYPAUSE, BUTTON_NONE }, |
185 | { ACTION_PS_INC_BIG, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 191 | { ACTION_PS_INC_BIG, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
186 | 192 | ||
187 | { ACTION_PS_DEC_SMALL, BUTTON_VOLDOWN, BUTTON_NONE }, | 193 | { ACTION_PS_DEC_SMALL, BUTTON_REPEATAB, BUTTON_NONE }, |
188 | { ACTION_PS_DEC_BIG, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 194 | { ACTION_PS_DEC_BIG, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, |
189 | 195 | ||
190 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 196 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
191 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 197 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
@@ -219,13 +225,13 @@ static const struct button_mapping button_context_recscreen[] = { | |||
219 | /** FM Radio Screen **/ | 225 | /** FM Radio Screen **/ |
220 | #if CONFIG_TUNER | 226 | #if CONFIG_TUNER |
221 | static const struct button_mapping button_context_radio[] = { | 227 | static const struct button_mapping button_context_radio[] = { |
222 | { ACTION_NONE, BUTTON_VOLUP, BUTTON_NONE }, | 228 | { ACTION_NONE, BUTTON_PLAYPAUSE, BUTTON_NONE }, |
223 | { ACTION_FM_MENU, BUTTON_VOLDOWN, BUTTON_NONE }, | 229 | { ACTION_FM_MENU, BUTTON_REPEATAB, BUTTON_NONE }, |
224 | { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, | 230 | { ACTION_FM_PRESET, BUTTON_SELECT, BUTTON_NONE }, |
225 | { ACTION_FM_STOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_VOLUP }, | 231 | { ACTION_FM_STOP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_PLAYPAUSE }, |
226 | { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, | 232 | { ACTION_FM_MODE, BUTTON_REC, BUTTON_NONE }, |
227 | { ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 233 | { ACTION_FM_EXIT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
228 | { ACTION_FM_PLAY, BUTTON_VOLUP|BUTTON_REL, BUTTON_VOLUP }, | 234 | { ACTION_FM_PLAY, BUTTON_PLAYPAUSE|BUTTON_REL, BUTTON_PLAYPAUSE }, |
229 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, | 235 | { ACTION_SETTINGS_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
230 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 236 | { ACTION_SETTINGS_INCREPEAT,BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
231 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, | 237 | { ACTION_SETTINGS_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
@@ -246,10 +252,10 @@ static const struct button_mapping button_context_keyboard[] = { | |||
246 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, | 252 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT, BUTTON_NONE }, |
247 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, | 253 | // { ACTION_KBD_CURSOR_RIGHT, BUTTON_REC|BUTTON_RIGHT|BUTTON_REPEAT,BUTTON_NONE }, |
248 | 254 | ||
249 | { ACTION_KBD_UP, BUTTON_VOLUP, BUTTON_NONE }, | 255 | { ACTION_KBD_UP, BUTTON_PLAYPAUSE, BUTTON_NONE }, |
250 | { ACTION_KBD_UP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | 256 | { ACTION_KBD_UP, BUTTON_PLAYPAUSE|BUTTON_REPEAT, BUTTON_NONE }, |
251 | { ACTION_KBD_DOWN, BUTTON_VOLDOWN, BUTTON_NONE }, | 257 | { ACTION_KBD_DOWN, BUTTON_REPEATAB, BUTTON_NONE }, |
252 | { ACTION_KBD_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | 258 | { ACTION_KBD_DOWN, BUTTON_REPEATAB|BUTTON_REPEAT, BUTTON_NONE }, |
253 | 259 | ||
254 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, | 260 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN, BUTTON_NONE }, |
255 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, | 261 | // { ACTION_KBD_BACKSPACE, BUTTON_REC|BUTTON_VOLDOWN|BUTTON_REPEAT,BUTTON_NONE }, |