diff options
| -rw-r--r-- | firmware/target/hosted/sdl/sim-ui-defines.h | 8 | ||||
| -rw-r--r-- | uisimulator/bitmaps/UI-xduoox3ii.bmp | bin | 0 -> 540122 bytes | |||
| -rw-r--r-- | uisimulator/buttonmap/SOURCES | 2 | ||||
| -rw-r--r-- | uisimulator/buttonmap/xduoo-x3ii.c | 81 |
4 files changed, 87 insertions, 4 deletions
diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index 1e96383682..23825f318b 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h @@ -531,10 +531,10 @@ #elif defined(XDUOO_X3II) #define UI_TITLE "xDuoo X3ii" -#define UI_WIDTH 322 /* width of GUI window */ -#define UI_HEIGHT 609 /* height of GUI window */ -#define UI_LCD_POSX 43 -#define UI_LCD_POSY 62 +#define UI_WIDTH 299 /* width of GUI window */ +#define UI_HEIGHT 600 /* height of GUI window */ +#define UI_LCD_POSX 28 +#define UI_LCD_POSY 56 #elif defined(XDUOO_X20) #define UI_TITLE "xDuoo X20" diff --git a/uisimulator/bitmaps/UI-xduoox3ii.bmp b/uisimulator/bitmaps/UI-xduoox3ii.bmp Binary files differnew file mode 100644 index 0000000000..7f4321a904 --- /dev/null +++ b/uisimulator/bitmaps/UI-xduoox3ii.bmp diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 4e331f4b85..130727254c 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -85,6 +85,8 @@ sony-nwza860.c agptek-rocker.c #elif CONFIG_KEYPAD == XDUOO_X3_PAD xduoo-x3.c +#elif CONFIG_KEYPAD == XDUOO_X3II_PAD +xduoo-x3ii.c #elif (CONFIG_KEYPAD == IHIFI_770_PAD) || (CONFIG_KEYPAD == IHIFI_800_PAD) ihifi2.c #endif diff --git a/uisimulator/buttonmap/xduoo-x3ii.c b/uisimulator/buttonmap/xduoo-x3ii.c new file mode 100644 index 0000000000..20638a155a --- /dev/null +++ b/uisimulator/buttonmap/xduoo-x3ii.c @@ -0,0 +1,81 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2016 by Roman Stolyarov + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ****************************************************************************/ + + +#include <SDL.h> +#include "button.h" +#include "buttonmap.h" + +int key_to_button(int keyboard_button) +{ + int new_btn = BUTTON_NONE; + switch (keyboard_button) + { + case SDLK_KP4: + case SDLK_UP: + new_btn = BUTTON_PREV; + break; + case SDLK_KP1: + case SDLK_DOWN: + new_btn = BUTTON_NEXT; + break; + case SDLK_KP3: + case SDLK_KP_ENTER: + case SDLK_SPACE: + case SDLK_RETURN: + new_btn = BUTTON_PLAY; + break; + case SDLK_KP5: + case SDLK_END: + case SDLK_BACKSPACE: + new_btn = BUTTON_OPTION; + break; + case SDLK_KP7: + case SDLK_ESCAPE: + new_btn = BUTTON_POWER; + break; + case SDLK_KP9: + case SDLK_HOME: + new_btn = BUTTON_HOME; + break; + case SDLK_KP_MINUS: + case SDLK_PAGEUP: + new_btn = BUTTON_VOL_UP; + break; + case SDLK_KP_PLUS: + case SDLK_PAGEDOWN: + new_btn = BUTTON_VOL_DOWN; + break; + } + return new_btn; +} + +struct button_map bm[] = { + { SDLK_KP4, 214, 537, 20, "Prev" }, + { SDLK_KP1, 241, 488, 20, "Next" }, + { SDLK_KP3, 150, 488, 30, "Play" }, + { SDLK_KP5, 60, 488, 20, "Back" }, + { SDLK_KP7, 0, 60, 25, "Power" }, + { SDLK_KP9, 86, 537, 20, "Home" }, + { SDLK_KP_MINUS, 0, 120, 25, "Vol Up" }, + { SDLK_KP_PLUS, 0, 200, 25, "Vol Dn" }, + { 0, 0, 0, 0, "None" } +}; |
