diff options
Diffstat (limited to 'apps/keymaps')
-rwxr-xr-x | apps/keymaps/keymap-yh8xx_yh9xx.c | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/apps/keymaps/keymap-yh8xx_yh9xx.c b/apps/keymaps/keymap-yh8xx_yh9xx.c index 96935edde5..2df862134f 100755 --- a/apps/keymaps/keymap-yh8xx_yh9xx.c +++ b/apps/keymaps/keymap-yh8xx_yh9xx.c | |||
@@ -47,8 +47,8 @@ CONTEXT_CUSTOM|CONTEXT_SETTINGS = the direction keys for the eq/col picker scree | |||
47 | 47 | ||
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_NONE }, | 50 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
51 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 51 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
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 }, |
@@ -57,7 +57,7 @@ static const struct button_mapping button_context_standard[] = { | |||
57 | 57 | ||
58 | { ACTION_STD_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 58 | { ACTION_STD_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
59 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 59 | { ACTION_STD_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
60 | { ACTION_STD_QUICKSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 60 | { ACTION_STD_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, |
61 | 61 | ||
62 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 62 | { ACTION_STD_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
63 | 63 | ||
@@ -85,14 +85,12 @@ static const struct button_mapping button_context_wps[] = { | |||
85 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 85 | { ACTION_WPS_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
86 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, | 86 | { ACTION_WPS_VOLUP, BUTTON_UP, BUTTON_NONE }, |
87 | 87 | ||
88 | { ACTION_WPS_BROWSE, BUTTON_LEFT, BUTTON_NONE }, | 88 | { ACTION_WPS_BROWSE, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
89 | { ACTION_WPS_ID3SCREEN, BUTTON_RIGHT, BUTTON_NONE }, | ||
90 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | ||
91 | 89 | ||
92 | /* these match context_standard */ | 90 | /* these match context_standard */ |
93 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 91 | { ACTION_WPS_MENU, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
94 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 92 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
95 | { ACTION_WPS_QUICKSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | 93 | { ACTION_WPS_QUICKSCREEN, BUTTON_FFWD|BUTTON_RIGHT, BUTTON_FFWD }, |
96 | 94 | ||
97 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, | 95 | { ACTION_WPS_REC, BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE }, |
98 | 96 | ||
@@ -135,14 +133,11 @@ static const struct button_mapping button_context_listtree_scroll_without_combo[ | |||
135 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | 133 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
136 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 134 | { ACTION_TREE_ROOT_INIT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
137 | 135 | ||
138 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 136 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REPEAT, BUTTON_NONE }, |
139 | { ACTION_TREE_PGLEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT|BUTTON_REPEAT }, | 137 | { ACTION_TREE_PGLEFT, BUTTON_REW|BUTTON_REL, BUTTON_REW|BUTTON_REPEAT }, |
140 | |||
141 | { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, | ||
142 | { ACTION_STD_OK, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
143 | 138 | ||
144 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 139 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REPEAT, BUTTON_NONE }, |
145 | { ACTION_TREE_PGRIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT|BUTTON_REPEAT }, | 140 | { ACTION_TREE_PGRIGHT, BUTTON_FFWD|BUTTON_REL, BUTTON_FFWD|BUTTON_REPEAT }, |
146 | 141 | ||
147 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) | 142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE) |
148 | }; | 143 | }; |
@@ -184,7 +179,7 @@ static const struct button_mapping button_context_settings_right_is_inc[] = { | |||
184 | }; /* button_context_settingsgraphical */ | 179 | }; /* button_context_settingsgraphical */ |
185 | 180 | ||
186 | static const struct button_mapping button_context_yesno[] = { | 181 | static const struct button_mapping button_context_yesno[] = { |
187 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT|BUTTON_REL, BUTTON_PLAY }, | 182 | { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, |
188 | 183 | ||
189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 184 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
190 | }; /* button_context_settings_yesno */ | 185 | }; /* button_context_settings_yesno */ |
@@ -215,19 +210,21 @@ static const struct button_mapping button_context_time[] = { | |||
215 | }; /* button_context_settings_bmark */ | 210 | }; /* button_context_settings_bmark */ |
216 | 211 | ||
217 | static const struct button_mapping button_context_quickscreen[] = { | 212 | static const struct button_mapping button_context_quickscreen[] = { |
213 | { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, | ||
218 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, | 214 | { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, |
219 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 215 | { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
220 | 216 | ||
221 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 217 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, |
222 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 218 | { ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
223 | 219 | ||
224 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 220 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, |
225 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 221 | { ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
226 | 222 | ||
227 | { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | 223 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, |
228 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 224 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
229 | 225 | ||
230 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, | 226 | { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, |
227 | { ACTION_STD_CANCEL, BUTTON_FFWD, BUTTON_NONE }, | ||
231 | 228 | ||
232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 229 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
233 | }; /* button_context_quickscreen */ | 230 | }; /* button_context_quickscreen */ |