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

1 files changed, 6 insertions, 15 deletions

diff --git a/apps/plugins/wormlet.c b/apps/plugins/wormlet.c
index 6cf03dfaff..e4286f35b4 100644
--- a/apps/plugins/wormlet.c
+++ b/apps/plugins/wormlet.c
@@ -362,16 +362,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     (BUTTON_HOME | BUTTON_PWRALT)
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define BTN_DIR_UP        BUTTON_HOME
-#define BTN_DIR_DOWN      BUTTON_OPTION
-#define BTN_DIR_LEFT      BUTTON_PREV
-#define BTN_DIR_RIGHT     BUTTON_NEXT
-#define BTN_STARTPAUSE    BUTTON_PLAY
-#define BTN_QUIT          BUTTON_POWER
-#define BTN_STOPRESET     (BUTTON_HOME | BUTTON_POWER)
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define BTN_DIR_UP        BUTTON_HOME
 #define BTN_DIR_DOWN      BUTTON_OPTION
 #define BTN_DIR_LEFT      BUTTON_PREV
@@ -389,7 +380,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define BTN_DIR_UP        BUTTON_PREV
 #define BTN_DIR_DOWN      BUTTON_NEXT
 #define BTN_DIR_LEFT      BUTTON_HOME
@@ -398,14 +389,14 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define BTN_QUIT          BUTTON_POWER
 #define BTN_STOPRESET     BUTTON_VOL_UP
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define BTN_DIR_UP        BUTTON_PREV
 #define BTN_DIR_DOWN      BUTTON_NEXT
-#define BTN_DIR_LEFT      BUTTON_HOME
-#define BTN_DIR_RIGHT     BUTTON_VOL_DOWN
+#define BTN_DIR_LEFT      BUTTON_SCROLL_BACK
+#define BTN_DIR_RIGHT     BUTTON_SCROLL_FWD
 #define BTN_STARTPAUSE    BUTTON_PLAY
 #define BTN_QUIT          BUTTON_POWER
-#define BTN_STOPRESET     BUTTON_VOL_UP
+#define BTN_STOPRESET     BUTTON_BACK
 
 #else
 #error No keymap defined!