diff options
Diffstat (limited to 'apps/keymaps/keymap-h1x0_h3x0.c')
-rw-r--r-- | apps/keymaps/keymap-h1x0_h3x0.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index b379081efe..7997270a3b 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c | |||
@@ -65,6 +65,12 @@ static const struct button_mapping button_context_standard[] = { | |||
65 | LAST_ITEM_IN_LIST | 65 | LAST_ITEM_IN_LIST |
66 | }; /* button_context_standard */ | 66 | }; /* button_context_standard */ |
67 | 67 | ||
68 | static const struct button_mapping button_context_menu[] = { | ||
69 | { ACTION_MENU_WPS, BUTTON_ON, BUTTON_NONE }, | ||
70 | { ACTION_MENU_STOP, BUTTON_OFF, BUTTON_NONE }, | ||
71 | |||
72 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
73 | }; /* button_context_menu */ | ||
68 | 74 | ||
69 | static const struct button_mapping button_context_wps[] = { | 75 | static const struct button_mapping button_context_wps[] = { |
70 | { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, | 76 | { ACTION_WPS_PLAY, BUTTON_ON|BUTTON_REL, BUTTON_ON }, |
@@ -715,10 +721,18 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = { | |||
715 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | 721 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) |
716 | }; | 722 | }; |
717 | 723 | ||
724 | static const struct button_mapping button_context_menu_remote[] = { | ||
725 | { ACTION_MENU_STOP, BUTTON_RC_STOP, BUTTON_NONE }, | ||
726 | { ACTION_MENU_WPS, BUTTON_RC_ON, BUTTON_NONE }, | ||
727 | |||
728 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | ||
729 | }; | ||
730 | |||
718 | /* the actual used tables */ | 731 | /* the actual used tables */ |
719 | static const struct button_mapping | 732 | static const struct button_mapping |
720 | *remote_btn_ctxt_std = 0, | 733 | *remote_btn_ctxt_std = 0, |
721 | *remote_btn_ctxt_wps = 0, | 734 | *remote_btn_ctxt_wps = 0, |
735 | *remote_btn_ctxt_menu = button_context_menu_remote, | ||
722 | *remote_btn_ctxt_list = 0, | 736 | *remote_btn_ctxt_list = 0, |
723 | *remote_btn_ctxt_tree = 0, | 737 | *remote_btn_ctxt_tree = 0, |
724 | *remote_btn_ctxt_listtree_scroll_w_cmb = 0, | 738 | *remote_btn_ctxt_listtree_scroll_w_cmb = 0, |
@@ -866,8 +880,9 @@ static const struct button_mapping* get_context_mapping_remote(int context) | |||
866 | switch (context) | 880 | switch (context) |
867 | { | 881 | { |
868 | case CONTEXT_STD: | 882 | case CONTEXT_STD: |
869 | case CONTEXT_MAINMENU: | ||
870 | return remote_btn_ctxt_std; | 883 | return remote_btn_ctxt_std; |
884 | case CONTEXT_MAINMENU: | ||
885 | return remote_btn_ctxt_menu; | ||
871 | case CONTEXT_WPS: /* common for all remotes */ | 886 | case CONTEXT_WPS: /* common for all remotes */ |
872 | return button_context_wps_remotescommon; | 887 | return button_context_wps_remotescommon; |
873 | 888 | ||
@@ -914,8 +929,9 @@ const struct button_mapping* get_context_mapping(int context) | |||
914 | switch (context) | 929 | switch (context) |
915 | { | 930 | { |
916 | case CONTEXT_STD: | 931 | case CONTEXT_STD: |
917 | case CONTEXT_MAINMENU: | ||
918 | return button_context_standard; | 932 | return button_context_standard; |
933 | case CONTEXT_MAINMENU: | ||
934 | return button_context_menu; | ||
919 | case CONTEXT_WPS: | 935 | case CONTEXT_WPS: |
920 | return button_context_wps; | 936 | return button_context_wps; |
921 | 937 | ||