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, 9 insertions, 16 deletions

diff --git a/apps/plugins/pong.c b/apps/plugins/pong.c
index 41525f3ffe..d5952aac35 100644
--- a/apps/plugins/pong.c
+++ b/apps/plugins/pong.c
@@ -293,15 +293,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_UP    BUTTON_HOME
 #define PONG_RIGHT_DOWN  BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define PONG_QUIT        BUTTON_POWER
-#define PONG_PAUSE       BUTTON_PLAY
-#define PONG_LEFT_UP     BUTTON_PREV
-#define PONG_LEFT_DOWN   BUTTON_OPTION
-#define PONG_RIGHT_UP    BUTTON_HOME
-#define PONG_RIGHT_DOWN  BUTTON_NEXT
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define PONG_QUIT        BUTTON_POWER
 #define PONG_PAUSE       BUTTON_PLAY
 #define PONG_LEFT_UP     BUTTON_PREV
@@ -317,7 +309,7 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_UP    BUTTON_HOME
 #define PONG_RIGHT_DOWN  BUTTON_NEXT
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define PONG_QUIT        BUTTON_POWER
 #define PONG_PAUSE       BUTTON_PREV
 #define PONG_LEFT_UP     BUTTON_PLAY
@@ -325,13 +317,14 @@ CONFIG_KEYPAD == MROBE500_PAD
 #define PONG_RIGHT_UP    BUTTON_VOL_UP
 #define PONG_RIGHT_DOWN  BUTTON_VOL_DOWN
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define PONG_QUIT        BUTTON_POWER
-#define PONG_PAUSE       BUTTON_PREV
-#define PONG_LEFT_UP     BUTTON_PLAY
-#define PONG_LEFT_DOWN   BUTTON_HOME
-#define PONG_RIGHT_UP    BUTTON_VOL_UP
-#define PONG_RIGHT_DOWN  BUTTON_VOL_DOWN
+#define PONG_PAUSE       BUTTON_PLAY
+#define PONG_LEFT_UP     BUTTON_SCROLL_BACK
+#define PONG_LEFT_DOWN   BUTTON_SCROLL_FWD
+#define PONG_RIGHT_UP    BUTTON_PREV
+#define PONG_RIGHT_DOWN  BUTTON_NEXT
+
 
 #else
 #error No keymap defined!