Add cleaned-up xDuoo X3 support

Cleaned up, rebased, and forward-ported from the xvortex fork.

(original credit to vsoftster@gmail.com)

Change-Id: Ibcc023a0271ea81e901450a88317708c2683236d
Signed-off-by: Solomon Peachy <pizza@shaftnet.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h
index 1ac124c881..b237842711 100644
--- a/firmware/target/hosted/sdl/sim-ui-defines.h
+++ b/firmware/target/hosted/sdl/sim-ui-defines.h
@@ -508,6 +508,7 @@
 #define UI_LCD_POSX                 46
 #define UI_LCD_POSY                 40
 
+<<<<<<< HEAD
 #elif defined(SONY_NWZA860)
 #define UI_TITLE                    "Sony NWZ-A860 Series"
 #define UI_WIDTH                    390 /* width of GUI window */
@@ -521,6 +522,12 @@
 #define UI_HEIGHT                   380
 #define UI_LCD_POSX                 29
 #define UI_LCD_POSY                 25
+#elif defined(XDUOO_X3)
+#define UI_TITLE                    "xDuoo X3"
+#define UI_WIDTH                    192 /* width of GUI window */
+#define UI_HEIGHT                   457 /* height of GUI window */
+#define UI_LCD_POSX                 34
+#define UI_LCD_POSY                 73
 #elif defined(SIMULATOR)
 #error no UI defines
 #endif