diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-08 09:47:40 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-11 16:37:17 -0400 |
commit | 2a471e288c16b91a7186a60b3fb84dd55a494c7a (patch) | |
tree | 3e746212c5fa69b59f61d19b6e29d11aa8a5e31b /apps/plugins/zxbox | |
parent | 5efaa9ef8073bb216e3dcdbb4476f2fa7c672b76 (diff) | |
download | rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.tar.gz rockbox-2a471e288c16b91a7186a60b3fb84dd55a494c7a.zip |
New port: AIGO EROS Q / EROS K
The Q and K have a slightly different case, but the hardware under the
shell is completely identical.
These models are rebadged versions:
* Hifiwalker H2 (== Q)
* AGPTek H3 (== K)
* Surfans F20 (== K)
Other notes:
* Significant improvements in the shared Hiby-platform launcher/loader
* SD card can theoretically be hot-swapped now
* Support external USB mass storage!
* Some consolidation of Hiby-platform targets
* Some consolidation of plugin keymaps
Todo/known issues:
* Keymaps need to be gone over properly
* Convert to HAVE_SCROLLWHEEL?
Change-Id: I5a8a4f22c38a5b69392ca7c0a8ad8c4e07d9523c
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r-- | apps/plugins/zxbox/keymaps.h | 20 | ||||
-rw-r--r-- | apps/plugins/zxbox/zxbox_keyb.c | 29 |
2 files changed, 16 insertions, 33 deletions
diff --git a/apps/plugins/zxbox/keymaps.h b/apps/plugins/zxbox/keymaps.h index eae20e7976..6c0fac6ddf 100644 --- a/apps/plugins/zxbox/keymaps.h +++ b/apps/plugins/zxbox/keymaps.h @@ -266,15 +266,7 @@ #define ZX_UP BUTTON_HOME #define ZX_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == XDUOO_X3II_PAD -#define ZX_SELECT BUTTON_PLAY -#define ZX_MENU BUTTON_POWER -#define ZX_LEFT BUTTON_PREV -#define ZX_RIGHT BUTTON_NEXT -#define ZX_UP BUTTON_HOME -#define ZX_DOWN BUTTON_OPTION - -#elif CONFIG_KEYPAD == XDUOO_X20_PAD +#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD #define ZX_SELECT BUTTON_PLAY #define ZX_MENU BUTTON_POWER #define ZX_LEFT BUTTON_PREV @@ -290,7 +282,7 @@ #define ZX_UP BUTTON_HOME #define ZX_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == IHIFI_770_PAD +#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD #define ZX_SELECT BUTTON_PLAY #define ZX_MENU BUTTON_POWER #define ZX_LEFT BUTTON_HOME @@ -298,11 +290,11 @@ #define ZX_UP BUTTON_PREV #define ZX_DOWN BUTTON_NEXT -#elif CONFIG_KEYPAD == IHIFI_800_PAD +#elif CONFIG_KEYPAD == EROSQ_PAD #define ZX_SELECT BUTTON_PLAY -#define ZX_MENU BUTTON_POWER -#define ZX_LEFT BUTTON_HOME -#define ZX_RIGHT BUTTON_VOL_DOWN +#define ZX_MENU BUTTON_MENU +#define ZX_LEFT BUTTON_SCROLL_BACK +#define ZX_RIGHT BUTTON_SCROLL_FWD #define ZX_UP BUTTON_PREV #define ZX_DOWN BUTTON_NEXT diff --git a/apps/plugins/zxbox/zxbox_keyb.c b/apps/plugins/zxbox/zxbox_keyb.c index c16c3cd20a..f77ce538d1 100644 --- a/apps/plugins/zxbox/zxbox_keyb.c +++ b/apps/plugins/zxbox/zxbox_keyb.c @@ -36,7 +36,7 @@ /* TODO: Check keyboard mappings */ -#define KBD_SELECT BUTTON_SELECT +#define KBD_SELECT BUTTON_SELECT #define KBD_ABORT BUTTON_PLAY #define KBD_LEFT BUTTON_LEFT #define KBD_RIGHT BUTTON_RIGHT @@ -257,16 +257,7 @@ #define KBD_UP BUTTON_HOME #define KBD_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == XDUOO_X3II_PAD - -#define KBD_SELECT BUTTON_PLAY -#define KBD_ABORT BUTTON_POWER -#define KBD_LEFT BUTTON_PREV -#define KBD_RIGHT BUTTON_NEXT -#define KBD_UP BUTTON_HOME -#define KBD_DOWN BUTTON_OPTION - -#elif CONFIG_KEYPAD == XDUOO_X20_PAD +#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD #define KBD_SELECT BUTTON_PLAY #define KBD_ABORT BUTTON_POWER @@ -284,7 +275,7 @@ #define KBD_UP BUTTON_HOME #define KBD_DOWN BUTTON_OPTION -#elif CONFIG_KEYPAD == IHIFI_770_PAD +#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD #define KBD_SELECT BUTTON_PLAY #define KBD_ABORT BUTTON_POWER @@ -293,12 +284,12 @@ #define KBD_UP BUTTON_PREV #define KBD_DOWN BUTTON_NEXT -#elif CONFIG_KEYPAD == IHIFI_800_PAD +#elif CONFIG_KEYPAD == EROSQ_PAD #define KBD_SELECT BUTTON_PLAY -#define KBD_ABORT BUTTON_POWER -#define KBD_LEFT BUTTON_HOME -#define KBD_RIGHT BUTTON_VOL_DOWN +#define KBD_ABORT BUTTON_BACK +#define KBD_LEFT BUTTON_SCROLL_BACK +#define KBD_RIGHT BUTTON_SCROLL_FWD #define KBD_UP BUTTON_PREV #define KBD_DOWN BUTTON_NEXT @@ -581,7 +572,7 @@ int zx_kbd_input(char* text/*, int buflen*/) } cur_blink = !cur_blink; - + /* highlight the key that has focus */ FOR_NB_SCREENS(l) { @@ -591,7 +582,7 @@ int zx_kbd_input(char* text/*, int buflen*/) param[l].font_w, param[l].font_h); rb->screens[l]->set_drawmode(DRMODE_SOLID); } - + FOR_NB_SCREENS(l) rb->screens[l]->update(); @@ -687,7 +678,7 @@ int zx_kbd_input(char* text/*, int buflen*/) char_screen = 0; /* inserts the selected char */ - + /* find input char */ k = (param[char_screen].page*param[char_screen].lines + param[char_screen].y)*param[char_screen].max_chars + |