diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-gigabeat-s.c | 2 | ||||
-rw-r--r-- | apps/keymaps/keymap-h10.c | 34 |
2 files changed, 5 insertions, 31 deletions
diff --git a/apps/keymaps/keymap-gigabeat-s.c b/apps/keymaps/keymap-gigabeat-s.c index 4fc7e8d469..66b58615c5 100644 --- a/apps/keymaps/keymap-gigabeat-s.c +++ b/apps/keymaps/keymap-gigabeat-s.c | |||
@@ -486,7 +486,7 @@ static const struct button_mapping button_context_usb_hid[] = { | |||
486 | 486 | ||
487 | static const struct button_mapping remote_button_context_usb_hid[] = { | 487 | static const struct button_mapping remote_button_context_usb_hid[] = { |
488 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, | 488 | { ACTION_USB_HID_PLAY, BUTTON_RC_PLAY, BUTTON_NONE }, |
489 | { ACTION_USB_HID_STOP, BUTTON_RC_POWER, BUTTON_NONE }, | 489 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
490 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, | 490 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, |
491 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, | 491 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, |
492 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 492 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index 77247d35d8..aed55dbfa2 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c | |||
@@ -332,32 +332,6 @@ static const struct button_mapping button_context_radio[] = { | |||
332 | 332 | ||
333 | }; | 333 | }; |
334 | 334 | ||
335 | |||
336 | |||
337 | |||
338 | |||
339 | |||
340 | static const struct button_mapping remote_button_context_wps[] = { | ||
341 | { ACTION_WPS_PLAY, BUTTON_RC_PLAY|BUTTON_REL, BUTTON_RC_PLAY }, | ||
342 | { ACTION_WPS_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT,BUTTON_RC_PLAY }, | ||
343 | { ACTION_WPS_SKIPPREV, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW}, | ||
344 | { ACTION_WPS_SEEKBACK, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | ||
345 | { ACTION_WPS_STOPSEEK, BUTTON_RC_REW|BUTTON_REL, BUTTON_RC_REW|BUTTON_REPEAT }, | ||
346 | { ACTION_WPS_SKIPNEXT, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF }, | ||
347 | { ACTION_WPS_SEEKFWD, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
348 | { ACTION_WPS_STOPSEEK, BUTTON_RC_FF|BUTTON_REL, BUTTON_RC_FF|BUTTON_REPEAT }, | ||
349 | |||
350 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | ||
351 | { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
352 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, | ||
353 | { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | ||
354 | |||
355 | { ACTION_WPS_PITCHSCREEN, BUTTON_RC_PLAY|BUTTON_LEFT, BUTTON_RC_PLAY }, | ||
356 | { ACTION_WPS_ID3SCREEN, BUTTON_RC_PLAY|BUTTON_RIGHT, BUTTON_RC_PLAY }, | ||
357 | |||
358 | LAST_ITEM_IN_LIST | ||
359 | }; /* remote_button_context_wps */ | ||
360 | |||
361 | #ifdef HAVE_USBSTACK | 335 | #ifdef HAVE_USBSTACK |
362 | static const struct button_mapping button_context_usb_hid[] = { | 336 | static const struct button_mapping button_context_usb_hid[] = { |
363 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, | 337 | { ACTION_USB_HID_PLAY, BUTTON_PLAY, BUTTON_NONE }, |
@@ -378,10 +352,10 @@ static const struct button_mapping remote_button_context_usb_hid[] = { | |||
378 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, | 352 | { ACTION_USB_HID_STOP, BUTTON_RC_PLAY|BUTTON_REPEAT, BUTTON_NONE }, |
379 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, | 353 | { ACTION_USB_HID_SKIPPREV, BUTTON_RC_REW, BUTTON_NONE }, |
380 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, | 354 | { ACTION_USB_HID_SKIPNEXT, BUTTON_RC_FF, BUTTON_NONE }, |
381 | { ACTION_USB_HID_VOLUP, BUTTON_RC_SCROLL_UP, BUTTON_NONE }, | 355 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
382 | { ACTION_USB_HID_VOLUP, BUTTON_RC_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 356 | { ACTION_USB_HID_VOLUP, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
383 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_SCROLL_DOWN, BUTTON_NONE }, | 357 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
384 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 358 | { ACTION_USB_HID_VOLDOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
385 | 359 | ||
386 | LAST_ITEM_IN_LIST | 360 | LAST_ITEM_IN_LIST |
387 | }; /* remote_button_context_usb_hid */ | 361 | }; /* remote_button_context_usb_hid */ |