summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Avtalion <ori@avtalion.name>2020-08-06 21:28:54 +0300
committerSolomon Peachy <pizza@shaftnet.org>2020-08-08 13:01:38 +0000
commitde8f95f95f1420694beef67dd6d53e614726aaee (patch)
tree8d1bbf5b8193f95ed4760a983272ed72a0b9e11b
parent48d2927ecca77ec7f0876960bff624d5d39a4e0f (diff)
downloadrockbox-de8f95f95f1420694beef67dd6d53e614726aaee.tar.gz
rockbox-de8f95f95f1420694beef67dd6d53e614726aaee.zip
xDuoo X3 II, X20: Add power button mapping
These are copied from the e200 mapping, adding the power button to contexts where it's unused. Change-Id: I6c3351e843b422716467b41117cb30e38d1e685f
-rw-r--r--apps/keymaps/keymap-xduoox20.c3
-rw-r--r--apps/keymaps/keymap-xduoox3ii.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/apps/keymaps/keymap-xduoox20.c b/apps/keymaps/keymap-xduoox20.c
index 3b1b01b7fa..a6c5ca4153 100644
--- a/apps/keymaps/keymap-xduoox20.c
+++ b/apps/keymaps/keymap-xduoox20.c
@@ -49,6 +49,7 @@ static const struct button_mapping button_context_standard[] = {
49 49
50static const struct button_mapping button_context_wps[] = { 50static const struct button_mapping button_context_wps[] = {
51 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 51 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
52 { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
52 { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, 53 { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV },
53 { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 54 { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
54 { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, 55 { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT },
@@ -135,6 +136,7 @@ static const struct button_mapping button_context_quickscreen[] = {
135 { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, 136 { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE },
136 { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 137 { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
137 { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 138 { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
139 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
138 140
139 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
140}; /* button_context_quickscreen */ 142}; /* button_context_quickscreen */
@@ -164,6 +166,7 @@ static const struct button_mapping button_context_settings_vol_is_inc[] = {
164/** Tree **/ 166/** Tree **/
165static const struct button_mapping button_context_tree[] = { 167static const struct button_mapping button_context_tree[] = {
166 { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, 168 { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION },
169 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
167 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 170 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
168 { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, 171 { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION },
169 172
diff --git a/apps/keymaps/keymap-xduoox3ii.c b/apps/keymaps/keymap-xduoox3ii.c
index d30efaed2c..e43bd30290 100644
--- a/apps/keymaps/keymap-xduoox3ii.c
+++ b/apps/keymaps/keymap-xduoox3ii.c
@@ -49,6 +49,7 @@ static const struct button_mapping button_context_standard[] = {
49 49
50static const struct button_mapping button_context_wps[] = { 50static const struct button_mapping button_context_wps[] = {
51 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, 51 { ACTION_WPS_PLAY, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY },
52 { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
52 { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, 53 { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV },
53 { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, 54 { ACTION_WPS_SEEKBACK, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE },
54 { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, 55 { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT },
@@ -135,6 +136,7 @@ static const struct button_mapping button_context_quickscreen[] = {
135 { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE }, 136 { ACTION_QS_RIGHT, BUTTON_NEXT, BUTTON_NONE },
136 { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, 137 { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE },
137 { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME }, 138 { ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_HOME },
139 { ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
138 140
139 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) 141 LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
140}; /* button_context_quickscreen */ 142}; /* button_context_quickscreen */
@@ -164,6 +166,7 @@ static const struct button_mapping button_context_settings_vol_is_inc[] = {
164/** Tree **/ 166/** Tree **/
165static const struct button_mapping button_context_tree[] = { 167static const struct button_mapping button_context_tree[] = {
166 { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, 168 { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION },
169 { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER },
167 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, 170 { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME },
168 { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION }, 171 { ACTION_STD_MENU, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_OPTION },
169 172