diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-cowond2.c | 6 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 13 |
2 files changed, 11 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 8067fe47d0..37d622210a 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c | |||
@@ -72,8 +72,10 @@ static const struct button_mapping button_context_list[] = { | |||
72 | 72 | ||
73 | static const struct button_mapping button_context_tree[] = { | 73 | static const struct button_mapping button_context_tree[] = { |
74 | { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS }, | 74 | { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS }, |
75 | { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS|BUTTON_REPEAT }, | 75 | { ACTION_TREE_WPS, BUTTON_PLUS|BUTTON_MENU, BUTTON_PLUS|BUTTON_REPEAT }, |
76 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 76 | { ACTION_TREE_STOP, BUTTON_MINUS|BUTTON_POWER, BUTTON_MINUS }, |
77 | { ACTION_TREE_STOP, BUTTON_MINUS|BUTTON_POWER, BUTTON_MINUS|BUTTON_REPEAT }, | ||
78 | |||
77 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 79 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
78 | }; /* button_context_tree */ | 80 | }; /* button_context_tree */ |
79 | 81 | ||
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 359045761b..a2547d074d 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -62,7 +62,7 @@ static const struct button_mapping button_context_standard[] = { | |||
62 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 62 | { ACTION_STD_CANCEL, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, |
63 | 63 | ||
64 | { ACTION_STD_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, | 64 | { ACTION_STD_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, |
65 | { ACTION_STD_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_NONE }, | 65 | { ACTION_STD_QUICKSCREEN, BUTTON_BOTTOMLEFT, BUTTON_NONE }, |
66 | { ACTION_STD_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | 66 | { ACTION_STD_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, |
67 | { ACTION_STD_CONTEXT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, | 67 | { ACTION_STD_CONTEXT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, |
68 | 68 | ||
@@ -91,8 +91,8 @@ static const struct button_mapping button_context_wps[] = { | |||
91 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | 91 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, |
92 | 92 | ||
93 | { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, | 93 | { ACTION_WPS_MENU, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, |
94 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, | 94 | { ACTION_WPS_QUICKSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, |
95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, | 95 | { ACTION_WPS_VIEW_PLAYLIST, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, |
96 | { ACTION_WPS_REC, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, | 96 | { ACTION_WPS_REC, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, |
97 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | 97 | { ACTION_WPS_PITCHSCREEN, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, |
98 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | 98 | { ACTION_WPS_ID3SCREEN, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, |
@@ -121,16 +121,17 @@ static const struct button_mapping button_context_list[] = { | |||
121 | 121 | ||
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 | { ACTION_TREE_STOP, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, | ||
124 | 125 | ||
125 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) | 126 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE) |
126 | }; /* button_context_tree */ | 127 | }; /* button_context_tree */ |
127 | 128 | ||
128 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { | 129 | static const struct button_mapping button_context_listtree_scroll_with_combo[] = { |
129 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE), | 130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
130 | }; | 131 | }; |
131 | 132 | ||
132 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { | 133 | static const struct button_mapping button_context_listtree_scroll_without_combo[] = { |
133 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_CUSTOM|CONTEXT_TREE), | 134 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE), |
134 | }; | 135 | }; |
135 | 136 | ||
136 | static const struct button_mapping button_context_settings[] = { | 137 | static const struct button_mapping button_context_settings[] = { |
@@ -182,7 +183,7 @@ static const struct button_mapping button_context_eq[] = { | |||
182 | 183 | ||
183 | /* Bookmark Screen */ | 184 | /* Bookmark Screen */ |
184 | static const struct button_mapping button_context_bmark[] = { | 185 | static const struct button_mapping button_context_bmark[] = { |
185 | { ACTION_BMS_DELETE, BUTTON_BOTTOMLEFT, BUTTON_NONE }, | 186 | { ACTION_BMS_DELETE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, |
186 | 187 | ||
187 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_BOOKMARKSCREEN), | 188 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_BOOKMARKSCREEN), |
188 | }; /* button_context_bmark */ | 189 | }; /* button_context_bmark */ |