diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-03-10 19:03:00 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-03-10 21:35:44 -0500 |
commit | 87e37a4d48ada935808aa85a86526b24ea482bb6 (patch) | |
tree | 3510f9dc2177d0993480e28cceabee1e2f35861c /apps/keymaps/keymap-xduoox3ii.c | |
parent | a87abdb28f929623354270f257cc63bf73b3e74c (diff) | |
download | rockbox-87e37a4d48ada935808aa85a86526b24ea482bb6.tar.gz rockbox-87e37a4d48ada935808aa85a86526b24ea482bb6.zip |
xduoo_x3ii: Improvements in the meymappings!
* PREV/NEXT now swapped so they do what is expected in most contexts
* List and setting context retains prior behavior
* Enable the ADC that reads the headset remote and map the keys.
* As ADC-based remote "events" arrive as press/release pairs,
delay the button release.
Change-Id: I22d4eac3bfe1573b50eca795cf377bdafdeb5336
Diffstat (limited to 'apps/keymaps/keymap-xduoox3ii.c')
-rw-r--r-- | apps/keymaps/keymap-xduoox3ii.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c index a8cf349e0d..d33b9d1f20 100644 --- a/apps/keymaps/keymap-xduoox3ii.c +++ b/apps/keymaps/keymap-xduoox3ii.c | |||
@@ -35,10 +35,10 @@ | |||
35 | * Insert LAST_ITEM_IN_LIST at the end of each mapping | 35 | * Insert LAST_ITEM_IN_LIST at the end of each mapping |
36 | */ | 36 | */ |
37 | static const struct button_mapping button_context_standard[] = { | 37 | static const struct button_mapping button_context_standard[] = { |
38 | { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, | 38 | { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE }, |
39 | { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 39 | { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
40 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE }, |
41 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 41 | { ACTION_STD_NEXTREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, /* Backwards! */ |
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_HOME|BUTTON_REL, BUTTON_HOME }, | 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 }, |
@@ -145,10 +145,10 @@ static const struct button_mapping button_context_quickscreen[] = { | |||
145 | /** Settings - General Mappings **/ | 145 | /** Settings - General Mappings **/ |
146 | static const struct button_mapping button_context_settings[] = { | 146 | static const struct button_mapping button_context_settings[] = { |
147 | { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 147 | { ACTION_SETTINGS_RESET, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
148 | { ACTION_STD_PREV, BUTTON_PREV, BUTTON_NONE }, | 148 | { ACTION_STD_PREV, BUTTON_NEXT, BUTTON_NONE }, |
149 | { ACTION_STD_PREVREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 149 | { ACTION_STD_PREVREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
150 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 150 | { ACTION_STD_NEXT, BUTTON_PREV, BUTTON_NONE }, |
151 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 151 | { ACTION_STD_NEXTREPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, /* Backwards! */ |
152 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 152 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
153 | { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, | 153 | { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, |
154 | 154 | ||