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, 14 deletions

diff --git a/apps/plugins/clix.c b/apps/plugins/clix.c
index d6b28b54b9..08264e8490 100644
--- a/apps/plugins/clix.c
+++ b/apps/plugins/clix.c
@@ -284,15 +284,7 @@
 #define CLIX_BUTTON_RIGHT         BUTTON_NEXT
 #define CLIX_BUTTON_CLICK         BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define CLIX_BUTTON_QUIT          BUTTON_POWER
-#define CLIX_BUTTON_UP            BUTTON_HOME
-#define CLIX_BUTTON_DOWN          BUTTON_OPTION
-#define CLIX_BUTTON_LEFT          BUTTON_PREV
-#define CLIX_BUTTON_RIGHT         BUTTON_NEXT
-#define CLIX_BUTTON_CLICK         BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define CLIX_BUTTON_QUIT          BUTTON_POWER
 #define CLIX_BUTTON_UP            BUTTON_HOME
 #define CLIX_BUTTON_DOWN          BUTTON_OPTION
@@ -308,7 +300,7 @@
 #define CLIX_BUTTON_RIGHT         BUTTON_NEXT
 #define CLIX_BUTTON_CLICK         BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define CLIX_BUTTON_QUIT          BUTTON_POWER
 #define CLIX_BUTTON_UP            BUTTON_PREV
 #define CLIX_BUTTON_DOWN          BUTTON_NEXT
@@ -316,13 +308,13 @@
 #define CLIX_BUTTON_RIGHT         BUTTON_VOL_DOWN
 #define CLIX_BUTTON_CLICK         BUTTON_VOL_UP
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define CLIX_BUTTON_QUIT          BUTTON_POWER
 #define CLIX_BUTTON_UP            BUTTON_PREV
 #define CLIX_BUTTON_DOWN          BUTTON_NEXT
-#define CLIX_BUTTON_LEFT          BUTTON_HOME
-#define CLIX_BUTTON_RIGHT         BUTTON_VOL_DOWN
-#define CLIX_BUTTON_CLICK         BUTTON_VOL_UP
+#define CLIX_BUTTON_LEFT          BUTTON_SCROLL_BACK
+#define CLIX_BUTTON_RIGHT         BUTTON_SCROLL_FWD
+#define CLIX_BUTTON_CLICK         BUTTON_PLAY
 
 #else
 #error "no keymap"