diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-cowond2.c | 17 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchpad.c | 9 |
2 files changed, 21 insertions, 5 deletions
diff --git a/apps/keymaps/keymap-cowond2.c b/apps/keymaps/keymap-cowond2.c index 8dbc299527..3afee098d9 100644 --- a/apps/keymaps/keymap-cowond2.c +++ b/apps/keymaps/keymap-cowond2.c | |||
@@ -42,11 +42,14 @@ static const struct button_mapping button_context_standard[] = { | |||
42 | { ACTION_STD_NEXT, BUTTON_PLUS, BUTTON_NONE }, | 42 | { ACTION_STD_NEXT, BUTTON_PLUS, BUTTON_NONE }, |
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_NONE }, | 45 | { ACTION_STD_OK, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
46 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 46 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, |
47 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
48 | |||
47 | // { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | 49 | // { ACTION_STD_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, |
48 | { ACTION_STD_CONTEXT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | 50 | { ACTION_STD_CONTEXT, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, |
49 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | 51 | |
52 | |||
50 | LAST_ITEM_IN_LIST | 53 | LAST_ITEM_IN_LIST |
51 | }; /* button_context_standard */ | 54 | }; /* button_context_standard */ |
52 | 55 | ||
@@ -55,9 +58,13 @@ static const struct button_mapping button_context_wps[] = { | |||
55 | 58 | ||
56 | { ACTION_WPS_VOLDOWN, BUTTON_MINUS, BUTTON_NONE }, | 59 | { ACTION_WPS_VOLDOWN, BUTTON_MINUS, BUTTON_NONE }, |
57 | { ACTION_WPS_VOLDOWN, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE }, | 60 | { ACTION_WPS_VOLDOWN, BUTTON_MINUS|BUTTON_REPEAT, BUTTON_NONE }, |
58 | { ACTION_WPS_VOLUP, BUTTON_PLUS, BUTTON_NONE }, | 61 | { ACTION_WPS_VOLUP, BUTTON_PLUS, BUTTON_NONE }, |
59 | { ACTION_WPS_VOLUP, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, | 62 | { ACTION_WPS_VOLUP, BUTTON_PLUS|BUTTON_REPEAT, BUTTON_NONE }, |
60 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 63 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
64 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
65 | |||
66 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
67 | |||
61 | LAST_ITEM_IN_LIST | 68 | LAST_ITEM_IN_LIST |
62 | }; /* button_context_wps */ | 69 | }; /* button_context_wps */ |
63 | 70 | ||
diff --git a/apps/keymaps/keymap-touchpad.c b/apps/keymaps/keymap-touchpad.c index 7b60a80ed1..a6a4baad66 100644 --- a/apps/keymaps/keymap-touchpad.c +++ b/apps/keymaps/keymap-touchpad.c | |||
@@ -67,6 +67,15 @@ static const struct button_mapping button_context_standard[] = { | |||
67 | }; /* button_context_standard */ | 67 | }; /* button_context_standard */ |
68 | 68 | ||
69 | static const struct button_mapping button_context_wps[] = { | 69 | static const struct button_mapping button_context_wps[] = { |
70 | |||
71 | { ACTION_WPS_SKIPNEXT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | ||
72 | { ACTION_WPS_SKIPPREV, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, | ||
73 | |||
74 | { ACTION_WPS_SEEKBACK, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
75 | { ACTION_WPS_SEEKFWD, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
76 | { ACTION_WPS_STOPSEEK, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT|BUTTON_REPEAT }, | ||
77 | { ACTION_WPS_STOPSEEK, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT|BUTTON_REPEAT }, | ||
78 | |||
70 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) | 79 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_WPS) |
71 | }; /* button_context_wps */ | 80 | }; /* button_context_wps */ |
72 | 81 | ||