diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 10:06:04 +0000 |
commit | 8c5141b32ea74a3093073d9bb11205acb7640233 (patch) | |
tree | 486f8e4f94053a389d840b04724567a524b9b4ea /apps/keymaps | |
parent | d7f4f9ff750872a9eb570409966e500099d84d7d (diff) | |
download | rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.tar.gz rockbox-8c5141b32ea74a3093073d9bb11205acb7640233.zip |
Commit "FS#10468 - USB HID: Show keypad mode on screen"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22852 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-c100.c | 61 | ||||
-rw-r--r-- | apps/keymaps/keymap-c200.c | 67 | ||||
-rw-r--r-- | apps/keymaps/keymap-clip.c | 67 | ||||
-rw-r--r-- | apps/keymaps/keymap-e200.c | 67 | ||||
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 107 | ||||
-rw-r--r-- | apps/keymaps/keymap-h10.c | 47 | ||||
-rw-r--r-- | apps/keymaps/keymap-hdd1630.c | 71 | ||||
-rw-r--r-- | apps/keymaps/keymap-ipod.c | 75 | ||||
-rw-r--r-- | apps/keymaps/keymap-mr100.c | 6 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondavx747.c | 16 | ||||
-rw-r--r-- | apps/keymaps/keymap-ondavx777.c | 4 | ||||
-rw-r--r-- | apps/keymaps/keymap-sa9200.c | 80 | ||||
-rw-r--r-- | apps/keymaps/keymap-touchscreen.c | 27 |
13 files changed, 526 insertions, 169 deletions
diff --git a/apps/keymaps/keymap-c100.c b/apps/keymaps/keymap-c100.c index a19549dbd9..fcb747b5fd 100644 --- a/apps/keymaps/keymap-c100.c +++ b/apps/keymaps/keymap-c100.c | |||
@@ -232,17 +232,60 @@ static const struct button_mapping button_context_bmark[] = { | |||
232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 232 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
233 | }; /* button_context_bmark */ | 233 | }; /* button_context_bmark */ |
234 | 234 | ||
235 | #ifdef HAVE_USBSTACK | 235 | #ifdef USB_ENABLE_HID |
236 | static const struct button_mapping button_context_usb_hid[] = { | 236 | static const struct button_mapping button_context_usb_hid[] = { |
237 | { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, | 237 | { ACTION_USB_HID_INC, BUTTON_VOLUP, BUTTON_NONE }, |
238 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 238 | { ACTION_USB_HID_INC, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, |
239 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 239 | { ACTION_USB_HID_DEC, BUTTON_VOLDOWN, BUTTON_NONE }, |
240 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 240 | { ACTION_USB_HID_DEC, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, |
241 | { ACTION_USB_HID_MUTE, BUTTON_VOLDOWN, BUTTON_NONE }, | 241 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
242 | { ACTION_USB_HID_MENU, BUTTON_DOWN, BUTTON_NONE }, | 242 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
243 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
244 | { ACTION_USB_HID_QUIT_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
245 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, | ||
246 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, | ||
247 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
248 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
249 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
250 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
251 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
252 | { ACTION_USB_HID_MODE, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
243 | 253 | ||
244 | LAST_ITEM_IN_LIST | 254 | LAST_ITEM_IN_LIST |
245 | }; /* button_context_usb_hid */ | 255 | }; /* button_context_usb_hid */ |
256 | |||
257 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
258 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
259 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
260 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
261 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
262 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
263 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
264 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
265 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
266 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
267 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
268 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
269 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
270 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
271 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
272 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
273 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
274 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, | ||
275 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
276 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, | ||
277 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
278 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, | ||
279 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
280 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
281 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
282 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
283 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
284 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, | ||
285 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | ||
286 | |||
287 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
288 | }; /* button_context_usb_hid_mouse */ | ||
246 | #endif | 289 | #endif |
247 | 290 | ||
248 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 291 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -293,9 +336,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
293 | #endif | 336 | #endif |
294 | case CONTEXT_KEYBOARD: | 337 | case CONTEXT_KEYBOARD: |
295 | return button_context_keyboard; | 338 | return button_context_keyboard; |
296 | #ifdef HAVE_USBSTACK | 339 | #ifdef USB_ENABLE_HID |
297 | case CONTEXT_USB_HID: | 340 | case CONTEXT_USB_HID: |
298 | return button_context_usb_hid; | 341 | return button_context_usb_hid; |
342 | case CONTEXT_USB_HID_MOUSE: | ||
343 | return button_context_usb_hid_mouse; | ||
299 | #endif | 344 | #endif |
300 | default: | 345 | default: |
301 | return button_context_standard; | 346 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-c200.c b/apps/keymaps/keymap-c200.c index acc4a6aaf0..fa6c64cec8 100644 --- a/apps/keymaps/keymap-c200.c +++ b/apps/keymaps/keymap-c200.c | |||
@@ -264,21 +264,62 @@ static const struct button_mapping button_context_bmark[] = { | |||
264 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 264 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
265 | }; /* button_context_bmark */ | 265 | }; /* button_context_bmark */ |
266 | 266 | ||
267 | #ifdef HAVE_USBSTACK | 267 | #ifdef USB_ENABLE_HID |
268 | static const struct button_mapping button_context_usb_hid[] = { | 268 | static const struct button_mapping button_context_usb_hid[] = { |
269 | { ACTION_USB_HID_PLAY, BUTTON_UP|BUTTON_REL, BUTTON_UP }, | 269 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
270 | { ACTION_USB_HID_STOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, | 270 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
271 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 271 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
272 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 272 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
273 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 273 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
274 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 274 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
275 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 275 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
276 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 276 | { ACTION_USB_HID_QUIT_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, |
277 | { ACTION_USB_HID_MUTE, BUTTON_DOWN, BUTTON_NONE }, | 277 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
278 | { ACTION_USB_HID_MENU, BUTTON_POWER, BUTTON_NONE }, | 278 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
279 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
280 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
281 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
282 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
283 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
284 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
285 | { ACTION_USB_HID_MODE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
286 | { ACTION_USB_HID_MODE_LONG, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
279 | 287 | ||
280 | LAST_ITEM_IN_LIST | 288 | LAST_ITEM_IN_LIST |
281 | }; /* button_context_usb_hid */ | 289 | }; /* button_context_usb_hid */ |
290 | |||
291 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
292 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
293 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
294 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
295 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
296 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
297 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
298 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
299 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
300 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
301 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
302 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
303 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
304 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
305 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
306 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
307 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
308 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | ||
320 | |||
321 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
322 | }; /* button_context_usb_hid_mouse */ | ||
282 | #endif | 323 | #endif |
283 | 324 | ||
284 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 325 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -327,9 +368,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
327 | #endif | 368 | #endif |
328 | case CONTEXT_KEYBOARD: | 369 | case CONTEXT_KEYBOARD: |
329 | return button_context_keyboard; | 370 | return button_context_keyboard; |
330 | #ifdef HAVE_USBSTACK | 371 | #ifdef USB_ENABLE_HID |
331 | case CONTEXT_USB_HID: | 372 | case CONTEXT_USB_HID: |
332 | return button_context_usb_hid; | 373 | return button_context_usb_hid; |
374 | case CONTEXT_USB_HID_MOUSE: | ||
375 | return button_context_usb_hid_mouse; | ||
333 | #endif | 376 | #endif |
334 | default: | 377 | default: |
335 | return button_context_standard; | 378 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c index 5b45f4fb3d..21728db7fb 100644 --- a/apps/keymaps/keymap-clip.c +++ b/apps/keymaps/keymap-clip.c | |||
@@ -273,21 +273,62 @@ static const struct button_mapping button_context_bmark[] = { | |||
273 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 273 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
274 | }; /* button_context_bmark */ | 274 | }; /* button_context_bmark */ |
275 | 275 | ||
276 | #ifdef HAVE_USBSTACK | 276 | #ifdef USB_ENABLE_HID |
277 | static const struct button_mapping button_context_usb_hid[] = { | 277 | static const struct button_mapping button_context_usb_hid[] = { |
278 | { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, | 278 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
279 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 279 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
280 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 280 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
281 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 281 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
282 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 282 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
283 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 283 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BOTTOM_REPEAT, BUTTON_UP }, |
284 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 284 | { ACTION_USB_HID_QUIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
285 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 285 | { ACTION_USB_HID_QUIT_LONG, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
286 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 286 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
287 | { ACTION_USB_HID_MENU, BUTTON_DOWN, BUTTON_NONE }, | 287 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
288 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
289 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
290 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
291 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
292 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
293 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
294 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
295 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
288 | 296 | ||
289 | LAST_ITEM_IN_LIST | 297 | LAST_ITEM_IN_LIST |
290 | }; /* button_context_usb_hid */ | 298 | }; /* button_context_usb_hid */ |
299 | |||
300 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
301 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
302 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
303 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
304 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
305 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
306 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
307 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
308 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_HOME|BUTTON_UP, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_HOME|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_HOME|BUTTON_DOWN, BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_HOME|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_HOME|BUTTON_LEFT, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_HOME|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_HOME|BUTTON_RIGHT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_HOME|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_HOME, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_HOME|BUTTON_REL, BUTTON_NONE }, | ||
329 | |||
330 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
331 | }; /* button_context_usb_hid_mouse */ | ||
291 | #endif | 332 | #endif |
292 | 333 | ||
293 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 334 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -337,9 +378,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
337 | #endif | 378 | #endif |
338 | case CONTEXT_KEYBOARD: | 379 | case CONTEXT_KEYBOARD: |
339 | return button_context_keyboard; | 380 | return button_context_keyboard; |
340 | #ifdef HAVE_USBSTACK | 381 | #ifdef USB_ENABLE_HID |
341 | case CONTEXT_USB_HID: | 382 | case CONTEXT_USB_HID: |
342 | return button_context_usb_hid; | 383 | return button_context_usb_hid; |
384 | case CONTEXT_USB_HID_MOUSE: | ||
385 | return button_context_usb_hid_mouse; | ||
343 | #endif | 386 | #endif |
344 | default: | 387 | default: |
345 | return button_context_standard; | 388 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-e200.c b/apps/keymaps/keymap-e200.c index ede06515ef..ef5c932f20 100644 --- a/apps/keymaps/keymap-e200.c +++ b/apps/keymaps/keymap-e200.c | |||
@@ -275,21 +275,62 @@ static const struct button_mapping button_context_bmark[] = { | |||
275 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 275 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
276 | }; /* button_context_bmark */ | 276 | }; /* button_context_bmark */ |
277 | 277 | ||
278 | #ifdef HAVE_USBSTACK | 278 | #ifdef USB_ENABLE_HID |
279 | static const struct button_mapping button_context_usb_hid[] = { | 279 | static const struct button_mapping button_context_usb_hid[] = { |
280 | { ACTION_USB_HID_PLAY, BUTTON_UP, BUTTON_NONE }, | 280 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
281 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 281 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
282 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 282 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
283 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 283 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
284 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 284 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
285 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | 285 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
286 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 286 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
287 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | 287 | { ACTION_USB_HID_QUIT_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, |
288 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 288 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
289 | { ACTION_USB_HID_MENU, BUTTON_DOWN, BUTTON_NONE }, | 289 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
290 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
291 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
292 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
293 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
294 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
295 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
296 | { ACTION_USB_HID_MODE, BUTTON_REC|BUTTON_REL, BUTTON_REC }, | ||
297 | { ACTION_USB_HID_MODE_LONG, BUTTON_REC|BUTTON_REPEAT, BUTTON_REC }, | ||
290 | 298 | ||
291 | LAST_ITEM_IN_LIST | 299 | LAST_ITEM_IN_LIST |
292 | }; /* button_context_usb_hid */ | 300 | }; /* button_context_usb_hid */ |
301 | |||
302 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
303 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
304 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
305 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
306 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
307 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
308 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
329 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, | ||
330 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | ||
331 | |||
332 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
333 | }; /* button_context_usb_hid_mouse */ | ||
293 | #endif | 334 | #endif |
294 | 335 | ||
295 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ | 336 | /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ |
@@ -339,9 +380,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
339 | return button_context_recscreen; | 380 | return button_context_recscreen; |
340 | case CONTEXT_KEYBOARD: | 381 | case CONTEXT_KEYBOARD: |
341 | return button_context_keyboard; | 382 | return button_context_keyboard; |
342 | #ifdef HAVE_USBSTACK | 383 | #ifdef USB_ENABLE_HID |
343 | case CONTEXT_USB_HID: | 384 | case CONTEXT_USB_HID: |
344 | return button_context_usb_hid; | 385 | return button_context_usb_hid; |
386 | case CONTEXT_USB_HID_MOUSE: | ||
387 | return button_context_usb_hid_mouse; | ||
345 | #endif | 388 | #endif |
346 | default: | 389 | default: |
347 | return button_context_standard; | 390 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 4fb7e1b3f1..6c5b6decb5 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -468,40 +468,91 @@ static const struct button_mapping remote_button_context_right_is_inc[] = { | |||
468 | LAST_ITEM_IN_LIST | 468 | LAST_ITEM_IN_LIST |
469 | }; /* remote_button_context_right_is_inc */ | 469 | }; /* remote_button_context_right_is_inc */ |
470 | 470 | ||
471 | #ifdef HAVE_USBSTACK | 471 | #ifdef USB_ENABLE_HID |
472 | static const struct button_mapping button_context_usb_hid[] = { | 472 | static const struct button_mapping button_context_usb_hid[] = { |
473 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, | 473 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
474 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 474 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
475 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 475 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
476 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 476 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
477 | { ACTION_USB_HID_VOLUP, BUTTON_UP, BUTTON_NONE }, | 477 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_START }, |
478 | { ACTION_USB_HID_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 478 | { ACTION_USB_HID_START_LONG, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_START }, |
479 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 479 | { ACTION_USB_HID_QUIT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
480 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 480 | { ACTION_USB_HID_QUIT_LONG, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
481 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 481 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
482 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 482 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
483 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 483 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
484 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 484 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
485 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 485 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
486 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 486 | { ACTION_USB_HID_SELECT, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, |
487 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
488 | { ACTION_USB_HID_SELECT_LONG, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, | ||
489 | { ACTION_USB_HID_MENU, BUTTON_DOWN|BUTTON_REL, BUTTON_DOWN }, | ||
490 | { ACTION_USB_HID_MENU_LONG, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
491 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
492 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
487 | 493 | ||
488 | LAST_ITEM_IN_LIST | 494 | LAST_ITEM_IN_LIST |
489 | }; /* button_context_usb_hid */ | 495 | }; /* button_context_usb_hid */ |
490 | 496 | ||
491 | static const struct button_mapping remote_button_context_usb_hid[] = { | 497 | static const struct button_mapping remote_button_context_usb_hid[] = { |
492 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 498 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
493 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 499 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
494 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, | 500 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
495 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, | 501 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
496 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 502 | { ACTION_USB_HID_START, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
497 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 503 | { ACTION_USB_HID_QUIT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
498 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 504 | { ACTION_USB_HID_LEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, |
499 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 505 | { ACTION_USB_HID_RIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF}, |
500 | { ACTION_USB_HID_MUTE, BUTTON_RC_DSP|BUTTON_REPEAT, BUTTON_NONE }, | 506 | { ACTION_USB_HID_SELECT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, |
501 | { ACTION_USB_HID_MENU, BUTTON_RC_DSP, BUTTON_NONE }, | 507 | { ACTION_USB_HID_SELECT_LONG, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, |
508 | { ACTION_USB_HID_MENU, BUTTON_RC_DSP|BUTTON_REPEAT, BUTTON_RC_DSP }, | ||
509 | { ACTION_USB_HID_MODE, BUTTON_RC_DSP|BUTTON_REL, BUTTON_RC_DSP }, | ||
502 | 510 | ||
503 | LAST_ITEM_IN_LIST | 511 | LAST_ITEM_IN_LIST |
504 | }; /* remote_button_context_usb_hid */ | 512 | }; /* remote_button_context_usb_hid */ |
513 | |||
514 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
515 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
516 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
517 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
518 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
519 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
520 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
521 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
522 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
523 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
524 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_BACK|BUTTON_UP, BUTTON_NONE }, | ||
525 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
526 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_BACK|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
527 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
528 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_BACK|BUTTON_DOWN, BUTTON_NONE }, | ||
529 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
530 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_BACK|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
531 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
532 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_BACK|BUTTON_LEFT, BUTTON_NONE }, | ||
533 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
534 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_BACK|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
535 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
536 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_BACK|BUTTON_RIGHT, BUTTON_NONE }, | ||
537 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
538 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_BACK|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
539 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_MENU|BUTTON_UP, BUTTON_NONE }, | ||
540 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_MENU|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
541 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_MENU|BUTTON_DOWN, BUTTON_NONE }, | ||
542 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_MENU|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
543 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_MENU|BUTTON_LEFT, BUTTON_NONE }, | ||
544 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
545 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_MENU|BUTTON_RIGHT, BUTTON_NONE }, | ||
546 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
547 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
548 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_BACK, BUTTON_NONE }, | ||
549 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
550 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_BACK|BUTTON_REL, BUTTON_NONE }, | ||
551 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_MENU, BUTTON_NONE }, | ||
552 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE }, | ||
553 | |||
554 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
555 | }; /* button_context_usb_hid_mouse */ | ||
505 | #endif | 556 | #endif |
506 | 557 | ||
507 | static const struct button_mapping* get_context_mapping_remote( int context ) | 558 | static const struct button_mapping* get_context_mapping_remote( int context ) |
@@ -546,7 +597,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
546 | case CONTEXT_FM: | 597 | case CONTEXT_FM: |
547 | return remote_button_context_radio; | 598 | return remote_button_context_radio; |
548 | 599 | ||
549 | #ifdef HAVE_USBSTACK | 600 | #ifdef USB_ENABLE_HID |
550 | case CONTEXT_USB_HID: | 601 | case CONTEXT_USB_HID: |
551 | return remote_button_context_usb_hid; | 602 | return remote_button_context_usb_hid; |
552 | #endif | 603 | #endif |
@@ -617,9 +668,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
617 | case CONTEXT_FM: | 668 | case CONTEXT_FM: |
618 | return button_context_radio; | 669 | return button_context_radio; |
619 | 670 | ||
620 | #ifdef HAVE_USBSTACK | 671 | #ifdef USB_ENABLE_HID |
621 | case CONTEXT_USB_HID: | 672 | case CONTEXT_USB_HID: |
622 | return button_context_usb_hid; | 673 | return button_context_usb_hid; |
674 | case CONTEXT_USB_HID_MOUSE: | ||
675 | return button_context_usb_hid_mouse; | ||
623 | #endif | 676 | #endif |
624 | default: | 677 | default: |
625 | return button_context_standard; | 678 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index ad1ed64c5a..81673397c3 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -337,30 +337,37 @@ static const struct button_mapping button_context_radio[] = { | |||
337 | 337 | ||
338 | }; | 338 | }; |
339 | 339 | ||
340 | #ifdef HAVE_USBSTACK | 340 | #ifdef USB_ENABLE_HID |
341 | static const struct button_mapping button_context_usb_hid[] = { | 341 | static const struct button_mapping button_context_usb_hid[] = { |
342 | { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 342 | { ACTION_USB_HID_INC, BUTTON_SCROLL_UP, BUTTON_NONE }, |
343 | { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 343 | { ACTION_USB_HID_INC, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
344 | { ACTION_USB_HID_SKIPPREV, BUTTON_REW, BUTTON_NONE }, | 344 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_DOWN, BUTTON_NONE }, |
345 | { ACTION_USB_HID_SKIPNEXT, BUTTON_FF, BUTTON_NONE }, | 345 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
346 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP, BUTTON_NONE }, | 346 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
347 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 347 | { ACTION_USB_HID_START_LONG, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
348 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE }, | 348 | { ACTION_USB_HID_QUIT, BUTTON_REW|BUTTON_REL, BUTTON_REW }, |
349 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 349 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
350 | { ACTION_USB_HID_MENU, BUTTON_POWER, BUTTON_NONE }, | 350 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
351 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, | ||
352 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, | ||
353 | { ACTION_USB_HID_SELECT, BUTTON_FF|BUTTON_REL, BUTTON_FF }, | ||
354 | { ACTION_USB_HID_MENU, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
355 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
351 | 356 | ||
352 | LAST_ITEM_IN_LIST | 357 | LAST_ITEM_IN_LIST |
353 | }; /* button_context_usb_hid */ | 358 | }; /* button_context_usb_hid */ |
354 | 359 | ||
355 | static const struct button_mapping remote_button_context_usb_hid[] = { | 360 | static const struct button_mapping remote_button_context_usb_hid[] = { |
356 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 361 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
357 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 362 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
358 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, | 363 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
359 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, | 364 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
360 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 365 | { ACTION_USB_HID_START, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
361 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 366 | { ACTION_USB_HID_QUIT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
362 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 367 | { ACTION_USB_HID_LEFT, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW }, |
363 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 368 | { ACTION_USB_HID_LEFT_LONG, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_RC_REW }, |
369 | { ACTION_USB_HID_RIGHT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
370 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_RC_FF }, | ||
364 | 371 | ||
365 | LAST_ITEM_IN_LIST | 372 | LAST_ITEM_IN_LIST |
366 | }; /* remote_button_context_usb_hid */ | 373 | }; /* remote_button_context_usb_hid */ |
@@ -395,7 +402,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
395 | return remote_button_context_pitchscreen; | 402 | return remote_button_context_pitchscreen; |
396 | case CONTEXT_RECSCREEN: | 403 | case CONTEXT_RECSCREEN: |
397 | return button_context_recscreen; | 404 | return button_context_recscreen; |
398 | #ifdef HAVE_USBSTACK | 405 | #ifdef USB_ENABLE_HID |
399 | case CONTEXT_USB_HID: | 406 | case CONTEXT_USB_HID: |
400 | return remote_button_context_usb_hid; | 407 | return remote_button_context_usb_hid; |
401 | #endif | 408 | #endif |
@@ -453,7 +460,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
453 | return button_context_recscreen; | 460 | return button_context_recscreen; |
454 | case CONTEXT_FM: | 461 | case CONTEXT_FM: |
455 | return button_context_radio; | 462 | return button_context_radio; |
456 | #ifdef HAVE_USBSTACK | 463 | #ifdef USB_ENABLE_HID |
457 | case CONTEXT_USB_HID: | 464 | case CONTEXT_USB_HID: |
458 | return button_context_usb_hid; | 465 | return button_context_usb_hid; |
459 | #endif | 466 | #endif |
diff --git a/apps/keymaps/keymap-hdd1630.c b/apps/keymaps/keymap-hdd1630.c index 4565c2807b..ddb357a8b1 100644 --- a/apps/keymaps/keymap-hdd1630.c +++ b/apps/keymaps/keymap-hdd1630.c | |||
@@ -284,25 +284,62 @@ static const struct button_mapping button_context_radio[] = { | |||
284 | }; | 284 | }; |
285 | #endif | 285 | #endif |
286 | 286 | ||
287 | #ifdef HAVE_USBSTACK | 287 | #ifdef USB_ENABLE_HID |
288 | static const struct button_mapping button_context_usb_hid[] = { | 288 | static const struct button_mapping button_context_usb_hid[] = { |
289 | { ACTION_USB_HID_PLAY, BUTTON_VIEW, BUTTON_NONE }, | 289 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
290 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 290 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
291 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 291 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
292 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 292 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
293 | { ACTION_USB_HID_VOLUP, BUTTON_UP, BUTTON_NONE }, | 293 | { ACTION_USB_HID_START, BUTTON_UP|BUTTON_REL, BUTTON_UP }, |
294 | { ACTION_USB_HID_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 294 | { ACTION_USB_HID_START_LONG, BUTTON_UP|BUTTON_REPEAT, BUTTON_UP }, |
295 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 295 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
296 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 296 | { ACTION_USB_HID_QUIT_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, |
297 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 297 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
298 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 298 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
299 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 299 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
300 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 300 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
301 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 301 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, |
302 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 302 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, |
303 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
304 | { ACTION_USB_HID_MENU_LONG, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
305 | { ACTION_USB_HID_MODE, BUTTON_VIEW|BUTTON_REL, BUTTON_VIEW }, | ||
306 | { ACTION_USB_HID_MODE_LONG, BUTTON_VIEW|BUTTON_REPEAT, BUTTON_VIEW }, | ||
303 | 307 | ||
304 | LAST_ITEM_IN_LIST | 308 | LAST_ITEM_IN_LIST |
305 | }; /* button_context_usb_hid */ | 309 | }; /* button_context_usb_hid */ |
310 | |||
311 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
312 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_UP, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_DOWN, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_POWER|BUTTON_UP, BUTTON_NONE }, | ||
329 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_POWER|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
330 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_POWER|BUTTON_DOWN, BUTTON_NONE }, | ||
331 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_POWER|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
332 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_POWER|BUTTON_LEFT, BUTTON_NONE }, | ||
333 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_POWER|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
334 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_POWER|BUTTON_RIGHT, BUTTON_NONE }, | ||
335 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_POWER|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
336 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
337 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
338 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_POWER, BUTTON_NONE }, | ||
339 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, | ||
340 | |||
341 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
342 | }; /* button_context_usb_hid_mouse */ | ||
306 | #endif | 343 | #endif |
307 | 344 | ||
308 | const struct button_mapping* get_context_mapping(int context) | 345 | const struct button_mapping* get_context_mapping(int context) |
@@ -352,9 +389,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
352 | case CONTEXT_FM: | 389 | case CONTEXT_FM: |
353 | return button_context_radio; | 390 | return button_context_radio; |
354 | #endif | 391 | #endif |
355 | #ifdef HAVE_USBSTACK | 392 | #ifdef USB_ENABLE_HID |
356 | case CONTEXT_USB_HID: | 393 | case CONTEXT_USB_HID: |
357 | return button_context_usb_hid; | 394 | return button_context_usb_hid; |
395 | case CONTEXT_USB_HID_MOUSE: | ||
396 | return button_context_usb_hid_mouse; | ||
358 | #endif | 397 | #endif |
359 | } | 398 | } |
360 | return button_context_standard; | 399 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 774597a3c0..99c7f93511 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c | |||
@@ -193,21 +193,48 @@ const struct button_mapping button_context_recscreen[] = { | |||
193 | }; /* button_context_recscreen */ | 193 | }; /* button_context_recscreen */ |
194 | #endif | 194 | #endif |
195 | 195 | ||
196 | #ifdef HAVE_USBSTACK | 196 | #ifdef USB_ENABLE_HID |
197 | static const struct button_mapping button_context_usb_hid[] = { | 197 | static const struct button_mapping button_context_usb_hid[] = { |
198 | { ACTION_USB_HID_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 198 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
199 | { ACTION_USB_HID_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 199 | { ACTION_USB_HID_INC, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, |
200 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 200 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
201 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 201 | { ACTION_USB_HID_DEC, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, |
202 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 202 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
203 | { ACTION_USB_HID_VOLUP, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | 203 | { ACTION_USB_HID_QUIT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
204 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 204 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
205 | { ACTION_USB_HID_VOLDOWN, BUTTON_SCROLL_BACK|BUTTON_REPEAT, BUTTON_NONE }, | 205 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
206 | { ACTION_USB_HID_MUTE, BUTTON_SELECT, BUTTON_NONE }, | 206 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
207 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 207 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT }, |
208 | { ACTION_USB_HID_SELECT, BUTTON_SELECT|BUTTON_REL, BUTTON_SELECT }, | ||
209 | { ACTION_USB_HID_SELECT_LONG, BUTTON_SELECT|BUTTON_REPEAT, BUTTON_SELECT }, | ||
210 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
211 | { ACTION_USB_HID_MODE, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
208 | 212 | ||
209 | LAST_ITEM_IN_LIST | 213 | LAST_ITEM_IN_LIST |
210 | }; /* button_context_usb_hid */ | 214 | }; /* button_context_usb_hid */ |
215 | |||
216 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
217 | { ACTION_USB_HID_MOUSE_UP, BUTTON_MENU, BUTTON_NONE }, | ||
218 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
219 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_PLAY, BUTTON_NONE }, | ||
220 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
221 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
222 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
223 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
224 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
225 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_SELECT|BUTTON_MENU, BUTTON_NONE }, | ||
226 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_SELECT|BUTTON_MENU|BUTTON_REPEAT, BUTTON_NONE }, | ||
227 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_SELECT|BUTTON_PLAY, BUTTON_NONE }, | ||
228 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_SELECT|BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | ||
229 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_SELECT|BUTTON_LEFT, BUTTON_NONE }, | ||
230 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_SELECT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
231 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_SELECT|BUTTON_RIGHT, BUTTON_NONE }, | ||
232 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_SELECT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
233 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_SELECT, BUTTON_NONE }, | ||
234 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, | ||
235 | |||
236 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
237 | }; /* button_context_usb_hid_mouse */ | ||
211 | #endif | 238 | #endif |
212 | 239 | ||
213 | #if BUTTON_REMOTE != 0 | 240 | #if BUTTON_REMOTE != 0 |
@@ -242,16 +269,18 @@ static const struct button_mapping remote_button_context_wps[] = { | |||
242 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 269 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
243 | }; | 270 | }; |
244 | 271 | ||
245 | #ifdef HAVE_USBSTACK | 272 | #ifdef USB_ENABLE_HID |
246 | static const struct button_mapping remote_button_context_usb_hid[] = { | 273 | static const struct button_mapping remote_button_context_usb_hid[] = { |
247 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 274 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
248 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 275 | { ACTION_USB_HID_INC, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
249 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_LEFT, BUTTON_NONE }, | 276 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
250 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_RIGHT, BUTTON_NONE }, | 277 | { ACTION_USB_HID_DEC, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
251 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 278 | { ACTION_USB_HID_START, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, |
252 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 279 | { ACTION_USB_HID_QUIT, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_RC_PLAY }, |
253 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 280 | { ACTION_USB_HID_LEFT, BUTTON_RC_LEFT|BUTTON_REL, BUTTON_RC_LEFT }, |
254 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 281 | { ACTION_USB_HID_LEFT_LONG, BUTTON_RC_LEFT|BUTTON_REPEAT, BUTTON_RC_LEFT }, |
282 | { ACTION_USB_HID_RIGHT, BUTTON_RC_RIGHT|BUTTON_REL, BUTTON_RC_RIGHT }, | ||
283 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RC_RIGHT|BUTTON_REPEAT, BUTTON_RC_RIGHT }, | ||
255 | 284 | ||
256 | LAST_ITEM_IN_LIST | 285 | LAST_ITEM_IN_LIST |
257 | }; /* remote_button_context_usb_hid */ | 286 | }; /* remote_button_context_usb_hid */ |
@@ -265,7 +294,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
265 | { | 294 | { |
266 | case CONTEXT_WPS: | 295 | case CONTEXT_WPS: |
267 | return remote_button_context_wps; | 296 | return remote_button_context_wps; |
268 | #ifdef HAVE_USBSTACK | 297 | #ifdef USB_ENABLE_HID |
269 | case CONTEXT_USB_HID: | 298 | case CONTEXT_USB_HID: |
270 | return remote_button_context_usb_hid; | 299 | return remote_button_context_usb_hid; |
271 | #endif | 300 | #endif |
@@ -321,9 +350,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
321 | case CONTEXT_RECSCREEN: | 350 | case CONTEXT_RECSCREEN: |
322 | return button_context_recscreen; | 351 | return button_context_recscreen; |
323 | #endif | 352 | #endif |
324 | #ifdef HAVE_USBSTACK | 353 | #ifdef USB_ENABLE_HID |
325 | case CONTEXT_USB_HID: | 354 | case CONTEXT_USB_HID: |
326 | return button_context_usb_hid; | 355 | return button_context_usb_hid; |
356 | case CONTEXT_USB_HID_MOUSE: | ||
357 | return button_context_usb_hid_mouse; | ||
327 | #endif | 358 | #endif |
328 | default: | 359 | default: |
329 | return button_context_standard; | 360 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-mr100.c b/apps/keymaps/keymap-mr100.c index bf9da0de58..a605131465 100644 --- a/apps/keymaps/keymap-mr100.c +++ b/apps/keymaps/keymap-mr100.c | |||
@@ -315,7 +315,7 @@ static const struct button_mapping remote_button_context_tree[] = { | |||
315 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 315 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
316 | }; | 316 | }; |
317 | 317 | ||
318 | #ifdef HAVE_USBSTACK | 318 | #ifdef USB_ENABLE_HID |
319 | static const struct button_mapping button_context_usb_hid[] = { | 319 | static const struct button_mapping button_context_usb_hid[] = { |
320 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, | 320 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, |
321 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 321 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, |
@@ -357,7 +357,7 @@ static const struct button_mapping* get_context_mapping_remote( int context ) | |||
357 | case CONTEXT_MAINMENU: | 357 | case CONTEXT_MAINMENU: |
358 | case CONTEXT_TREE: | 358 | case CONTEXT_TREE: |
359 | return remote_button_context_tree; | 359 | return remote_button_context_tree; |
360 | #ifdef HAVE_USBSTACK | 360 | #ifdef USB_ENABLE_HID |
361 | case CONTEXT_USB_HID: | 361 | case CONTEXT_USB_HID: |
362 | return remote_button_context_usb_hid; | 362 | return remote_button_context_usb_hid; |
363 | #endif | 363 | #endif |
@@ -411,7 +411,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
411 | return button_context_pitchscreen; | 411 | return button_context_pitchscreen; |
412 | case CONTEXT_KEYBOARD: | 412 | case CONTEXT_KEYBOARD: |
413 | return button_context_keyboard; | 413 | return button_context_keyboard; |
414 | #ifdef HAVE_USBSTACK | 414 | #ifdef USB_ENABLE_HID |
415 | case CONTEXT_USB_HID: | 415 | case CONTEXT_USB_HID: |
416 | return button_context_usb_hid; | 416 | return button_context_usb_hid; |
417 | #endif | 417 | #endif |
diff --git a/apps/keymaps/keymap-ondavx747.c b/apps/keymaps/keymap-ondavx747.c index 6eb2230d49..ee590599b6 100644 --- a/apps/keymaps/keymap-ondavx747.c +++ b/apps/keymaps/keymap-ondavx747.c | |||
@@ -167,14 +167,16 @@ static const struct button_mapping button_context_keyboard[] = { | |||
167 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 167 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
168 | }; /* button_context_keyboard */ | 168 | }; /* button_context_keyboard */ |
169 | 169 | ||
170 | #ifdef HAVE_USBSTACK | 170 | #ifdef USB_ENABLE_HID |
171 | static const struct button_mapping button_context_usb_hid[] = { | 171 | static const struct button_mapping button_context_usb_hid[] = { |
172 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 172 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
173 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 173 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
174 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 174 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, |
175 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 175 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
176 | { ACTION_USB_HID_MUTE, BUTTON_POWER, BUTTON_NONE }, | 176 | { ACTION_USB_HID_QUIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_SELECT }, |
177 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 177 | { ACTION_USB_HID_SELECT, BUTTON_POWER|BUTTON_REL, BUTTON_SELECT }, |
178 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
179 | { ACTION_USB_HID_MODE, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
178 | 180 | ||
179 | LAST_ITEM_IN_LIST | 181 | LAST_ITEM_IN_LIST |
180 | }; /* button_context_usb_hid */ | 182 | }; /* button_context_usb_hid */ |
diff --git a/apps/keymaps/keymap-ondavx777.c b/apps/keymaps/keymap-ondavx777.c index 99f509b18f..f492a1964f 100644 --- a/apps/keymaps/keymap-ondavx777.c +++ b/apps/keymaps/keymap-ondavx777.c | |||
@@ -110,7 +110,7 @@ static const struct button_mapping button_context_keyboard[] = { | |||
110 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 110 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
111 | }; /* button_context_keyboard */ | 111 | }; /* button_context_keyboard */ |
112 | 112 | ||
113 | #ifdef HAVE_USBSTACK | 113 | #ifdef USB_ENABLE_HID |
114 | static const struct button_mapping button_context_usb_hid[] = { | 114 | static const struct button_mapping button_context_usb_hid[] = { |
115 | LAST_ITEM_IN_LIST | 115 | LAST_ITEM_IN_LIST |
116 | }; /* button_context_usb_hid */ | 116 | }; /* button_context_usb_hid */ |
@@ -162,7 +162,7 @@ const struct button_mapping* target_get_context_mapping(int context) | |||
162 | return button_context_pitchscreen; | 162 | return button_context_pitchscreen; |
163 | case CONTEXT_KEYBOARD: | 163 | case CONTEXT_KEYBOARD: |
164 | return button_context_keyboard; | 164 | return button_context_keyboard; |
165 | #ifdef HAVE_USBSTACK | 165 | #ifdef USB_ENABLE_HID |
166 | case CONTEXT_USB_HID: | 166 | case CONTEXT_USB_HID: |
167 | return button_context_usb_hid; | 167 | return button_context_usb_hid; |
168 | #endif | 168 | #endif |
diff --git a/apps/keymaps/keymap-sa9200.c b/apps/keymaps/keymap-sa9200.c index 3e83932347..cb9c746cf3 100644 --- a/apps/keymaps/keymap-sa9200.c +++ b/apps/keymaps/keymap-sa9200.c | |||
@@ -276,30 +276,66 @@ static const struct button_mapping button_context_keyboard[] = { | |||
276 | LAST_ITEM_IN_LIST | 276 | LAST_ITEM_IN_LIST |
277 | }; /* button_context_keyboard */ | 277 | }; /* button_context_keyboard */ |
278 | 278 | ||
279 | #ifdef HAVE_USBSTACK | 279 | #ifdef USB_ENABLE_HID |
280 | static const struct button_mapping button_context_usb_hid[] = { | 280 | static const struct button_mapping button_context_usb_hid[] = { |
281 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, | 281 | { ACTION_USB_HID_INC, BUTTON_UP, BUTTON_NONE }, |
282 | { ACTION_USB_HID_STOP, BUTTON_PREV, BUTTON_NONE }, | 282 | { ACTION_USB_HID_INC, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, |
283 | { ACTION_USB_HID_STOP, BUTTON_POWER, BUTTON_NONE }, | 283 | { ACTION_USB_HID_INC, BUTTON_VOL_UP, BUTTON_NONE }, |
284 | 284 | { ACTION_USB_HID_INC, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | |
285 | { ACTION_USB_HID_SKIPPREV, BUTTON_LEFT, BUTTON_NONE }, | 285 | { ACTION_USB_HID_DEC, BUTTON_DOWN, BUTTON_NONE }, |
286 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RIGHT, BUTTON_NONE }, | 286 | { ACTION_USB_HID_DEC, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
287 | 287 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN, BUTTON_NONE }, | |
288 | { ACTION_USB_HID_VOLUP, BUTTON_UP, BUTTON_NONE }, | 288 | { ACTION_USB_HID_DEC, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
289 | { ACTION_USB_HID_VOLUP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | 289 | { ACTION_USB_HID_START, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
290 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 290 | { ACTION_USB_HID_START_LONG, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
291 | { ACTION_USB_HID_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 291 | { ACTION_USB_HID_QUIT, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, |
292 | 292 | { ACTION_USB_HID_QUIT_LONG, BUTTON_PREV|BUTTON_REPEAT, BUTTON_PREV }, | |
293 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN, BUTTON_NONE }, | 293 | { ACTION_USB_HID_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_LEFT }, |
294 | { ACTION_USB_HID_VOLDOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 294 | { ACTION_USB_HID_LEFT_LONG, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_LEFT }, |
295 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 295 | { ACTION_USB_HID_RIGHT, BUTTON_RIGHT|BUTTON_REL, BUTTON_RIGHT }, |
296 | { ACTION_USB_HID_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 296 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_RIGHT|BUTTON_REPEAT BUTTON_RIGHT }, |
297 | 297 | { ACTION_USB_HID_SELECT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | |
298 | { ACTION_USB_HID_MUTE, BUTTON_NEXT, BUTTON_NONE }, | 298 | { ACTION_USB_HID_SELECT_LONG, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NEXT }, |
299 | { ACTION_USB_HID_MENU, BUTTON_MENU, BUTTON_NONE }, | 299 | { ACTION_USB_HID_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
300 | { ACTION_USB_HID_MENU_LONG, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
301 | { ACTION_USB_HID_MODE, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | ||
302 | { ACTION_USB_HID_MODE_LONG, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
300 | 303 | ||
301 | LAST_ITEM_IN_LIST | 304 | LAST_ITEM_IN_LIST |
302 | }; /* button_context_usb_hid */ | 305 | }; /* button_context_usb_hid */ |
306 | |||
307 | static const struct button_mapping button_context_usb_hid_mouse[] = { | ||
308 | { ACTION_USB_HID_MOUSE_UP, BUTTON_UP, BUTTON_NONE }, | ||
309 | { ACTION_USB_HID_MOUSE_UP_REP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
310 | { ACTION_USB_HID_MOUSE_DOWN, BUTTON_DOWN, BUTTON_NONE }, | ||
311 | { ACTION_USB_HID_MOUSE_DOWN_REP, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
312 | { ACTION_USB_HID_MOUSE_LEFT, BUTTON_LEFT, BUTTON_NONE }, | ||
313 | { ACTION_USB_HID_MOUSE_LEFT_REP, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
314 | { ACTION_USB_HID_MOUSE_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, | ||
315 | { ACTION_USB_HID_MOUSE_RIGHT_REP, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
316 | { ACTION_USB_HID_MOUSE_LDRAG_UP, BUTTON_PREV|BUTTON_UP, BUTTON_NONE }, | ||
317 | { ACTION_USB_HID_MOUSE_LDRAG_UP_REP, BUTTON_PREV|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
318 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN, BUTTON_PREV|BUTTON_DOWN, BUTTON_NONE }, | ||
319 | { ACTION_USB_HID_MOUSE_LDRAG_DOWN_REP, BUTTON_PREV|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
320 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT, BUTTON_PREV|BUTTON_LEFT, BUTTON_NONE }, | ||
321 | { ACTION_USB_HID_MOUSE_LDRAG_LEFT_REP, BUTTON_PREV|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
322 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT, BUTTON_PREV|BUTTON_RIGHT, BUTTON_NONE }, | ||
323 | { ACTION_USB_HID_MOUSE_LDRAG_RIGHT_REP, BUTTON_PREV|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
324 | { ACTION_USB_HID_MOUSE_RDRAG_UP, BUTTON_NEXT|BUTTON_UP, BUTTON_NONE }, | ||
325 | { ACTION_USB_HID_MOUSE_RDRAG_UP_REP, BUTTON_NEXT|BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
326 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN, BUTTON_NEXT|BUTTON_DOWN, BUTTON_NONE }, | ||
327 | { ACTION_USB_HID_MOUSE_RDRAG_DOWN_REP, BUTTON_NEXT|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
328 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT, BUTTON_NEXT|BUTTON_LEFT, BUTTON_NONE }, | ||
329 | { ACTION_USB_HID_MOUSE_RDRAG_LEFT_REP, BUTTON_NEXT|BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | ||
330 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT, BUTTON_NEXT|BUTTON_RIGHT, BUTTON_NONE }, | ||
331 | { ACTION_USB_HID_MOUSE_RDRAG_RIGHT_REP, BUTTON_NEXT|BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, | ||
332 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT, BUTTON_PREV, BUTTON_NONE }, | ||
333 | { ACTION_USB_HID_MOUSE_BUTTON_LEFT_REL, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, | ||
334 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | ||
335 | { ACTION_USB_HID_MOUSE_BUTTON_RIGHT_REL, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, | ||
336 | |||
337 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID) | ||
338 | }; /* button_context_usb_hid_mouse */ | ||
303 | #endif | 339 | #endif |
304 | 340 | ||
305 | const struct button_mapping* get_context_mapping(int context) | 341 | const struct button_mapping* get_context_mapping(int context) |
@@ -349,9 +385,11 @@ const struct button_mapping* get_context_mapping(int context) | |||
349 | case CONTEXT_KEYBOARD: | 385 | case CONTEXT_KEYBOARD: |
350 | return button_context_keyboard; | 386 | return button_context_keyboard; |
351 | 387 | ||
352 | #ifdef HAVE_USBSTACK | 388 | #ifdef USB_ENABLE_HID |
353 | case CONTEXT_USB_HID: | 389 | case CONTEXT_USB_HID: |
354 | return button_context_usb_hid; | 390 | return button_context_usb_hid; |
391 | case CONTEXT_USB_HID_MOUSE: | ||
392 | return button_context_usb_hid_mouse; | ||
355 | #endif | 393 | #endif |
356 | } | 394 | } |
357 | return button_context_standard; | 395 | return button_context_standard; |
diff --git a/apps/keymaps/keymap-touchscreen.c b/apps/keymaps/keymap-touchscreen.c index 4b86efa29e..499eb2b562 100644 --- a/apps/keymaps/keymap-touchscreen.c +++ b/apps/keymaps/keymap-touchscreen.c | |||
@@ -251,13 +251,26 @@ static const struct button_mapping button_context_radio[] = { | |||
251 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_FM) | 251 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_FM) |
252 | }; /* button_context_radio */ | 252 | }; /* button_context_radio */ |
253 | 253 | ||
254 | #ifdef HAVE_USBSTACK | 254 | #ifdef USB_ENABLE_HID |
255 | static const struct button_mapping button_context_usb_hid[] = { | 255 | static const struct button_mapping button_context_usb_hid[] = { |
256 | { ACTION_USB_HID_PLAY, BUTTON_TOPRIGHT, BUTTON_NONE }, | 256 | { ACTION_USB_HID_INC, BUTTON_BOTTOMRIGHT|BUTTON_REL, BUTTON_BOTTOMRIGHT }, |
257 | { ACTION_USB_HID_SKIPPREV, BUTTON_MIDLEFT, BUTTON_NONE }, | 257 | { ACTION_USB_HID_INC, BUTTON_BOTTOMRIGHT|BUTTON_REPEAT, BUTTON_BOTTOMRIGHT }, |
258 | { ACTION_USB_HID_SKIPNEXT, BUTTON_MIDRIGHT, BUTTON_NONE }, | 258 | { ACTION_USB_HID_DEC, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_BOTTOMMIDDLE }, |
259 | { ACTION_USB_HID_MUTE, BUTTON_CENTER, BUTTON_NONE }, | 259 | { ACTION_USB_HID_DEC, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_BOTTOMMIDDLE }, |
260 | { ACTION_USB_HID_MENU, BUTTON_TOPLEFT, BUTTON_NONE }, | 260 | { ACTION_USB_HID_START, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_TOPMIDDLE }, |
261 | { ACTION_USB_HID_START_LONG, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_TOPMIDDLE }, | ||
262 | { ACTION_USB_HID_QUIT, BUTTON_BOTTOMLEFT|BUTTON_REL, BUTTON_BOTTOMLEFT }, | ||
263 | { ACTION_USB_HID_QUIT_LONG, BUTTON_BOTTOMLEFT|BUTTON_REPEAT, BUTTON_BOTTOMLEFT }, | ||
264 | { ACTION_USB_HID_LEFT, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_MIDLEFT }, | ||
265 | { ACTION_USB_HID_LEFT_LONG, BUTTON_MIDLEFT|BUTTON_REPEAT, BUTTON_MIDLEFT }, | ||
266 | { ACTION_USB_HID_RIGHT, BUTTON_MIDRIGHT|BUTTON_REL, BUTTON_MIDRIGHT }, | ||
267 | { ACTION_USB_HID_RIGHT_LONG, BUTTON_MIDRIGHT|BUTTON_REPEAT, BUTTON_MIDRIGHT }, | ||
268 | { ACTION_USB_HID_SELECT, BUTTON_CENTER|BUTTON_REL, BUTTON_CENTER }, | ||
269 | { ACTION_USB_HID_SELECT_LONG, BUTTON_CENTER|BUTTON_REPEAT, BUTTON_CENTER }, | ||
270 | { ACTION_USB_HID_MENU, BUTTON_TOPRIGHT|BUTTON_REL, BUTTON_TOPRIGHT }, | ||
271 | { ACTION_USB_HID_MENU_LONG, BUTTON_TOPRIGHT|BUTTON_REPEAT, BUTTON_TOPRIGHT }, | ||
272 | { ACTION_USB_HID_MODE, BUTTON_TOPLEFT|BUTTON_REL, BUTTON_TOPLEFT }, | ||
273 | { ACTION_USB_HID_MODE_LONG, BUTTON_TOPLEFT|BUTTON_REPEAT, BUTTON_TOPLEFT }, | ||
261 | 274 | ||
262 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_USB_HID) | 275 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM2|CONTEXT_USB_HID) |
263 | }; /* button_context_usb_hid */ | 276 | }; /* button_context_usb_hid */ |
@@ -315,7 +328,7 @@ const struct button_mapping* get_context_mapping(int context) | |||
315 | return button_context_pitchscreen; | 328 | return button_context_pitchscreen; |
316 | case CONTEXT_KEYBOARD: | 329 | case CONTEXT_KEYBOARD: |
317 | return button_context_keyboard; | 330 | return button_context_keyboard; |
318 | #ifdef HAVE_USBSTACK | 331 | #ifdef USB_ENABLE_HID |
319 | case CONTEXT_USB_HID: | 332 | case CONTEXT_USB_HID: |
320 | return button_context_usb_hid; | 333 | return button_context_usb_hid; |
321 | #endif | 334 | #endif |