diff options
Diffstat (limited to 'apps/keymaps')
-rwxr-xr-x | apps/keymaps/keymap-yh8xx_yh9xx.c | 51 |
1 files changed, 26 insertions, 25 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 7e65749f52..8a45b5cf6e 100755 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -48,16 +48,17 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree | |||
48 | 48 | ||
49 | static const struct button_mapping button_context_standard[] = { | 49 | static const struct button_mapping button_context_standard[] = { |
50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
51 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 51 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
52 | 52 | ||
53 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, | 53 | { ACTION_STD_PREV, BUTTON_UP, BUTTON_NONE }, |
54 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 54 | { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
55 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 55 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
56 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 56 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
57 | 57 | ||
58 | { ACTION_STD_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
59 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 58 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
60 | { ACTION_STD_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, | 59 | /* kludge: pressing 2 directional buttons is easy on this target */ |
60 | { ACTION_STD_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | ||
61 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | ||
61 | 62 | ||
62 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 63 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
63 | 64 | ||
@@ -81,18 +82,20 @@ static const struct button_mapping button_context_wps[] = { | |||
81 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, | 82 | { ACTION_WPS_ABRESET, BUTTON_PLAY|BUTTON_UP, BUTTON_PLAY }, |
82 | 83 | ||
83 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 84 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
84 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 85 | { ACTION_WPS_VOLDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
85 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 87 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
87 | 88 | ||
88 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 89 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
89 | 90 | ||
90 | /* these match context_standard */ | 91 | /* these match context_standard */ |
91 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 92 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
92 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
93 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 93 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
94 | { ACTION_WPS_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, | 94 | /* kludge: pressing 2 directional buttons is easy on this target */ |
95 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT, | ||
96 | BUTTON_LEFT|BUTTON_DOWN|BUTTON_REPEAT }, | ||
95 | 97 | ||
98 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
96 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 99 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
97 | 100 | ||
98 | LAST_ITEM_IN_LIST | 101 | LAST_ITEM_IN_LIST |
@@ -150,10 +153,11 @@ static const struct button_mapping button_context_settings[] = { | |||
150 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, | 153 | { ACTION_SETTINGS_DEC, BUTTON_DOWN, BUTTON_NONE }, |
151 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
152 | 155 | ||
153 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 156 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
157 | { ACTION_STD_PREV, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
154 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 158 | { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
155 | 159 | ||
156 | { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, | 160 | { ACTION_STD_NEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
157 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 161 | { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
158 | 162 | ||
159 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, | 163 | { ACTION_SETTINGS_RESET, BUTTON_PLAY, BUTTON_NONE }, |
@@ -212,16 +216,18 @@ static const struct button_mapping button_context_time[] = { | |||
212 | 216 | ||
213 | static const struct button_mapping button_context_quickscreen[] = { | 217 | static const struct button_mapping button_context_quickscreen[] = { |
214 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | 218 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, |
215 | { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, | 219 | { ACTION_NONE, BUTTON_LEFT|BUTTON_DOWN|BUTTON_REL,BUTTON_NONE }, |
220 | |||
221 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | ||
216 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 222 | { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
217 | 223 | ||
218 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, | 224 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, |
219 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 225 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
220 | 226 | ||
221 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | 227 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
222 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 228 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
223 | 229 | ||
224 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | 230 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
225 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 231 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
226 | 232 | ||
227 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | 233 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, |
@@ -282,23 +288,18 @@ static const struct button_mapping button_context_keyboard[] = { | |||
282 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 288 | { ACTION_KBD_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, |
283 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 289 | { ACTION_KBD_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
284 | 290 | ||
285 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW, BUTTON_NONE }, | 291 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW|BUTTON_REL, BUTTON_FFWD }, |
286 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, | 292 | { ACTION_KBD_CURSOR_LEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
287 | 293 | ||
288 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD, BUTTON_NONE }, | 294 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD }, |
289 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, | 295 | { ACTION_KBD_CURSOR_RIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
290 | 296 | ||
291 | { ACTION_KBD_BACKSPACE, BUTTON_LEFT|BUTTON_REW, BUTTON_NONE }, | 297 | { ACTION_KBD_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
292 | { ACTION_KBD_BACKSPACE, BUTTON_LEFT|BUTTON_REW|BUTTON_REPEAT,BUTTON_NONE }, | ||
293 | |||
294 | { ACTION_KBD_SELECT, BUTTON_PLAY, BUTTON_NONE }, | ||
295 | { ACTION_KBD_PAGE_FLIP, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_NONE }, | 298 | { ACTION_KBD_PAGE_FLIP, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_NONE }, |
296 | 299 | ||
297 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 300 | { ACTION_KBD_DONE, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
298 | { ACTION_KBD_ABORT, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 301 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_PLAY, BUTTON_FFWD }, |
299 | 302 | { ACTION_KBD_ABORT, BUTTON_FFWD|BUTTON_REW, BUTTON_FFWD }, | |
300 | { ACTION_KBD_MORSE_INPUT, BUTTON_PLAY|BUTTON_FFWD, BUTTON_NONE }, | ||
301 | { ACTION_KBD_MORSE_SELECT, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | ||
302 | 303 | ||
303 | LAST_ITEM_IN_LIST | 304 | LAST_ITEM_IN_LIST |
304 | }; /* button_context_keyboard */ | 305 | }; /* button_context_keyboard */ |