From 6979a5b63c184ce0ec0daa392edacde184d40d29 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Fri, 8 Nov 2013 13:57:21 +0000 Subject: [PATCH] zenmozaic: add keymap and bitmap for simulator Change-Id: I1be76d5b82ef585d2146d12aacad456071341827 --- firmware/target/hosted/sdl/sim-ui-defines.h | 7 ++++ uisimulator/bitmaps/UI-creativezenmozaic.bmp | Bin 0 -> 202086 bytes uisimulator/buttonmap/creative-zen.c | 37 +++++++++++-------- 3 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 uisimulator/bitmaps/UI-creativezenmozaic.bmp diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index f3ef41edb4..f65e1b7da7 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h @@ -494,6 +494,13 @@ #define UI_LCD_POSX 32 #define UI_LCD_POSY 33 +#elif defined(CREATIVE_ZENMOZAIC) +#define UI_TITLE "Creative ZEN Mozaic" +#define UI_WIDTH 184 /* width of GUI window */ +#define UI_HEIGHT 366/* height of GUI window */ +#define UI_LCD_POSX 27 +#define UI_LCD_POSY 48 + #elif defined(SIMULATOR) #error no UI defines #endif diff --git a/uisimulator/bitmaps/UI-creativezenmozaic.bmp b/uisimulator/bitmaps/UI-creativezenmozaic.bmp new file mode 100644 index 0000000000000000000000000000000000000000..bcb693abd18773fb966fd6455afa9b68ff3c7fb8 GIT binary patch literal 202086 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 U3NQq3G1rQiXD$bV!9|As4`DmJ6#xJL literal 0 HcmV?d00001 diff --git a/uisimulator/buttonmap/creative-zen.c b/uisimulator/buttonmap/creative-zen.c index 275de5616f..e8f07b4e94 100644 --- a/uisimulator/buttonmap/creative-zen.c +++ b/uisimulator/buttonmap/creative-zen.c @@ -45,21 +45,12 @@ int key_to_button(int keyboard_button) case SDLK_DOWN: new_btn = BUTTON_DOWN; break; - case SDLK_KP9: - new_btn = BUTTON_TOPRIGHT; - break; case SDLK_PAGEUP: new_btn = BUTTON_MENU; break; - case SDLK_KP1: - new_btn = BUTTON_BOTTOMLEFT; - break; case SDLK_END: new_btn = BUTTON_SHORTCUT; break; - case SDLK_KP3: - new_btn = BUTTON_BOTTOMRIGHT; - break; case SDLK_PAGEDOWN: new_btn = BUTTON_PLAYPAUSE; break; @@ -67,17 +58,20 @@ int key_to_button(int keyboard_button) case SDLK_DELETE: new_btn = BUTTON_POWER; break; -#ifdef CREATIVE_ZENMOZAIC - case SDLK_KP_PLUS: - new_btn = BUTTON_VOL_UP; +#ifdef CREATIVE_ZENXFI + case SDLK_KP1: + new_btn = BUTTON_BOTTOMLEFT; break; - case SDLK_KP_MINUS: - new_btn = BUTTON_VOL_DOWN; + case SDLK_KP3: + new_btn = BUTTON_BOTTOMRIGHT; break; -#endif case SDLK_KP7: new_btn = BUTTON_TOPLEFT; break; + case SDLK_KP9: + new_btn = BUTTON_TOPRIGHT; + break; +#endif case SDLK_HOME: case SDLK_BACKSPACE: new_btn = BUTTON_BACK; @@ -122,6 +116,19 @@ struct button_map bm[] = { { SDLK_PAGEDOWN, 463, 267, 16, "Play" }, { 0, 0, 0, 0, "None" } }; +#elif defined(CREATIVE_ZENMOZAIC) +struct button_map bm[] = { + { SDLK_LEFT, 37, 281, 15, "Left" }, + { SDLK_RIGHT, 101, 281, 15, "Right" }, + { SDLK_UP, 69, 249, 15, "Up" }, + { SDLK_DOWN, 69, 313, 15, "Down" }, + { SDLK_RETURN, 69, 281, 15, "Select" }, + { SDLK_HOME, 37, 249, 15, "Back" }, + { SDLK_PAGEUP, 101, 249, 15, "Menu" }, + { SDLK_END, 37, 313, 15, "Shortcut" }, + { SDLK_PAGEDOWN, 101, 313, 15, "Play" }, + { 0, 0, 0, 0, "None" } +}; #else #error please define button map #endif