4 files changed, 48 insertions, 9 deletions

diff --git a/firmware/export/config-iaudio7.h b/firmware/export/config-iaudio7.h
index 8934470537..cce357ec4b 100644
--- a/firmware/export/config-iaudio7.h
+++ b/firmware/export/config-iaudio7.h
@@ -14,6 +14,13 @@
    explicitly if different */
 #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO)
 
+/* FM Tuner */
+#define CONFIG_TUNER LV24020LP
+#define HAVE_TUNER_PWR_CTRL
+
+/* Define this for FM radio input available */
+#define HAVE_FMRADIO_IN
+
 /* define hardware samples rate caps mask */
 #define HW_SAMPR_CAPS   (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/)
 
@@ -49,7 +56,7 @@
 
 #define HAVE_FAT16SUPPORT
 
-#if 0 /* Enable for USB driver test */
+#if 0 && !defined(SIMULATOR) /* Enable for USB driver test */
 #define HAVE_USBSTACK
 #define USE_HIGH_SPEED
 #define USB_VENDOR_ID   0x0e21
@@ -144,13 +151,6 @@
 
 #define CONFIG_LCD LCD_IAUDIO67
 
-/* FM Tuner */
-#define CONFIG_TUNER LV24020LP
-#define HAVE_TUNER_PWR_CTRL
-
-/* Define this for FM radio input available */
-#define HAVE_FMRADIO_IN
-
 #define BOOTFILE_EXT "iaudio"
 #define BOOTFILE "rockbox." BOOTFILE_EXT
 #define BOOTDIR "/"
diff --git a/uisimulator/sdl/UI-iaudio7.bmp b/uisimulator/sdl/UI-iaudio7.bmp
new file mode 100644
index 0000000000..c349477747
--- /dev/null
+++ b/uisimulator/sdl/UI-iaudio7.bmp
diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c
index 47ecb2b368..2a06f2e435 100644
--- a/uisimulator/sdl/button.c
+++ b/uisimulator/sdl/button.c
@@ -810,7 +810,33 @@ void button_event(int key, bool pressed)
     case SDLK_KP_ENTER:
         new_btn = BUTTON_MENU;
         break;
-
+#elif CONFIG_KEYPAD == IAUDIO67_PAD
+    case SDLK_UP:
+        new_btn = BUTTON_RIGHT;
+        break;
+    case SDLK_DOWN:
+        new_btn = BUTTON_LEFT;
+        break;
+    case SDLK_LEFT:
+        new_btn = BUTTON_STOP;
+        break;
+    case SDLK_RETURN:
+    case SDLK_KP_ENTER:
+    case SDLK_RIGHT:
+        new_btn = BUTTON_PLAY;
+        break;
+    case SDLK_PLUS:
+        new_btn = BUTTON_VOLUP;
+        break;
+    case SDLK_MINUS:
+        new_btn = BUTTON_VOLDOWN;
+        break;
+    case SDLK_SPACE:
+        new_btn = BUTTON_MENU;
+        break;
+    case SDLK_BACKSPACE:
+        new_btn = BUTTON_POWER;
+        break;
 #elif CONFIG_KEYPAD == CREATIVEZVM_PAD
     case SDLK_KP1:
         new_btn = BUTTON_BACK;
diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h
index 625258a86f..88271eb81e 100644
--- a/uisimulator/sdl/uisdl.h
+++ b/uisimulator/sdl/uisdl.h
@@ -376,6 +376,19 @@
 #define UI_LCD_FGCOLOR              0, 0, 0 /* foreground color of LCD (no backlight) */
 #define UI_LCD_FGCOLORLIGHT         0, 0, 0 /* foreground color of LCD (backlight) */
 
+#elif defined(IAUDIO_7)
+#define UI_TITLE                    "iAudio7"
+#define UI_WIDTH                    494 /* width of GUI window */
+#define UI_HEIGHT                   214 /* height of GUI window */
+#define UI_LCD_BGCOLOR              90, 145, 90 /* bkgnd color of LCD (no backlight) */
+#define UI_LCD_BGCOLORLIGHT         173, 216, 230 /* bkgnd color of LCD (backlight) */
+#define UI_LCD_FGCOLOR              0, 0, 0 /* foreground color of LCD (no backlight) */
+#define UI_LCD_FGCOLORLIGHT         0, 0, 0 /* foreground color of LCD (backlight) */
+#define UI_LCD_POSX                 131 /* x position of lcd */
+#define UI_LCD_POSY                 38 /* y position of lcd */
+#define UI_LCD_WIDTH                160
+#define UI_LCD_HEIGHT               128
+
 #elif defined(CREATIVE_ZVM) || defined(CREATIVE_ZVM60GB)
 #ifdef CREATIVE_ZVM
  #define UI_TITLE                    "Creative Zen Vision:M 30GB"