diff options
author | Dana Conrad <dconrad@fastmail.com> | 2021-05-07 21:08:37 -0500 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-05-12 11:01:27 +0000 |
commit | 84a3cbe24dd4d5362f758aa7f70278f85742c1c2 (patch) | |
tree | 88eab5b765301ce159efcad13c4a7c9d5239cf45 | |
parent | b895fb66437655888386db82aa6434b0f5bfc0d6 (diff) | |
download | rockbox-84a3cbe24dd4d5362f758aa7f70278f85742c1c2.tar.gz rockbox-84a3cbe24dd4d5362f758aa7f70278f85742c1c2.zip |
ErosQ: Small keymap changes
- Move WPS Stop to Power (Hold)
- Add WPS Hotkey to Wheel scroll Fwd/Back
- Add WPS Quickscreen to Play (Hold)
- Add Tree Hotkey to Play (Hold)
Change-Id: Id74622138353521f736c0de1009a354307b108eb
-rw-r--r-- | apps/keymaps/keymap-erosq.c | 40 | ||||
-rw-r--r-- | firmware/export/config/aigoerosq.h | 1 |
2 files changed, 15 insertions, 26 deletions
diff --git a/apps/keymaps/keymap-erosq.c b/apps/keymaps/keymap-erosq.c index 71c9b39171..59b70d24ca 100644 --- a/apps/keymaps/keymap-erosq.c +++ b/apps/keymaps/keymap-erosq.c | |||
@@ -39,16 +39,11 @@ static const struct button_mapping button_context_standard[] = { | |||
39 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, | 39 | { ACTION_STD_NEXT, BUTTON_NEXT, BUTTON_NONE }, |
40 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 40 | { ACTION_STD_NEXTREPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
41 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 41 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
42 | { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, // release just because it feels better to use | 42 | { ACTION_STD_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
43 | { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REL, BUTTON_BACK }, | ||
43 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 44 | { ACTION_STD_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
44 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | 45 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, |
45 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | 46 | { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_NONE }, |
46 | |||
47 | /* ACTION_STD_QUICKSCREEN, | ||
48 | * ACTION_STD_KEYLOCK | ||
49 | * ACTION_STD_REC | ||
50 | * ACTION_STD_HOTKEY | ||
51 | */ | ||
52 | 47 | ||
53 | LAST_ITEM_IN_LIST | 48 | LAST_ITEM_IN_LIST |
54 | }; /* button_context_standard */ | 49 | }; /* button_context_standard */ |
@@ -67,34 +62,32 @@ static const struct button_mapping button_context_wps[] = { | |||
67 | { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, | 62 | { ACTION_WPS_STOPSEEK, BUTTON_PREV|BUTTON_REL, BUTTON_PREV|BUTTON_REPEAT }, |
68 | { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, | 63 | { ACTION_WPS_SKIPNEXT, BUTTON_NEXT|BUTTON_REL, BUTTON_NEXT }, |
69 | { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, | 64 | { ACTION_WPS_SKIPPREV, BUTTON_PREV|BUTTON_REL, BUTTON_PREV }, |
70 | { ACTION_WPS_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 65 | { ACTION_WPS_QUICKSCREEN, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
66 | { ACTION_WPS_HOTKEY, BUTTON_SCROLL_BACK, BUTTON_NONE }, | ||
67 | { ACTION_WPS_HOTKEY, BUTTON_SCROLL_FWD, BUTTON_NONE }, | ||
71 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, | 68 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN, BUTTON_NONE }, |
72 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | 69 | { ACTION_WPS_VOLDOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, |
73 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, | 70 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP, BUTTON_NONE }, |
74 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, | 71 | { ACTION_WPS_VOLUP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE }, |
75 | /* ACTION_WPS_ID3SCREEN optional */ | 72 | /* ACTION_WPS_ID3SCREEN optional */ |
76 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, | 73 | { ACTION_WPS_CONTEXT, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, |
77 | // { ACTION_WPS_QUICKSCREEN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_DOWN }, | ||
78 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* this should be the same as ACTION_STD_MENU */ | 74 | { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, /* this should be the same as ACTION_STD_MENU */ |
79 | /* ACTION_WPS_VIEW_PLAYLIST | 75 | /* ACTION_WPS_VIEW_PLAYLIST |
80 | * ACTION_WPS_LIST_BOOKMARKS, optional | 76 | * ACTION_WPS_LIST_BOOKMARKS, optional |
81 | * ACTION_WPS_CREATE_BOOKMARK, optional | 77 | * ACTION_WPS_CREATE_BOOKMARK, optional |
82 | */ | 78 | */ |
83 | { ACTION_STD_KEYLOCK, BUTTON_POWER, BUTTON_NONE }, | 79 | { ACTION_STD_KEYLOCK, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
80 | { ACTION_WPS_STOP, BUTTON_POWER|BUTTON_REPEAT, BUTTON_POWER }, | ||
84 | 81 | ||
85 | LAST_ITEM_IN_LIST | 82 | LAST_ITEM_IN_LIST |
86 | }; /* button_context_wps */ | 83 | }; /* button_context_wps */ |
87 | 84 | ||
88 | static const struct button_mapping button_context_settings[] = { | 85 | static const struct button_mapping button_context_settings[] = { |
89 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 86 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
90 | // { ACTION_SETTINGS_INCREPEAT, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE }, | ||
91 | { ACTION_SETTINGS_INCBIGSTEP, BUTTON_VOL_UP, BUTTON_NONE }, | 87 | { ACTION_SETTINGS_INCBIGSTEP, BUTTON_VOL_UP, BUTTON_NONE }, |
92 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 88 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
93 | // { ACTION_SETTINGS_DECREPEAT, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
94 | { ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE }, | 89 | { ACTION_SETTINGS_DECBIGSTEP, BUTTON_VOL_DOWN, BUTTON_NONE }, |
95 | /* ACTION_SETTINGS_DECBIGSTEP */ | ||
96 | { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 90 | { ACTION_SETTINGS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
97 | /* ACTION_SETTINGS_SET, Used by touchscreen targets */ | ||
98 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), | 91 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), |
99 | }; /* button_context_settings */ | 92 | }; /* button_context_settings */ |
100 | 93 | ||
@@ -117,9 +110,9 @@ static const struct button_mapping button_context_tree[] = { | |||
117 | /* | 110 | /* |
118 | { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, | 111 | { ACTION_TREE_WPS, BUTTON_OPTION|BUTTON_REL, BUTTON_OPTION }, |
119 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, | 112 | { ACTION_TREE_STOP, BUTTON_POWER|BUTTON_REL, BUTTON_POWER }, |
120 | { ACTION_TREE_HOTKEY, BUTTON_HOME|BUTTON_REPEAT, BUTTON_HOME }, | ||
121 | */ | 113 | */ |
122 | { ACTION_STD_MENU, BUTTON_MENU, BUTTON_MENU }, | 114 | { ACTION_TREE_HOTKEY, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
115 | { ACTION_STD_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, | ||
123 | 116 | ||
124 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), | 117 | LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST), |
125 | }; /* button_context_tree */ | 118 | }; /* button_context_tree */ |
@@ -133,10 +126,10 @@ static const struct button_mapping button_context_yesno[] = { | |||
133 | static const struct button_mapping button_context_quickscreen[] = { | 126 | static const struct button_mapping button_context_quickscreen[] = { |
134 | { ACTION_QS_TOP, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, | 127 | { ACTION_QS_TOP, BUTTON_PREV|BUTTON_REL, BUTTON_NONE }, |
135 | { ACTION_QS_TOP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | 128 | { ACTION_QS_TOP, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, |
136 | { ACTION_QS_DOWN, BUTTON_SCROLL_FWD|BUTTON_REL, BUTTON_NONE }, | 129 | { ACTION_QS_RIGHT, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
137 | { ACTION_QS_LEFT, BUTTON_SCROLL_BACK|BUTTON_REL, BUTTON_NONE }, | 130 | { ACTION_QS_LEFT, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
138 | { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, | 131 | { ACTION_QS_DOWN, BUTTON_NEXT|BUTTON_REL, BUTTON_NONE }, |
139 | { ACTION_QS_RIGHT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | 132 | { ACTION_QS_DOWN, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, |
140 | { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, | 133 | { ACTION_STD_CANCEL, BUTTON_BACK, BUTTON_NONE }, |
141 | 134 | ||
142 | LAST_ITEM_IN_LIST | 135 | LAST_ITEM_IN_LIST |
@@ -150,12 +143,9 @@ static const struct button_mapping button_context_settings_time[] = { | |||
150 | { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, | 143 | { ACTION_STD_CANCEL, BUTTON_BACK|BUTTON_REPEAT, BUTTON_BACK }, |
151 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 144 | { ACTION_STD_OK, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
152 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, | 145 | { ACTION_SETTINGS_INC, BUTTON_SCROLL_FWD, BUTTON_NONE }, |
153 | // { ACTION_SETTINGS_INCREPEAT, BUTTON_SCROLL_FWD|BUTTON_REPEAT, BUTTON_NONE }, | ||
154 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 146 | { ACTION_SETTINGS_DEC, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
155 | // { ACTION_SETTINGS_DECREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, | ||
156 | 147 | ||
157 | LAST_ITEM_IN_LIST | 148 | LAST_ITEM_IN_LIST |
158 | //LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS) | ||
159 | }; /* button_context_settings_time */ | 149 | }; /* button_context_settings_time */ |
160 | 150 | ||
161 | static const struct button_mapping button_context_pitchscreen[] = { | 151 | static const struct button_mapping button_context_pitchscreen[] = { |
@@ -164,9 +154,7 @@ static const struct button_mapping button_context_pitchscreen[] = { | |||
164 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, | 154 | { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE }, |
165 | { ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN, BUTTON_NONE }, | 155 | { ACTION_PS_DEC_BIG, BUTTON_VOL_DOWN, BUTTON_NONE }, |
166 | { ACTION_PS_NUDGE_LEFT, BUTTON_PREV, BUTTON_NONE }, | 156 | { ACTION_PS_NUDGE_LEFT, BUTTON_PREV, BUTTON_NONE }, |
167 | /* { ACTION_PS_NUDGE_LEFTOFF, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE }, */ | ||
168 | { ACTION_PS_NUDGE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | 157 | { ACTION_PS_NUDGE_RIGHT, BUTTON_NEXT, BUTTON_NONE }, |
169 | /* { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL, BUTTON_NONE }, */ | ||
170 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, | 158 | { ACTION_PS_TOGGLE_MODE, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, |
171 | { ACTION_PS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, | 159 | { ACTION_PS_RESET, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, |
172 | { ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE }, | 160 | { ACTION_PS_EXIT, BUTTON_BACK, BUTTON_NONE }, |
diff --git a/firmware/export/config/aigoerosq.h b/firmware/export/config/aigoerosq.h index 2d0f7a0cdf..bfaa323968 100644 --- a/firmware/export/config/aigoerosq.h +++ b/firmware/export/config/aigoerosq.h | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | /* define this if you have access to the quickscreen */ | 16 | /* define this if you have access to the quickscreen */ |
17 | #define HAVE_QUICKSCREEN | 17 | #define HAVE_QUICKSCREEN |
18 | #define HAVE_HOTKEY | ||
18 | 19 | ||
19 | #define HAVE_HEADPHONE_DETECTION | 20 | #define HAVE_HEADPHONE_DETECTION |
20 | #define HAVE_LINEOUT_DETECTION | 21 | #define HAVE_LINEOUT_DETECTION |