diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index 93477de903..0c0b61d201 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -482,12 +482,8 @@ const struct button_mapping button_context_bmark_h300lcdremote[] = { | |||
482 | }; | 482 | }; |
483 | 483 | ||
484 | const struct button_mapping button_context_quickscreen_nonlcdremote[] = { | 484 | const struct button_mapping button_context_quickscreen_nonlcdremote[] = { |
485 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE, BUTTON_NONE }, | ||
486 | { ACTION_QS_DOWNINV, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, | ||
487 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, | 485 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP, BUTTON_NONE }, |
488 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 486 | { ACTION_QS_DOWNINV, BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
489 | { ACTION_QS_DOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, | ||
490 | { ACTION_QS_DOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, | ||
491 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, | 487 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, |
492 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 488 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
493 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | 489 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, |
@@ -506,9 +502,13 @@ const struct button_mapping button_context_quickscreen_h100lcdremote[] = { | |||
506 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 502 | { ACTION_QS_DOWN, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
507 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, | 503 | { ACTION_QS_LEFT, BUTTON_RC_REW, BUTTON_NONE }, |
508 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, | 504 | { ACTION_QS_LEFT, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, |
505 | { ACTION_QS_LEFT, BUTTON_RC_FF, BUTTON_NONE }, | ||
506 | { ACTION_QS_LEFT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, | ||
507 | { ACTION_QS_RIGHT, BUTTON_RC_SOURCE, BUTTON_NONE }, | ||
508 | { ACTION_QS_RIGHT, BUTTON_RC_SOURCE|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_ON, BUTTON_NONE }, | 511 | { ACTION_STD_CANCEL, BUTTON_RC_MODE, 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 */ |
@@ -653,29 +653,22 @@ const struct button_mapping button_context_keyboard_h300lcdremote[] = { | |||
653 | 653 | ||
654 | /* the actual used tables */ | 654 | /* the actual used tables */ |
655 | static const struct button_mapping | 655 | static const struct button_mapping |
656 | *remote_btn_ctxt_std = button_context_standard_h100remote, | 656 | *remote_btn_ctxt_std = 0, |
657 | *remote_btn_ctxt_wps = button_context_wps_h100remote, | 657 | *remote_btn_ctxt_wps = 0, |
658 | *remote_btn_ctxt_list = button_context_list_h100remote, | 658 | *remote_btn_ctxt_list = 0, |
659 | *remote_btn_ctxt_tree = button_context_tree_h100remote, | 659 | *remote_btn_ctxt_tree = 0, |
660 | *remote_btn_ctxt_listtree_scroll_w_cmb | 660 | *remote_btn_ctxt_listtree_scroll_w_cmb = 0, |
661 | = button_context_listtree_scroll_w_cmb_h100remote, | 661 | *remote_btn_ctxt_listtree_scroll_wo_cmb = 0, |
662 | *remote_btn_ctxt_listtree_scroll_wo_cmb | 662 | *remote_btn_ctxt_settings = 0, |
663 | = button_context_listtree_scroll_wo_cmb_h100remote, | 663 | *remote_btn_ctxt_settingsgrph = 0, |
664 | *remote_btn_ctxt_settings = button_context_settings_h100remote, | 664 | *remote_btn_ctxt_yesno = 0, |
665 | *remote_btn_ctxt_settingsgrph | 665 | *remote_btn_ctxt_bmark = 0, |
666 | = button_context_settingsgraphical_h100remote, | 666 | *remote_btn_ctxt_quickscreen = 0, |
667 | *remote_btn_ctxt_yesno = button_context_yesno_h100remote, | 667 | *remote_btn_ctxt_pitchscreen = 0, |
668 | *remote_btn_ctxt_bmark = button_context_bmark_h100remote, | 668 | *remote_btn_ctxt_recscreen = 0, |
669 | *remote_btn_ctxt_quickscreen | 669 | *remote_btn_ctxt_keyboard = 0; |
670 | = button_context_quickscreen_nonlcdremote, | 670 | |
671 | *remote_btn_ctxt_pitchscreen | 671 | static int _remote_type = -1; /*safe value, forces the first press to init the mappings */ |
672 | = button_context_pitchscreen_nonlcdremote, | ||
673 | *remote_btn_ctxt_recscreen | ||
674 | = button_context_recscreen_h100remote, | ||
675 | *remote_btn_ctxt_keyboard | ||
676 | = button_context_keyboard_h100remote; | ||
677 | |||
678 | static int _remote_type = 0; | ||
679 | 672 | ||
680 | static void remap_remote(void) | 673 | static void remap_remote(void) |
681 | { | 674 | { |