From 2a471e288c16b91a7186a60b3fb84dd55a494c7a Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Thu, 8 Oct 2020 09:47:40 -0400 Subject: 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 --- apps/plugins/rockblox.c | 42 ++++++++---------------------------------- 1 file changed, 8 insertions(+), 34 deletions(-) (limited to 'apps/plugins/rockblox.c') diff --git a/apps/plugins/rockblox.c b/apps/plugins/rockblox.c index ec6d892a0b..6a8b50a68d 100644 --- a/apps/plugins/rockblox.c +++ b/apps/plugins/rockblox.c @@ -431,31 +431,7 @@ #define ROCKBLOX_ROTATE_CCW BUTTON_VOLDOWN #define ROCKBLOX_DOWN BUTTON_DOWN -#elif CONFIG_KEYPAD == XDUOO_X3_PAD - -#define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CCW BUTTON_HOME -#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN -#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP -#define ROCKBLOX_DOWN BUTTON_OPTION -#define ROCKBLOX_LEFT BUTTON_PREV -#define ROCKBLOX_RIGHT BUTTON_NEXT -#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) -#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) - -#elif CONFIG_KEYPAD == XDUOO_X3II_PAD - -#define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CCW BUTTON_HOME -#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN -#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP -#define ROCKBLOX_DOWN BUTTON_OPTION -#define ROCKBLOX_LEFT BUTTON_PREV -#define ROCKBLOX_RIGHT BUTTON_NEXT -#define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) -#define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) - -#elif CONFIG_KEYPAD == XDUOO_X20_PAD +#elif (CONFIG_KEYPAD == XDUOO_X3_PAD) || (CONFIG_KEYPAD == XDUOO_X3II_PAD) || (CONFIG_KEYPAD == XDUOO_X20_PAD) #define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_ROTATE_CCW BUTTON_HOME @@ -479,7 +455,7 @@ #define ROCKBLOX_DROP (BUTTON_PLAY|BUTTON_REL) #define ROCKBLOX_RESTART (BUTTON_PLAY|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == IHIFI_770_PAD +#elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) #define ROCKBLOX_OFF BUTTON_POWER #define ROCKBLOX_ROTATE_CCW BUTTON_HOME @@ -491,17 +467,15 @@ #define ROCKBLOX_DROP (BUTTON_POWER|BUTTON_PLAY) #define ROCKBLOX_RESTART (BUTTON_POWER|BUTTON_REPEAT) -#elif CONFIG_KEYPAD == IHIFI_800_PAD - +#elif CONFIG_KEYPAD == EROSQ_PAD #define ROCKBLOX_OFF BUTTON_POWER -#define ROCKBLOX_ROTATE_CCW BUTTON_HOME -#define ROCKBLOX_ROTATE_CCW2 BUTTON_VOL_DOWN -#define ROCKBLOX_ROTATE_CW BUTTON_VOL_UP -#define ROCKBLOX_DOWN BUTTON_PLAY +#define ROCKBLOX_ROTATE_CCW BUTTON_SCROLL_BACK +#define ROCKBLOX_ROTATE_CW BUTTON_SCROLL_FWD +#define ROCKBLOX_DOWN BUTTON_MENU #define ROCKBLOX_LEFT BUTTON_PREV #define ROCKBLOX_RIGHT BUTTON_NEXT -#define ROCKBLOX_DROP (BUTTON_POWER|BUTTON_PLAY) -#define ROCKBLOX_RESTART (BUTTON_POWER|BUTTON_REPEAT) +#define ROCKBLOX_DROP BUTTON_PLAY +#define ROCKBLOX_RESTART BUTTON_BACK #else #error No keymap defined! -- cgit v1.2.3