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

diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index e34cedde21..641991cfeb 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -293,23 +293,7 @@
 #define MIDI_VOL_DOWN   BUTTON_VOLDOWN
 #define MIDI_PLAYPAUSE  BUTTON_SELECT
 
-#elif CONFIG_KEYPAD == XDUOO_X3_PAD
-#define MIDI_QUIT         BUTTON_POWER
-#define MIDI_FFWD         BUTTON_NEXT
-#define MIDI_REWIND       BUTTON_PREV
-#define MIDI_VOL_UP       BUTTON_VOL_UP
-#define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
-#define MIDI_PLAYPAUSE    BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == XDUOO_X3II_PAD
-#define MIDI_QUIT         BUTTON_POWER
-#define MIDI_FFWD         BUTTON_NEXT
-#define MIDI_REWIND       BUTTON_PREV
-#define MIDI_VOL_UP       BUTTON_VOL_UP
-#define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
-#define MIDI_PLAYPAUSE    BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == XDUOO_X20_PAD
+#elif CONFIG_KEYPAD == XDUOO_X3_PAD || CONFIG_KEYPAD == XDUOO_X3II_PAD || CONFIG_KEYPAD == XDUOO_X20_PAD
 #define MIDI_QUIT         BUTTON_POWER
 #define MIDI_FFWD         BUTTON_NEXT
 #define MIDI_REWIND       BUTTON_PREV
@@ -325,15 +309,7 @@
 #define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
 #define MIDI_PLAYPAUSE    BUTTON_PLAY
 
-#elif CONFIG_KEYPAD == IHIFI_770_PAD
-#define MIDI_QUIT       BUTTON_POWER
-#define MIDI_FFWD       BUTTON_VOL_DOWN
-#define MIDI_REWIND     BUTTON_HOME
-#define MIDI_VOL_UP     BUTTON_PREV
-#define MIDI_VOL_DOWN   BUTTON_NEXT
-#define MIDI_PLAYPAUSE  BUTTON_PLAY
-
-#elif CONFIG_KEYPAD == IHIFI_800_PAD
+#elif CONFIG_KEYPAD == IHIFI_770_PAD || CONFIG_KEYPAD == IHIFI_800_PAD
 #define MIDI_QUIT        BUTTON_POWER
 #define MIDI_FFWD        BUTTON_VOL_DOWN
 #define MIDI_REWIND      BUTTON_HOME
@@ -341,6 +317,14 @@
 #define MIDI_VOL_DOWN    BUTTON_NEXT
 #define MIDI_PLAYPAUSE   BUTTON_PLAY
 
+#elif CONFIG_KEYPAD == EROSQ_PAD
+#define MIDI_QUIT         BUTTON_POWER
+#define MIDI_FFWD         BUTTON_NEXT
+#define MIDI_REWIND       BUTTON_PREV
+#define MIDI_VOL_UP       BUTTON_VOL_UP
+#define MIDI_VOL_DOWN     BUTTON_VOL_DOWN
+#define MIDI_PLAYPAUSE    BUTTON_PLAY
+
 #else
 #error No keymap defined!
 #endif
@@ -716,4 +700,3 @@ enum plugin_status plugin_start(const void* parameter)
         return PLUGIN_ERROR;
     return PLUGIN_OK;
 }
-