diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-cowond2.c | 13 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchpad.c | 22 |
2 files changed, 30 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 3afee098d9..006003538c 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c | |||
@@ -43,12 +43,10 @@ static const struct button_mapping button_context_standard[] = { | |||
43 | { ACTION_STD_NEXTREPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | 43 | { ACTION_STD_NEXTREPEAT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, |
44 | 44 | ||
45 | { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 45 | { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
46 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 46 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
47 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
48 | |||
49 | // { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
50 | { ACTION_STD_CONTEXT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | ||
51 | 47 | ||
48 | { ACTION_STD_QUICKSCREEN, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | ||
49 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
52 | 50 | ||
53 | LAST_ITEM_IN_LIST | 51 | LAST_ITEM_IN_LIST |
54 | }; /* button_context_standard */ | 52 | }; /* button_context_standard */ |
@@ -128,6 +126,11 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
128 | 126 | ||
129 | static const struct button_mapping button_context_pitchscreen[] = { | 127 | static const struct button_mapping button_context_pitchscreen[] = { |
130 | 128 | ||
129 | { ACTION_PS_INC_SMALL, BUTTON_PLUS, BUTTON_NONE }, | ||
130 | { ACTION_PS_INC_SMALL, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | ||
131 | { ACTION_PS_DEC_SMALL, BUTTON_MINUS, BUTTON_NONE }, | ||
132 | { ACTION_PS_DEC_SMALL, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE }, | ||
133 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
131 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 134 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
132 | }; /* button_context_pitchcreen */ | 135 | }; /* button_context_pitchcreen */ |
133 | 136 | ||
diff --git a/apps/keymaps/keymap-touchpad.c b/apps/keymaps/keymap-touchpad.c index a6a4baad66..5cf30d304f 100644 --- a/apps/keymaps/keymap-touchpad.c +++ b/apps/keymaps/keymap-touchpad.c | |||
@@ -76,6 +76,8 @@ static const struct button_mapping button_context_wps[] = { | |||
76 | { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT }, | 76 | { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT }, |
77 | { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT }, | 77 | { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT }, |
78 | 78 | ||
79 | { ACTION_WPS_CONTEXT, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | ||
80 | { ACTION_WPS_QUICKSCREEN, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT }, | ||
79 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) | 81 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) |
80 | }; /* button_context_wps */ | 82 | }; /* button_context_wps */ |
81 | 83 | ||
@@ -159,11 +161,31 @@ static const struct button_mapping button_context_time[] = { | |||
159 | 161 | ||
160 | static const struct button_mapping button_context_quickscreen[] = { | 162 | static const struct button_mapping button_context_quickscreen[] = { |
161 | 163 | ||
164 | { ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE }, | ||
165 | { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE }, | ||
166 | { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
167 | { ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_NONE }, | ||
168 | { ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
169 | { ACTION_QS_LEFT, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE }, | ||
170 | { ACTION_QS_LEFT, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
171 | { ACTION_QS_RIGHT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_NONE }, | ||
172 | { ACTION_QS_RIGHT, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
162 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_QUICKSCREEN) | 173 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_QUICKSCREEN) |
163 | }; /* button_context_quickscreen */ | 174 | }; /* button_context_quickscreen */ |
164 | 175 | ||
165 | static const struct button_mapping button_context_pitchscreen[] = { | 176 | static const struct button_mapping button_context_pitchscreen[] = { |
166 | 177 | ||
178 | { ACTION_PS_INC_SMALL, BUTTON_TOPMIDDLE, BUTTON_NONE }, | ||
179 | { ACTION_PS_INC_BIG, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
180 | { ACTION_PS_DEC_SMALL, BUTTON_BOTTOMMIDDLE, BUTTON_NONE }, | ||
181 | { ACTION_PS_DEC_BIG, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE }, | ||
182 | { ACTION_PS_NUDGE_LEFT, BUTTON_MIDLEFT, BUTTON_NONE }, | ||
183 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE }, | ||
184 | { ACTION_PS_NUDGE_RIGHT, BUTTON_MIDRIGHT, BUTTON_NONE }, | ||
185 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_NONE }, | ||
186 | { ACTION_PS_TOGGLE_MODE, BUTTON_BOTTOMRIGHT, BUTTON_NONE }, | ||
187 | { ACTION_PS_RESET, BUTTON_CENTER, BUTTON_NONE }, | ||
188 | { ACTION_PS_EXIT, BUTTON_TOPLEFT, BUTTON_NONE }, | ||
167 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_PITCHSCREEN) | 189 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_PITCHSCREEN) |
168 | }; /* button_context_pitchcreen */ | 190 | }; /* button_context_pitchcreen */ |
169 | 191 | ||