summaryrefslogtreecommitdiff
path: root/apps/keymaps/keymap-e200.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/keymaps/keymap-e200.c')
-rw-r--r--apps/keymaps/keymap-e200.c44
1 files changed, 21 insertions, 23 deletions
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c
index a4763f8f76..76e440f63d 100644
--- a/apps/keymaps/keymap-e200.c
+++ b/apps/keymaps/keymap-e200.c
@@ -45,7 +45,6 @@ static const struct button_mapping button_context_standard[] = {
45 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, 45 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT },
46 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE }, 46 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
47 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, 47 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
48 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
49 48
50 { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, 49 { ACTION_STD_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
51 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, 50 { ACTION_STD_CONTEXT, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT },
@@ -90,16 +89,16 @@ static const struct button_mapping button_context_wps[] = {
90}; /* button_context_wps */ 89}; /* button_context_wps */
91 90
92static const struct button_mapping button_context_settings[] = { 91static const struct button_mapping button_context_settings[] = {
93 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, 92 { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE },
94 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, 93 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
95 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 94 { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
96 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, 95 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
97 { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 96 { ACTION_SETTINGS_DECREPEAT,BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
98 97
99 { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, 98 { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
100 { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, 99 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
101 { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, 100 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
102 { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, 101 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
103 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE }, 102 { ACTION_SETTINGS_RESET, BUTTON_SELECT, BUTTON_NONE },
104 103
105 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 104 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
@@ -167,18 +166,17 @@ static const struct button_mapping button_context_quickscreen[] = {
167static const struct button_mapping button_context_settings_right_is_inc[] = { 166static const struct button_mapping button_context_settings_right_is_inc[] = {
168 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, 167 { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE },
169 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 168 { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
170 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, 169 { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE },
171 { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE }, 170 { ACTION_SETTINGS_DECREPEAT, BUTTON_SCROLL_BACK|BUTTON_REPEAT,BUTTON_NONE },
172 171
173 { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_NONE }, 172 { ACTION_STD_PREV, BUTTON_UP|BUTTON_REL, BUTTON_UP },
174 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, 173 { ACTION_STD_PREVREPEAT, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP },
175 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE }, 174 { ACTION_STD_NEXT, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN },
176 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, 175 { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN },
177 { ACTION_NONE, BUTTON_SELECT, BUTTON_NONE }, 176 { ACTION_NONE, BUTTON_SELECT, BUTTON_NONE },
178 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, 177 { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE },
179 { ACTION_NONE, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, 178 { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT },
180 { ACTION_NONE, BUTTON_POWER, BUTTON_NONE }, 179 { ACTION_STD_OK, BUTTON_RIGHT, BUTTON_NONE },
181 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
182 180
183 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), 181 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
184}; /* button_context_settings_right_is_inc */ 182}; /* button_context_settings_right_is_inc */
@@ -193,8 +191,8 @@ static const struct button_mapping button_context_settings_time[] = {
193}; /* button_context_settings_time */ 191}; /* button_context_settings_time */
194 192
195static const struct button_mapping button_context_pitchscreen[] = { 193static const struct button_mapping button_context_pitchscreen[] = {
196 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE }, 194 { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD, BUTTON_NONE },
197 { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 195 { ACTION_PS_INC_BIG, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
198 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, 196 { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE },
199 { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 197 { ACTION_PS_DEC_BIG, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
200 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, 198 { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE },
@@ -212,7 +210,7 @@ static const struct button_mapping button_context_pitchscreen[] = {
212/** Recording Screen **/ 210/** Recording Screen **/
213static const struct button_mapping button_context_recscreen[] = { 211static const struct button_mapping button_context_recscreen[] = {
214 { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP }, 212 { ACTION_REC_PAUSE, BUTTON_UP|BUTTON_REL, BUTTON_UP },
215 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, 213 { ACTION_STD_CANCEL, BUTTON_DOWN, BUTTON_NONE },
216 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, 214 { ACTION_REC_NEWFILE, BUTTON_REC|BUTTON_REL, BUTTON_REC },
217 { ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT}, 215 { ACTION_STD_MENU, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT},
218 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, 216 { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE },
@@ -223,7 +221,7 @@ static const struct button_mapping button_context_recscreen[] = {
223 { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, 221 { ACTION_STD_PREV, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE },
224 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE }, 222 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD, BUTTON_NONE },
225 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, 223 { ACTION_STD_NEXT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE },
226 { ACTION_NONE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, 224 { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE },
227 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 225 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
228}; /* button_context_recscreen */ 226}; /* button_context_recscreen */
229 227