diff options
Diffstat (limited to 'apps/keymaps/keymap-touchscreen.c')
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index dae3522cfa..97a40955e7 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -122,7 +122,7 @@ static const struct button_mapping button_context_list[] = { | |||
122 | static const struct button_mapping button_context_tree[] = { | 122 | static const struct button_mapping button_context_tree[] = { |
123 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | 123 | { ACTION_TREE_WPS, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, |
124 | 124 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM2|CONTEXT_TREE) | 125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) |
126 | }; /* button_context_tree */ | 126 | }; /* button_context_tree */ |
127 | 127 | ||
128 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 128 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
@@ -138,19 +138,26 @@ static const struct button_mapping button_context_settings[] = { | |||
138 | { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 138 | { ACTION_SETTINGS_INCREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, |
139 | { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | 139 | { ACTION_SETTINGS_DEC, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, |
140 | { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 140 | { ACTION_SETTINGS_DECREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, |
141 | { ACTION_SETTINGS_RESET, BUTTON_CENTER, BUTTON_NONE }, | ||
142 | |||
143 | { ACTION_STD_PREV, BUTTON_MIDLEFT, BUTTON_NONE }, | ||
144 | { ACTION_STD_PREVREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
145 | { ACTION_STD_NEXT, BUTTON_MIDRIGHT, BUTTON_NONE }, | ||
146 | { ACTION_STD_NEXTREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
147 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, | ||
141 | 148 | ||
142 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS) | 149 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_SETTINGS) |
143 | }; /* button_context_settings */ | 150 | }; /* button_context_settings */ |
144 | 151 | ||
145 | static const struct button_mapping button_context_settings_right_is_inc[] = { | 152 | static const struct button_mapping button_context_settings_right_is_inc[] = { |
146 | { ACTION_STD_PREV, BUTTON_TOPMIDDLE, BUTTON_NONE }, | 153 | { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, |
147 | { ACTION_STD_PREVREPEAT, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { ACTION_NONE, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, |
148 | { ACTION_STD_NEXT, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | ||
149 | { ACTION_STD_NEXTREPEAT, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
150 | { ACTION_SETTINGS_INC, BUTTON_MIDRIGHT, BUTTON_NONE }, | 155 | { ACTION_SETTINGS_INC, BUTTON_MIDRIGHT, BUTTON_NONE }, |
151 | { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | 156 | { ACTION_SETTINGS_INCREPEAT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, |
152 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, | 157 | { ACTION_SETTINGS_DEC, BUTTON_MIDLEFT, BUTTON_NONE }, |
153 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 158 | { ACTION_SETTINGS_DECREPEAT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
159 | { ACTION_SETTINGS_RESET, BUTTON_CENTER, BUTTON_NONE }, | ||
160 | |||
154 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, | 161 | { ACTION_STD_CANCEL, BUTTON_TOPLEFT, BUTTON_NONE }, |
155 | 162 | ||
156 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) | 163 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_SETTINGS) |
@@ -351,7 +358,9 @@ const struct button_mapping* get_context_mapping(int context) | |||
351 | || context & CONTEXT_REMOTE | 358 | || context & CONTEXT_REMOTE |
352 | #endif | 359 | #endif |
353 | ) | 360 | ) |
361 | { | ||
354 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); | 362 | return target_get_context_mapping(context & ~CONTEXT_CUSTOM2); |
363 | } | ||
355 | 364 | ||
356 | switch (context) | 365 | switch (context) |
357 | { | 366 | { |