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

diff --git a/apps/plugins/chessbox/chessbox_pgn.h b/apps/plugins/chessbox/chessbox_pgn.h
index 567dcb1acb..e9b66787ee 100644
--- a/apps/plugins/chessbox/chessbox_pgn.h
+++ b/apps/plugins/chessbox/chessbox_pgn.h
@@ -525,21 +525,7 @@
 #define CB_SCROLL_LEFT   (BUTTON_PREV|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_NEXT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define CB_SELECT  BUTTON_PLAY
-#define CB_UP      BUTTON_HOME
-#define CB_DOWN    BUTTON_OPTION
-#define CB_LEFT    BUTTON_PREV
-#define CB_RIGHT   BUTTON_NEXT
-#define CB_PLAY    BUTTON_VOL_UP
-#define CB_LEVEL   BUTTON_VOL_DOWN
-#define CB_MENU    BUTTON_POWER
-#define CB_SCROLL_UP     (BUTTON_HOME|BUTTON_REPEAT)
-#define CB_SCROLL_DOWN   (BUTTON_OPTION|BUTTON_REPEAT)
-#define CB_SCROLL_LEFT   (BUTTON_PREV|BUTTON_REPEAT)
-#define CB_SCROLL_RIGHT  (BUTTON_NEXT|BUTTON_REPEAT)
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define CB_SELECT  BUTTON_PLAY
 #define CB_UP      BUTTON_HOME
 #define CB_DOWN    BUTTON_OPTION
@@ -567,7 +553,7 @@
 #define CB_SCROLL_LEFT   (BUTTON_PREV|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_NEXT|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define CB_SELECT  BUTTON_PLAY
 #define CB_UP      BUTTON_PREV
 #define CB_DOWN    BUTTON_NEXT
@@ -581,19 +567,19 @@
 #define CB_SCROLL_LEFT   (BUTTON_HOME|BUTTON_REPEAT)
 #define CB_SCROLL_RIGHT  (BUTTON_VOL_UP|BUTTON_REPEAT)
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define CB_SELECT  BUTTON_PLAY
 #define CB_UP      BUTTON_PREV
 #define CB_DOWN    BUTTON_NEXT
-#define CB_LEFT    BUTTON_HOME
-#define CB_RIGHT   BUTTON_VOL_DOWN
-#define CB_PLAY    BUTTON_VOL_UP
-#define CB_LEVEL   (BUTTON_PLAY|BUTTON_REPEAT)
-#define CB_MENU    BUTTON_POWER
+#define CB_LEFT    BUTTON_SCROLL_BACK
+#define CB_RIGHT   BUTTON_SCROLL_FWD
+#define CB_PLAY    BUTTON_VOL_DOWN
+#define CB_MENU    BUTTON_MENU
+#define CB_LEVEL   BUTTON_VOL_UP
 #define CB_SCROLL_UP     (BUTTON_PREV|BUTTON_REPEAT)
 #define CB_SCROLL_DOWN   (BUTTON_NEXT|BUTTON_REPEAT)
-#define CB_SCROLL_LEFT   (BUTTON_HOME|BUTTON_REPEAT)
-#define CB_SCROLL_RIGHT  (BUTTON_VOL_UP|BUTTON_REPEAT)
+#define CB_SCROLL_LEFT   (BUTTON_SCROLL_BACK|BUTTON_REPEAT)
+#define CB_SCROLL_RIGHT  (BUTTON_SCROLL_FWD|BUTTON_REPEAT)
 
 #else
 #error No keymap defined!