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, 7 insertions, 22 deletions

diff --git a/apps/plugins/imageviewer/imageviewer_button.h b/apps/plugins/imageviewer/imageviewer_button.h
index e637a09ca9..4559a7b3a3 100644
--- a/apps/plugins/imageviewer/imageviewer_button.h
+++ b/apps/plugins/imageviewer/imageviewer_button.h
@@ -476,22 +476,7 @@
 #define IMGVIEW_MENU        BUTTON_POWER
 #define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_PWRALT)
 
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
-#define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
-#define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
-#define IMGVIEW_UP          BUTTON_HOME
-#define IMGVIEW_DOWN        BUTTON_OPTION
-#define IMGVIEW_LEFT        BUTTON_PREV
-#define IMGVIEW_RIGHT       BUTTON_NEXT
-#define IMGVIEW_NEXT        BUTTON_VOL_UP
-#define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT)
-#define IMGVIEW_PREVIOUS    BUTTON_VOL_DOWN
-#define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
-#define IMGVIEW_MENU        BUTTON_POWER
-#define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
 #define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
@@ -521,7 +506,7 @@
 #define IMGVIEW_MENU        BUTTON_POWER
 #define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
 #define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
@@ -536,20 +521,20 @@
 #define IMGVIEW_MENU        BUTTON_POWER
 #define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
 
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == EROSQ_PAD
 #define IMGVIEW_ZOOM_PRE    BUTTON_PLAY
 #define IMGVIEW_ZOOM_IN     (BUTTON_PLAY | BUTTON_REL)
 #define IMGVIEW_ZOOM_OUT    (BUTTON_PLAY | BUTTON_REPEAT)
 #define IMGVIEW_UP          BUTTON_PREV
 #define IMGVIEW_DOWN        BUTTON_NEXT
-#define IMGVIEW_LEFT        BUTTON_HOME
-#define IMGVIEW_RIGHT       (BUTTON_PLAY|BUTTON_POWER)
+#define IMGVIEW_LEFT        BUTTON_SCROLL_BACK
+#define IMGVIEW_RIGHT       BUTTON_SCROLL_FWD
 #define IMGVIEW_NEXT        BUTTON_VOL_UP
 #define IMGVIEW_NEXT_REPEAT (BUTTON_VOL_UP|BUTTON_REPEAT)
 #define IMGVIEW_PREVIOUS    BUTTON_VOL_DOWN
 #define IMGVIEW_PREVIOUS_REPEAT (BUTTON_VOL_DOWN|BUTTON_REPEAT)
-#define IMGVIEW_MENU        BUTTON_POWER
-#define IMGVIEW_SLIDE_SHOW  (BUTTON_HOME|BUTTON_POWER)
+#define IMGVIEW_MENU        BUTTON_MENU
+#define IMGVIEW_SLIDE_SHOW  BUTTON_BACK
 
 #else
 #error No keymap defined!