diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2018-06-28 06:24:26 -0400 |
---|---|---|
committer | Michael Giacomelli <giac2000@hotmail.com> | 2018-07-28 10:56:31 -0400 |
commit | 0662793ca0050e823cd1207cc4689a1cba5068bd (patch) | |
tree | 08cd2ec59c9044c96b697b5bf8d0640841d044e0 /apps/plugins/lib | |
parent | b3e2bd619b1b7ea94ef29d32db48e80b347a1990 (diff) | |
download | rockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.tar.gz rockbox-0662793ca0050e823cd1207cc4689a1cba5068bd.zip |
Add cleaned-up xDuoo X3 support
Cleaned up, rebased, and forward-ported from the xvortex fork.
(original credit to vsoftster@gmail.com)
Change-Id: Ibcc023a0271ea81e901450a88317708c2683236d
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>
Diffstat (limited to 'apps/plugins/lib')
-rw-r--r-- | apps/plugins/lib/keymaps.h | 8 | ||||
-rw-r--r-- | apps/plugins/lib/pluginlib_actions.c | 15 |
2 files changed, 23 insertions, 0 deletions
diff --git a/apps/plugins/lib/keymaps.h b/apps/plugins/lib/keymaps.h index 64deccf513..5fab361620 100644 --- a/apps/plugins/lib/keymaps.h +++ b/apps/plugins/lib/keymaps.h | |||
@@ -215,6 +215,14 @@ | |||
215 | #define BTN_FIRE BUTTON_MENU | 215 | #define BTN_FIRE BUTTON_MENU |
216 | #define BTN_PAUSE BUTTON_POWER | 216 | #define BTN_PAUSE BUTTON_POWER |
217 | 217 | ||
218 | #elif (CONFIG_KEYPAD == XDUOO_X3_PAD) | ||
219 | #define BTN_UP BUTTON_VOL_UP | ||
220 | #define BTN_DOWN BUTTON_VOL_DOWN | ||
221 | #define BTN_LEFT BUTTON_PREV | ||
222 | #define BTN_RIGHT BUTTON_NEXT | ||
223 | #define BTN_FIRE BUTTON_PLAY | ||
224 | #define BTN_PAUSE BUTTON_OPTION | ||
225 | |||
218 | #else | 226 | #else |
219 | #error Unsupported keypad | 227 | #error Unsupported keypad |
220 | #endif | 228 | #endif |
diff --git a/apps/plugins/lib/pluginlib_actions.c b/apps/plugins/lib/pluginlib_actions.c index f9addb32f4..2c5fb773ba 100644 --- a/apps/plugins/lib/pluginlib_actions.c +++ b/apps/plugins/lib/pluginlib_actions.c | |||
@@ -228,6 +228,15 @@ const struct button_mapping pla_main_ctx[] = | |||
228 | { PLA_DOWN_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, | 228 | { PLA_DOWN_REPEAT, BUTTON_FF|BUTTON_REPEAT, BUTTON_NONE}, |
229 | { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | 229 | { PLA_LEFT_REPEAT, BUTTON_REW|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, |
230 | { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, | 230 | { PLA_RIGHT_REPEAT, BUTTON_FF|BUTTON_M|BUTTON_REPEAT, BUTTON_NONE}, |
231 | #elif (CONFIG_KEYPAD == XDUOO_X3_PAD) | ||
232 | { PLA_UP, BUTTON_HOME, BUTTON_NONE }, | ||
233 | { PLA_DOWN, BUTTON_OPTION, BUTTON_NONE }, | ||
234 | { PLA_LEFT, BUTTON_PREV, BUTTON_NONE }, | ||
235 | { PLA_RIGHT, BUTTON_NEXT, BUTTON_NONE }, | ||
236 | { PLA_UP_REPEAT, BUTTON_HOME|BUTTON_REPEAT, BUTTON_NONE }, | ||
237 | { PLA_DOWN_REPEAT, BUTTON_OPTION|BUTTON_REPEAT, BUTTON_NONE }, | ||
238 | { PLA_LEFT_REPEAT, BUTTON_PREV|BUTTON_REPEAT, BUTTON_NONE }, | ||
239 | { PLA_RIGHT_REPEAT, BUTTON_NEXT|BUTTON_REPEAT, BUTTON_NONE }, | ||
231 | #else | 240 | #else |
232 | # ifndef HAVE_TOUCHSCREEN | 241 | # ifndef HAVE_TOUCHSCREEN |
233 | # error pluginlib_actions: No directions defined | 242 | # error pluginlib_actions: No directions defined |
@@ -447,6 +456,12 @@ const struct button_mapping pla_main_ctx[] = | |||
447 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | 456 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, |
448 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE}, | 457 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_NONE}, |
449 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | 458 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, |
459 | #elif (CONFIG_KEYPAD == XDUOO_X3_PAD) | ||
460 | {PLA_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_POWER}, | ||
461 | {PLA_EXIT, BUTTON_POWER|BUTTON_REPEAT, BUTTON_NONE}, | ||
462 | {PLA_SELECT, BUTTON_PLAY, BUTTON_NONE}, | ||
463 | {PLA_SELECT_REL, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY}, | ||
464 | {PLA_SELECT_REPEAT, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_NONE}, | ||
450 | 465 | ||
451 | #else | 466 | #else |
452 | # ifndef HAVE_TOUCHSCREEN | 467 | # ifndef HAVE_TOUCHSCREEN |