From f37f3393c997b775d177424d020bd5b16d43618a Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Thu, 26 Sep 2013 13:22:45 +0200 Subject: sonynwze370: fix simulator Change-Id: I23cd8ce8549119868011e2a05341f3cb6335fad6 --- firmware/target/hosted/sdl/sim-ui-defines.h | 7 ++ uisimulator/bitmaps/UI-sonynwze370.bmp | Bin 0 -> 234078 bytes uisimulator/buttonmap/SOURCES | 4 +- uisimulator/buttonmap/sony-nwz.c | 105 ++++++++++++++++++++++++++++ uisimulator/buttonmap/sony-nwze360.c | 88 ----------------------- 5 files changed, 113 insertions(+), 91 deletions(-) create mode 100644 uisimulator/bitmaps/UI-sonynwze370.bmp create mode 100644 uisimulator/buttonmap/sony-nwz.c delete mode 100644 uisimulator/buttonmap/sony-nwze360.c diff --git a/firmware/target/hosted/sdl/sim-ui-defines.h b/firmware/target/hosted/sdl/sim-ui-defines.h index 0b7e3fc..de25073 100644 --- a/firmware/target/hosted/sdl/sim-ui-defines.h +++ b/firmware/target/hosted/sdl/sim-ui-defines.h @@ -459,6 +459,13 @@ #define UI_LCD_POSX 50 #define UI_LCD_POSY 62 +#elif defined(SONY_NWZE370) +#define UI_TITLE "Sony NWZ-E370" +#define UI_WIDTH 196 /* width of GUI window */ +#define UI_HEIGHT 398 /* height of GUI window */ +#define UI_LCD_POSX 34 +#define UI_LCD_POSY 32 + #elif defined(APPLICATION) #define UI_TITLE "Rockbox" #define UI_LCD_POSX 0 diff --git a/uisimulator/bitmaps/UI-sonynwze370.bmp b/uisimulator/bitmaps/UI-sonynwze370.bmp new file mode 100644 index 0000000..067942b Binary files /dev/null and b/uisimulator/bitmaps/UI-sonynwze370.bmp differ diff --git a/uisimulator/buttonmap/SOURCES b/uisimulator/buttonmap/SOURCES index 3ed52f2..de9cf51 100644 --- a/uisimulator/buttonmap/SOURCES +++ b/uisimulator/buttonmap/SOURCES @@ -74,8 +74,6 @@ creative-zenxfi2.c #elif CONFIG_KEYPAD == SANSA_CONNECT_PAD sansa-connect.c #elif CONFIG_KEYPAD == SONY_NWZ_PAD -# ifdef SONY_NWZE360 -sony-nwze360.c -# endif +sony-nwz.c #endif #endif /* SIMULATOR */ diff --git a/uisimulator/buttonmap/sony-nwz.c b/uisimulator/buttonmap/sony-nwz.c new file mode 100644 index 0000000..a82b674 --- /dev/null +++ b/uisimulator/buttonmap/sony-nwz.c @@ -0,0 +1,105 @@ +/*************************************************************************** + * __________ __ ___. + * Open \______ \ ____ ____ | | _\_ |__ _______ ___ + * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / + * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < + * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ + * \/ \/ \/ \/ \/ + * $Id$ + * + * Copyright (C) 2013 by Amaury Pouly + * + * 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 +#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_LEFT: + new_btn = BUTTON_LEFT; + break; + case SDLK_KP6: + case SDLK_RIGHT: + new_btn = BUTTON_RIGHT; + break; + case SDLK_KP8: + case SDLK_UP: + new_btn = BUTTON_UP; + break; + case SDLK_KP2: + case SDLK_DOWN: + new_btn = BUTTON_DOWN; + break; + case SDLK_END: + case SDLK_KP3: + case SDLK_ESCAPE: + case SDLK_DELETE: + new_btn = BUTTON_POWER; + break; +#ifdef SONY_NWZE360 + case SDLK_KP_PLUS: + new_btn = BUTTON_VOL_UP; + break; + case SDLK_KP_MINUS: + new_btn = BUTTON_VOL_DOWN; + break; +#endif + case SDLK_KP1: + case SDLK_HOME: + case SDLK_BACKSPACE: + new_btn = BUTTON_BACK; + break; + case SDLK_KP_ENTER: + case SDLK_RETURN: + case SDLK_SPACE: + case SDLK_INSERT: + case SDLK_KP5: + new_btn = BUTTON_PLAY; + break; + } + return new_btn; +} + +#if defined(SONY_NWZE360) +struct button_map bm[] = { + { SDLK_LEFT, 100, 548, 30, "Left" }, + { SDLK_RIGHT, 240, 548, 30, "Right" }, + { SDLK_UP, 170, 478, 30, "Up" }, + { SDLK_DOWN, 170, 619, 30, "Down" }, + { SDLK_BACKSPACE, 81, 484, 35, "Back" }, + { SDLK_DELETE, 256, 484, 35, "Power" }, + { SDLK_RETURN, 170, 548, 40, "Play" }, + { SDLK_KP_MINUS, 339, 128, 30, "Volume -" }, + { SDLK_KP_PLUS, 339, 68, 30, "Volume +" }, + { 0, 0, 0, 0, "None" } +}; +#elif defined(SONY_NWZE370) +struct button_map bm[] = { + { SDLK_LEFT, 56, 299, 20, "Left" }, + { SDLK_RIGHT, 139, 299, 20, "Right" }, + { SDLK_UP, 98, 256, 20, "Up" }, + { SDLK_DOWN, 98, 340, 20, "Down" }, + { SDLK_BACKSPACE, 44, 259, 35, "Back" }, + { SDLK_DELETE, 152, 259, 35, "Power" }, + { SDLK_RETURN, 98, 299, 40, "Play" }, + { 0, 0, 0, 0, "None" } +}; +#else +#error please define button map +#endif + diff --git a/uisimulator/buttonmap/sony-nwze360.c b/uisimulator/buttonmap/sony-nwze360.c deleted file mode 100644 index 1b84dc3..0000000 --- a/uisimulator/buttonmap/sony-nwze360.c +++ /dev/null @@ -1,88 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2013 by Amaury Pouly - * - * 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 -#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_LEFT: - new_btn = BUTTON_LEFT; - break; - case SDLK_KP6: - case SDLK_RIGHT: - new_btn = BUTTON_RIGHT; - break; - case SDLK_KP8: - case SDLK_UP: - new_btn = BUTTON_UP; - break; - case SDLK_KP2: - case SDLK_DOWN: - new_btn = BUTTON_DOWN; - break; - case SDLK_END: - case SDLK_KP3: - case SDLK_ESCAPE: - case SDLK_DELETE: - new_btn = BUTTON_POWER; - break; - case SDLK_KP_PLUS: - new_btn = BUTTON_VOL_UP; - break; - case SDLK_KP_MINUS: - new_btn = BUTTON_VOL_DOWN; - break; - case SDLK_KP1: - case SDLK_HOME: - case SDLK_BACKSPACE: - new_btn = BUTTON_BACK; - break; - case SDLK_KP_ENTER: - case SDLK_RETURN: - case SDLK_SPACE: - case SDLK_INSERT: - case SDLK_KP5: - new_btn = BUTTON_PLAY; - break; - } - return new_btn; -} - -struct button_map bm[] = { - { SDLK_LEFT, 100, 548, 30, "Left" }, - { SDLK_RIGHT, 240, 548, 30, "Right" }, - { SDLK_UP, 170, 478, 30, "Up" }, - { SDLK_DOWN, 170, 619, 30, "Down" }, - { SDLK_BACKSPACE, 81, 484, 35, "Back" }, - { SDLK_DELETE, 256, 484, 35, "Power" }, - { SDLK_RETURN, 170, 548, 40, "Play" }, - { SDLK_KP_MINUS, 339, 128, 30, "Volume -" }, - { SDLK_KP_PLUS, 339, 68, 30, "Volume +" }, - { 0, 0, 0, 0, "None" } -}; - -- cgit v1.1