summaryrefslogtreecommitdiff
path: root/firmware/target/hosted/sdl/sim-ui-defines.h
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/hosted/sdl/sim-ui-defines.h')
-rw-r--r--firmware/target/hosted/sdl/sim-ui-defines.h7
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 @@
508#define UI_LCD_POSX 46 508#define UI_LCD_POSX 46
509#define UI_LCD_POSY 40 509#define UI_LCD_POSY 40
510 510
511<<<<<<< HEAD
511#elif defined(SONY_NWZA860) 512#elif defined(SONY_NWZA860)
512#define UI_TITLE "Sony NWZ-A860 Series" 513#define UI_TITLE "Sony NWZ-A860 Series"
513#define UI_WIDTH 390 /* width of GUI window */ 514#define UI_WIDTH 390 /* width of GUI window */
@@ -521,6 +522,12 @@
521#define UI_HEIGHT 380 522#define UI_HEIGHT 380
522#define UI_LCD_POSX 29 523#define UI_LCD_POSX 29
523#define UI_LCD_POSY 25 524#define UI_LCD_POSY 25
525#elif defined(XDUOO_X3)
526#define UI_TITLE "xDuoo X3"
527#define UI_WIDTH 192 /* width of GUI window */
528#define UI_HEIGHT 457 /* height of GUI window */
529#define UI_LCD_POSX 34
530#define UI_LCD_POSY 73
524#elif defined(SIMULATOR) 531#elif defined(SIMULATOR)
525#error no UI defines 532#error no UI defines
526#endif 533#endif