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, 10 insertions, 23 deletions

diff --git a/apps/plugins/fractals/fractal.h b/apps/plugins/fractals/fractal.h
index 45de45c5cd..d4d013550e 100644
--- a/apps/plugins/fractals/fractal.h
+++ b/apps/plugins/fractals/fractal.h
@@ -458,19 +458,7 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_PREV)
 #define FRACTAL_RESET           (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define FRACTAL_QUIT            BUTTON_POWER
-#define FRACTAL_UP              BUTTON_HOME
-#define FRACTAL_DOWN            BUTTON_OPTION
-#define FRACTAL_LEFT            BUTTON_PREV
-#define FRACTAL_RIGHT           BUTTON_NEXT
-#define FRACTAL_ZOOM_IN         BUTTON_VOL_UP
-#define FRACTAL_ZOOM_OUT        BUTTON_VOL_DOWN
-#define FRACTAL_PRECISION_INC   (BUTTON_PLAY | BUTTON_NEXT)
-#define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_PREV)
-#define FRACTAL_RESET           (BUTTON_HOME | BUTTON_POWER)
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_HOME
 #define FRACTAL_DOWN            BUTTON_OPTION
@@ -494,7 +482,7 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_PLAY | BUTTON_PREV)
 #define FRACTAL_RESET           (BUTTON_HOME | BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_PREV
 #define FRACTAL_DOWN            BUTTON_NEXT
@@ -506,17 +494,17 @@
 #define FRACTAL_PRECISION_DEC   (BUTTON_POWER | BUTTON_PREV)
 #define FRACTAL_RESET           (BUTTON_POWER | BUTTON_HOME)
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define FRACTAL_QUIT            BUTTON_POWER
 #define FRACTAL_UP              BUTTON_PREV
 #define FRACTAL_DOWN            BUTTON_NEXT
-#define FRACTAL_LEFT            BUTTON_HOME
-#define FRACTAL_RIGHT           BUTTON_VOL_DOWN
-#define FRACTAL_ZOOM_IN         (BUTTON_POWER | BUTTON_VOL_UP)
-#define FRACTAL_ZOOM_OUT        (BUTTON_POWER | BUTTON_VOL_DOWN)
-#define FRACTAL_PRECISION_INC   (BUTTON_POWER | BUTTON_NEXT)
-#define FRACTAL_PRECISION_DEC   (BUTTON_POWER | BUTTON_PREV)
-#define FRACTAL_RESET           (BUTTON_POWER | BUTTON_HOME)
+#define FRACTAL_LEFT            BUTTON_SCROLL_BACK
+#define FRACTAL_RIGHT           BUTTON_SCROLL_FWD
+#define FRACTAL_ZOOM_IN         BUTTON_VOL_UP
+#define FRACTAL_ZOOM_OUT        BUTTON_VOL_DOWN
+#define FRACTAL_PRECISION_INC   BUTTON_MENU
+#define FRACTAL_PRECISION_DEC   BUTTON_BACK
+#define FRACTAL_RESET           BUTTON_PLAY
 
 #else
 #error No keymap defined!
@@ -555,4 +543,3 @@
 #endif
 
 #endif
-