diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2019-01-01 19:45:48 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2019-01-02 04:57:32 +0100 |
commit | 35930ddb8d0c704abeb7619d9b6fc59b9dd6b909 (patch) | |
tree | 7a734fd10be3bb608169797bfae28baacf7ed4f1 | |
parent | 2c6094843c72b2b7a81522c04dc36b03cd9c2929 (diff) | |
download | rockbox-35930ddb8d0c704abeb7619d9b6fc59b9dd6b909.tar.gz rockbox-35930ddb8d0c704abeb7619d9b6fc59b9dd6b909.zip |
Keymap improvements for the xDuoo X3
- Synchronized with actual state of Vortex version in general.
- Playback resume has been moved to the Power button.
- Option button acts identically in most contexts: main menu on short
press and quickscreen on long press.
- Defined A-B repeat mode control buttons.
- Level change action in chessbox has been moved to the volume down button.
(Patch by Igor Poretsky)
Change-Id: I48046ff123d2bccdc0d0c4ed8b088e2053aefa5e
-rw-r--r-- | apps/keymaps/keymap-xduoox3.c | 29 | ||||
-rw-r--r-- | apps/plugins/chessbox/chessbox_pgn.h | 2 |
2 files changed, 19 insertions, 12 deletions
diff --git a/apps/keymaps/keymap-xduoox3.c b/apps/keymaps/keymap-xduoox3.c index abe8507cd8..c09090021c 100644 --- a/apps/keymaps/keymap-xduoox3.c +++ b/apps/keymaps/keymap-xduoox3.c | |||
@@ -40,9 +40,10 @@ static const struct button_mapping button_context_standard[] = { | |||
40 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
42 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 42 | { ACTION_STD_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
43 | { ACTION_STD_CANCEL, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, | 43 | { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
44 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 44 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
45 | { ACTION_STD_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 45 | { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, |
46 | { ACTION_STD_QUICKSCREEN, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, | ||
46 | 47 | ||
47 | LAST_ITEM_IN_LIST | 48 | LAST_ITEM_IN_LIST |
48 | }; /* button_context_standard */ | 49 | }; /* button_context_standard */ |
@@ -60,11 +61,15 @@ static const struct button_mapping button_context_wps[] = { | |||
60 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 61 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
61 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 62 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
62 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 63 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
63 | { ACTION_WPS_BROWSE, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, | 64 | { ACTION_WPS_BROWSE, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
64 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 65 | { ACTION_WPS_CONTEXT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
65 | { ACTION_WPS_MENU, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 66 | { ACTION_WPS_MENU, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, |
66 | { ACTION_WPS_QUICKSCREEN, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, | 67 | { ACTION_WPS_QUICKSCREEN, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, |
67 | { ACTION_WPS_HOTKEY, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, | 68 | { ACTION_WPS_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
69 | |||
70 | { ACTION_WPS_ABSETB_NEXTDIR, BUTTON_POWER|BUTTON_NEXT, BUTTON_POWER }, | ||
71 | { ACTION_WPS_ABSETA_PREVDIR, BUTTON_POWER|BUTTON_PREV, BUTTON_POWER }, | ||
72 | { ACTION_WPS_ABRESET, BUTTON_POWER|BUTTON_PLAY, BUTTON_POWER }, | ||
68 | 73 | ||
69 | LAST_ITEM_IN_LIST | 74 | LAST_ITEM_IN_LIST |
70 | }; /* button_context_wps */ | 75 | }; /* button_context_wps */ |
@@ -118,7 +123,9 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
118 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, | 123 | { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, |
119 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, | 124 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE }, |
120 | { ACTION_PS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 125 | { ACTION_PS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
121 | { ACTION_PS_EXIT, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, | 126 | { ACTION_PS_EXIT, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
127 | { ACTION_PS_SLOWER, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | ||
128 | { ACTION_PS_FASTER, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | ||
122 | 129 | ||
123 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 130 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
124 | }; /* button_context_pitchscreen */ | 131 | }; /* button_context_pitchscreen */ |
@@ -146,7 +153,7 @@ static const struct button_mapping button_context_settings[] = { | |||
146 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 153 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, |
147 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 154 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
148 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 155 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
149 | { ACTION_STD_CANCEL, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, | 156 | { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
150 | 157 | ||
151 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) | 158 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) |
152 | }; /* button_context_settings */ | 159 | }; /* button_context_settings */ |
@@ -162,9 +169,9 @@ static const struct button_mapping button_context_settings_vol_is_inc[] = { | |||
162 | 169 | ||
163 | /** Tree **/ | 170 | /** Tree **/ |
164 | static const struct button_mapping button_context_tree[] = { | 171 | static const struct button_mapping button_context_tree[] = { |
165 | { ACTION_TREE_WPS, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 172 | { ACTION_TREE_WPS, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
166 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 173 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, |
167 | { ACTION_TREE_HOTKEY, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, | 174 | { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, |
168 | 175 | ||
169 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) | 176 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST) |
170 | }; /* button_context_tree */ | 177 | }; /* button_context_tree */ |
diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h index 1f44d1b712..8f3032fe15 100644 --- a/apps/plugins/chessbox/chessbox_pgn.h +++ b/apps/plugins/chessbox/chessbox_pgn.h | |||
@@ -565,7 +565,7 @@ | |||
565 | #define CB_LEFT BUTTON_PREV | 565 | #define CB_LEFT BUTTON_PREV |
566 | #define CB_RIGHT BUTTON_NEXT | 566 | #define CB_RIGHT BUTTON_NEXT |
567 | #define CB_PLAY BUTTON_VOL_UP | 567 | #define CB_PLAY BUTTON_VOL_UP |
568 | #define CB_LEVEL (BUTTON_PLAY|BUTTON_REPEAT) | 568 | #define CB_LEVEL BUTTON_VOL_DOWN |
569 | #define CB_MENU BUTTON_POWER | 569 | #define CB_MENU BUTTON_POWER |
570 | #define CB_SCROLL_UP (BUTTON_HOME|BUTTON_REPEAT) | 570 | #define CB_SCROLL_UP (BUTTON_HOME|BUTTON_REPEAT) |
571 | #define CB_SCROLL_DOWN (BUTTON_OPTION|BUTTON_REPEAT) | 571 | #define CB_SCROLL_DOWN (BUTTON_OPTION|BUTTON_REPEAT) |