diff options
Diffstat (limited to 'apps/keymaps/keymap-h10.c')
-rw-r--r-- | apps/keymaps/keymap-h10.c | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 413683518c..029615faa5 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -66,11 +66,12 @@ const struct button_mapping button_context_wps[] = { | |||
66 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | 66 | { ACTION_WPS_QUICKSCREEN, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
67 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | 67 | { ACTION_WPS_CONTEXT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
68 | { ACTION_WPS_MENU, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | 68 | { ACTION_WPS_MENU, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
69 | { ACTION_WPS_PITCHSCREEN, BUTTON_PLAY|BUTTON_LEFT, BUTTON_PLAY }, | ||
70 | { ACTION_WPS_ID3SCREEN, BUTTON_PLAY|BUTTON_RIGHT, BUTTON_PLAY }, | ||
69 | 71 | ||
70 | LAST_ITEM_IN_LIST | 72 | LAST_ITEM_IN_LIST |
71 | }; /* button_context_wps */ | 73 | }; /* button_context_wps */ |
72 | 74 | ||
73 | |||
74 | const struct button_mapping button_context_settings[] = { | 75 | const struct button_mapping button_context_settings[] = { |
75 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, | 76 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, |
76 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 77 | { ACTION_SETTINGS_INCREPEAT,BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
@@ -121,6 +122,38 @@ const struct button_mapping button_context_quickscreen[] = { | |||
121 | LAST_ITEM_IN_LIST | 122 | LAST_ITEM_IN_LIST |
122 | }; /* button_context_quickscreen */ | 123 | }; /* button_context_quickscreen */ |
123 | 124 | ||
125 | const struct button_mapping button_context_settingsgraphical[] = { | ||
126 | { ACTION_SETTINGS_INC, BUTTON_RIGHT, BUTTON_NONE }, | ||
127 | { ACTION_SETTINGS_INCREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
128 | { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, | ||
129 | { ACTION_SETTINGS_DECREPEAT, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
130 | { ACTION_STD_PREV, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
131 | { ACTION_STD_PREVREPEAT, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
132 | { ACTION_STD_NEXT, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
133 | { ACTION_STD_NEXTREPEAT, BUTTON_SCROLL_DOWN|BUTTON_REPEAT,BUTTON_NONE }, | ||
134 | { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, | ||
135 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
136 | |||
137 | LAST_ITEM_IN_LIST | ||
138 | }; /* button_context_settingsgraphical */ | ||
139 | |||
140 | const struct button_mapping button_context_pitchscreen[] = { | ||
141 | { ACTION_PS_INC_SMALL, BUTTON_SCROLL_UP, BUTTON_NONE }, | ||
142 | { ACTION_PS_INC_BIG, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
143 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | ||
144 | { ACTION_PS_DEC_BIG, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
145 | { ACTION_PS_NUDGE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
146 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, | ||
147 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
148 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, | ||
149 | { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE }, | ||
150 | { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, | ||
151 | |||
152 | LAST_ITEM_IN_LIST | ||
153 | }; /* button_context_pitchscreen */ | ||
154 | |||
155 | |||
156 | |||
124 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 157 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
125 | const struct button_mapping* get_context_mapping(int context) | 158 | const struct button_mapping* get_context_mapping(int context) |
126 | { | 159 | { |
@@ -132,7 +165,9 @@ const struct button_mapping* get_context_mapping(int context) | |||
132 | case CONTEXT_WPS: | 165 | case CONTEXT_WPS: |
133 | return button_context_wps; | 166 | return button_context_wps; |
134 | 167 | ||
135 | case CONTEXT_SETTINGS: | 168 | case CONTEXT_SETTINGSGRAPHICAL: |
169 | return button_context_settingsgraphical; | ||
170 | case CONTEXT_SETTINGS: | ||
136 | return button_context_settings; | 171 | return button_context_settings; |
137 | 172 | ||
138 | case CONTEXT_YESNOSCREEN: | 173 | case CONTEXT_YESNOSCREEN: |
@@ -146,6 +181,8 @@ const struct button_mapping* get_context_mapping(int context) | |||
146 | return button_context_tree; | 181 | return button_context_tree; |
147 | case CONTEXT_QUICKSCREEN: | 182 | case CONTEXT_QUICKSCREEN: |
148 | return button_context_quickscreen; | 183 | return button_context_quickscreen; |
184 | case CONTEXT_PITCHSCREEN: | ||
185 | return button_context_pitchscreen; | ||
149 | case CONTEXT_LIST: | 186 | case CONTEXT_LIST: |
150 | case CONTEXT_MAINMENU: | 187 | case CONTEXT_MAINMENU: |
151 | default: | 188 | default: |