diff options
Diffstat (limited to 'apps/keymaps/keymap-x5.c')
-rw-r--r-- | apps/keymaps/keymap-x5.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index e92baf4dbe..f7480d0d38 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c | |||
@@ -84,7 +84,7 @@ const struct button_mapping button_context_settings[] = { | |||
84 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, | 84 | { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, |
85 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 85 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
86 | 86 | ||
87 | LAST_ITEM_IN_LIST | 87 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
88 | }; | 88 | }; |
89 | 89 | ||
90 | const struct button_mapping button_context_tree[] = { | 90 | const struct button_mapping button_context_tree[] = { |
@@ -92,7 +92,7 @@ const struct button_mapping button_context_tree[] = { | |||
92 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 92 | { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
93 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 93 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
94 | 94 | ||
95 | LAST_ITEM_IN_LIST | 95 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
96 | }; | 96 | }; |
97 | 97 | ||
98 | const struct button_mapping button_context_tree_scroll_lr[] = { | 98 | const struct button_mapping button_context_tree_scroll_lr[] = { |
@@ -109,7 +109,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { | |||
109 | 109 | ||
110 | const struct button_mapping button_context_yesno[] = { | 110 | const struct button_mapping button_context_yesno[] = { |
111 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, | 111 | { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, |
112 | LAST_ITEM_IN_LIST | 112 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
113 | }; /* button_context_settings_yesno */ | 113 | }; /* button_context_settings_yesno */ |
114 | 114 | ||
115 | const struct button_mapping button_context_quickscreen[] = { | 115 | const struct button_mapping button_context_quickscreen[] = { |
@@ -123,7 +123,7 @@ const struct button_mapping button_context_quickscreen[] = { | |||
123 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 123 | { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
124 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 124 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
125 | 125 | ||
126 | LAST_ITEM_IN_LIST | 126 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
127 | }; /* button_context_quickscreen */ | 127 | }; /* button_context_quickscreen */ |
128 | 128 | ||
129 | const struct button_mapping button_context_settings_r_is_inc[] = { | 129 | const struct button_mapping button_context_settings_r_is_inc[] = { |
@@ -137,7 +137,7 @@ const struct button_mapping button_context_settings_r_is_inc[] = { | |||
137 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 137 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
138 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, | 138 | { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, |
139 | 139 | ||
140 | LAST_ITEM_IN_LIST | 140 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
141 | }; /* button_context_settingsgraphical */ | 141 | }; /* button_context_settingsgraphical */ |
142 | 142 | ||
143 | const struct button_mapping button_context_pitchscreen[] = { | 143 | const struct button_mapping button_context_pitchscreen[] = { |
@@ -152,7 +152,7 @@ const struct button_mapping button_context_pitchscreen[] = { | |||
152 | { ACTION_PS_RESET, BUTTON_POWER, BUTTON_NONE }, | 152 | { ACTION_PS_RESET, BUTTON_POWER, BUTTON_NONE }, |
153 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, | 153 | { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, |
154 | 154 | ||
155 | LAST_ITEM_IN_LIST | 155 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
156 | }; /* button_context_pitchscreen */ | 156 | }; /* button_context_pitchscreen */ |
157 | 157 | ||
158 | 158 | ||
@@ -168,14 +168,14 @@ const struct button_mapping remote_button_context_standard[] = { | |||
168 | { ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, | 168 | { ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, |
169 | { ACTION_STD_QUICKSCREEN,BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | 169 | { ACTION_STD_QUICKSCREEN,BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, |
170 | 170 | ||
171 | LAST_ITEM_IN_LIST | 171 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
172 | }; | 172 | }; |
173 | 173 | ||
174 | const struct button_mapping remote_button_context_tree[] = { | 174 | const struct button_mapping remote_button_context_tree[] = { |
175 | { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, | 175 | { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, |
176 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 176 | { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
177 | 177 | ||
178 | LAST_ITEM_IN_LIST | 178 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
179 | }; | 179 | }; |
180 | 180 | ||
181 | const struct button_mapping remote_button_context_wps[] = { | 181 | const struct button_mapping remote_button_context_wps[] = { |
@@ -199,7 +199,7 @@ const struct button_mapping remote_button_context_wps[] = { | |||
199 | { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, | 199 | { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, |
200 | 200 | ||
201 | 201 | ||
202 | LAST_ITEM_IN_LIST | 202 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
203 | }; | 203 | }; |
204 | 204 | ||
205 | const struct button_mapping button_context_recscreen[] = { | 205 | const struct button_mapping button_context_recscreen[] = { |
@@ -212,7 +212,7 @@ const struct button_mapping button_context_recscreen[] = { | |||
212 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | 212 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, |
213 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 213 | { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
214 | 214 | ||
215 | LAST_ITEM_IN_LIST | 215 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
216 | }; /* button_context_recscreen */ | 216 | }; /* button_context_recscreen */ |
217 | 217 | ||
218 | 218 | ||