diff options
Diffstat (limited to 'apps/keymaps')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 1bacbf4bca..93477de903 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -481,7 +481,7 @@ const struct button_mapping button_context_bmark_h300lcdremote[] = { | |||
481 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE), | 481 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS|CONTEXT_REMOTE), |
482 | }; | 482 | }; |
483 | 483 | ||
484 | const struct button_mapping button_context_quickscreen_h100remote[] = { | 484 | const struct button_mapping button_context_quickscreen_nonlcdremote[] = { |
485 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE, BUTTON_NONE }, | 485 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE, BUTTON_NONE }, |
486 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, | 486 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, |
487 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 487 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
@@ -494,7 +494,7 @@ const struct button_mapping button_context_quickscreen_h100remote[] = { | |||
494 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 494 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
495 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, | 495 | { ACTION_QS_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, |
496 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 496 | { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, |
497 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, | 497 | { ACTION_STD_CANCEL, BUTTON_RC_ON, BUTTON_NONE }, |
498 | 498 | ||
499 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 499 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
500 | }; /* button_context_quickscreen */ | 500 | }; /* button_context_quickscreen */ |
@@ -508,7 +508,7 @@ const struct button_mapping button_context_quickscreen_h100lcdremote[] = { | |||
508 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 508 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
509 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE, BUTTON_NONE }, | 509 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE, BUTTON_NONE }, |
510 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | 510 | { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, |
511 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, BUTTON_NONE }, | 511 | { ACTION_STD_CANCEL, BUTTON_RC_ON, BUTTON_NONE }, |
512 | 512 | ||
513 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 513 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
514 | }; /* button_context_quickscreen */ | 514 | }; /* button_context_quickscreen */ |
@@ -527,17 +527,17 @@ const struct button_mapping button_context_quickscreen_h300lcdremote[] = { | |||
527 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 527 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
528 | }; /* button_context_quickscreen */ | 528 | }; /* button_context_quickscreen */ |
529 | 529 | ||
530 | const struct button_mapping button_context_pitchscreen_h100remote[] = { | 530 | const struct button_mapping button_context_pitchscreen_nonlcdremote[] = { |
531 | { ACTION_PS_INC_SMALL, BUTTON_RC_REW, BUTTON_NONE }, | 531 | { ACTION_PS_INC_SMALL, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
532 | { ACTION_PS_INC_BIG, BUTTON_RC_REW|BUTTON_REPEAT,BUTTON_NONE }, | 532 | { ACTION_PS_INC_BIG, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
533 | { ACTION_PS_DEC_SMALL, BUTTON_RC_FF, BUTTON_NONE }, | 533 | { ACTION_PS_DEC_SMALL, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
534 | { ACTION_PS_DEC_BIG, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | 534 | { ACTION_PS_DEC_BIG, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
535 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_SOURCE, BUTTON_NONE }, | 535 | { ACTION_PS_NUDGE_LEFT, BUTTON_RC_REW, BUTTON_NONE }, |
536 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_SOURCE|BUTTON_REL,BUTTON_NONE }, | 536 | { ACTION_PS_NUDGE_LEFTOFF, BUTTON_RC_REW|BUTTON_REL, BUTTON_NONE }, |
537 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_BITRATE, BUTTON_NONE }, | 537 | { ACTION_PS_NUDGE_RIGHT, BUTTON_RC_FF, BUTTON_NONE }, |
538 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_BITRATE|BUTTON_REL, BUTTON_NONE }, | 538 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RC_FF|BUTTON_REL, BUTTON_NONE }, |
539 | { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, | 539 | { ACTION_PS_RESET, BUTTON_RC_ON|BUTTON_REL, BUTTON_RC_ON }, |
540 | { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, | 540 | { ACTION_PS_EXIT, BUTTON_RC_ON|BUTTON_REPEAT, BUTTON_NONE }, |
541 | 541 | ||
542 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 542 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
543 | }; /* button_context_pitchcreen */ | 543 | }; /* button_context_pitchcreen */ |
@@ -667,9 +667,9 @@ static const struct button_mapping | |||
667 | *remote_btn_ctxt_yesno = button_context_yesno_h100remote, | 667 | *remote_btn_ctxt_yesno = button_context_yesno_h100remote, |
668 | *remote_btn_ctxt_bmark = button_context_bmark_h100remote, | 668 | *remote_btn_ctxt_bmark = button_context_bmark_h100remote, |
669 | *remote_btn_ctxt_quickscreen | 669 | *remote_btn_ctxt_quickscreen |
670 | = button_context_quickscreen_h100remote, | 670 | = button_context_quickscreen_nonlcdremote, |
671 | *remote_btn_ctxt_pitchscreen | 671 | *remote_btn_ctxt_pitchscreen |
672 | = button_context_pitchscreen_h100remote, | 672 | = button_context_pitchscreen_nonlcdremote, |
673 | *remote_btn_ctxt_recscreen | 673 | *remote_btn_ctxt_recscreen |
674 | = button_context_recscreen_h100remote, | 674 | = button_context_recscreen_h100remote, |
675 | *remote_btn_ctxt_keyboard | 675 | *remote_btn_ctxt_keyboard |
@@ -762,9 +762,9 @@ static void remap_remote(void) | |||
762 | remote_btn_ctxt_yesno = button_context_yesno_h300lcdremote, | 762 | remote_btn_ctxt_yesno = button_context_yesno_h300lcdremote, |
763 | remote_btn_ctxt_bmark = button_context_bmark_h300lcdremote, | 763 | remote_btn_ctxt_bmark = button_context_bmark_h300lcdremote, |
764 | remote_btn_ctxt_quickscreen | 764 | remote_btn_ctxt_quickscreen |
765 | = button_context_quickscreen_h300lcdremote, | 765 | = button_context_quickscreen_nonlcdremote, |
766 | remote_btn_ctxt_pitchscreen | 766 | remote_btn_ctxt_pitchscreen |
767 | = button_context_pitchscreen_h300lcdremote, | 767 | = button_context_pitchscreen_nonlcdremote, |
768 | remote_btn_ctxt_recscreen | 768 | remote_btn_ctxt_recscreen |
769 | = button_context_recscreen_h300lcdremote, | 769 | = button_context_recscreen_h300lcdremote, |
770 | remote_btn_ctxt_keyboard | 770 | remote_btn_ctxt_keyboard |