diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2016-05-30 16:51:40 +0100 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2016-05-30 16:52:41 +0100 |
commit | 86df983eee86eafe9325fc28a0ebe9d1c42c77cd (patch) | |
tree | a6cff76d55fd499ea7645d633f50033605c1b4f5 | |
parent | 6d124c738b15492ab77b9f1eca6b0b8d6a9b6d5a (diff) | |
download | rockbox-86df983eee86eafe9325fc28a0ebe9d1c42c77cd.tar.gz rockbox-86df983eee86eafe9325fc28a0ebe9d1c42c77cd.zip |
zenxfi3: update keymap
Map short menu press to context menu/quickscreen.
Map long menu press to return to main menu.
Also remove some stupid keylock mapping, that doesn't make sense.
Change-Id: I5f9b05af261bcbd2f0cf116f99570c4d853e0394
-rw-r--r-- | apps/keymaps/keymap-zenxfi3.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/keymaps/keymap-zenxfi3.c b/apps/keymaps/keymap-zenxfi3.c index aa68a34f43..bdd8b2dae4 100644 --- a/apps/keymaps/keymap-zenxfi3.c +++ b/apps/keymaps/keymap-zenxfi3.c | |||
@@ -43,13 +43,12 @@ static const struct button_mapping button_context_standard[] = { | |||
43 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, | 43 | { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, |
44 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 44 | { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
45 | 45 | ||
46 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 46 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
47 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | ||
47 | 48 | ||
48 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, | 49 | { ACTION_STD_CANCEL, BUTTON_LEFT, BUTTON_NONE }, |
49 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, | 50 | { ACTION_STD_CANCEL, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, |
50 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 51 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
51 | |||
52 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | ||
53 | 52 | ||
54 | LAST_ITEM_IN_LIST | 53 | LAST_ITEM_IN_LIST |
55 | }; /* button_context_standard */ | 54 | }; /* button_context_standard */ |
@@ -73,6 +72,8 @@ static const struct button_mapping button_context_wps[] = { | |||
73 | 72 | ||
74 | { ACTION_WPS_MENU, BUTTON_BACK, BUTTON_NONE }, | 73 | { ACTION_WPS_MENU, BUTTON_BACK, BUTTON_NONE }, |
75 | 74 | ||
75 | { ACTION_WPS_QUICKSCREEN, BUTTON_MENU, BUTTON_NONE }, | ||
76 | |||
76 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 77 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
77 | }; /* button_context_wps */ | 78 | }; /* button_context_wps */ |
78 | 79 | ||
@@ -97,12 +98,11 @@ static const struct button_mapping button_context_keyboard[] = { | |||
97 | }; /* button_context_keyboard */ | 98 | }; /* button_context_keyboard */ |
98 | 99 | ||
99 | static const struct button_mapping button_context_quickscreen[] = { | 100 | static const struct button_mapping button_context_quickscreen[] = { |
100 | { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, | ||
101 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, | 101 | { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, |
102 | { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, | 102 | { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE }, |
103 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, | 103 | { ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE }, |
104 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, | 104 | { ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE }, |
105 | { ACTION_QS_RIGHT, BUTTON_PLAY, BUTTON_NONE }, | 105 | { ACTION_QS_RIGHT, BUTTON_PLAY, BUTTON_NONE }, |
106 | 106 | ||
107 | LAST_ITEM_IN_LIST | 107 | LAST_ITEM_IN_LIST |
108 | }; /* button_context_quickscreen */ | 108 | }; /* button_context_quickscreen */ |