From 275a30092e84f9d026a18bcf90b2f29721302a33 Mon Sep 17 00:00:00 2001 From: Robert Kukla Date: Sun, 26 Jul 2009 14:26:14 +0000 Subject: initial commit of remote support for m:robe 100 courtesy of lowlight; simulator support including small fixes for the m:robe 500 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22053 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/common/README | 3 --- uisimulator/sdl/UI-mrobe100.bmp | Bin 309558 -> 343782 bytes uisimulator/sdl/UI-mrobe500.bmp | Bin 630054 -> 473254 bytes uisimulator/sdl/button.c | 28 ++++++++++++++++++++++++---- uisimulator/sdl/uisdl.h | 10 ++++++---- 5 files changed, 30 insertions(+), 11 deletions(-) (limited to 'uisimulator') diff --git a/uisimulator/common/README b/uisimulator/common/README index 6f920cf43e..3ee2b45f0e 100644 --- a/uisimulator/common/README +++ b/uisimulator/common/README @@ -8,6 +8,3 @@ This directory is for code that is shared between all versions of the simulator, but is not needed for the target device. -The first code is for the software mpeg audio decoder. The actual -mpeg decoding code is here and the O/S specific sound drivers should -be located in the x11 and win32 directories as appropriate. diff --git a/uisimulator/sdl/UI-mrobe100.bmp b/uisimulator/sdl/UI-mrobe100.bmp index 19e5e1f3d3..2a9df60cf1 100644 Binary files a/uisimulator/sdl/UI-mrobe100.bmp and b/uisimulator/sdl/UI-mrobe100.bmp differ diff --git a/uisimulator/sdl/UI-mrobe500.bmp b/uisimulator/sdl/UI-mrobe500.bmp index 6aebbee8fd..c7d0bec362 100755 Binary files a/uisimulator/sdl/UI-mrobe500.bmp and b/uisimulator/sdl/UI-mrobe500.bmp differ diff --git a/uisimulator/sdl/button.c b/uisimulator/sdl/button.c index 5f92b655d1..5987584420 100644 --- a/uisimulator/sdl/button.c +++ b/uisimulator/sdl/button.c @@ -760,6 +760,30 @@ void button_event(int key, bool pressed) new_btn = BUTTON_POWER; break; #elif CONFIG_KEYPAD == MROBE100_PAD + case SDLK_F9: + new_btn = BUTTON_RC_HEART; + break; + case SDLK_F10: + new_btn = BUTTON_RC_MODE; + break; + case SDLK_F11: + new_btn = BUTTON_RC_VOL_DOWN; + break; + case SDLK_F12: + new_btn = BUTTON_RC_VOL_UP; + break; + case SDLK_LEFT: + new_btn = BUTTON_RC_FF; + break; + case SDLK_RIGHT: + new_btn = BUTTON_RC_REW; + break; + case SDLK_UP: + new_btn = BUTTON_RC_PLAY; + break; + case SDLK_DOWN: + new_btn = BUTTON_RC_DOWN; + break; case SDLK_KP1: new_btn = BUTTON_DISPLAY; break; @@ -770,19 +794,15 @@ void button_event(int key, bool pressed) new_btn = BUTTON_PLAY; break; 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_KP5: diff --git a/uisimulator/sdl/uisdl.h b/uisimulator/sdl/uisdl.h index 0fe0463b60..1543dcec37 100644 --- a/uisimulator/sdl/uisdl.h +++ b/uisimulator/sdl/uisdl.h @@ -163,14 +163,14 @@ #define UI_LCD_POSY 90 /* y position of lcd */ #elif defined(MROBE_500) -#if LCD_WIDHT==320 +#if LCD_WIDTH==320 #define UI_TITLE "Olympus M:Robe 500" #define UI_WIDTH 450 /* width of GUI window */ #define UI_HEIGHT 350 /* height of GUI window */ #define UI_LCD_POSX 65 /* x position of lcd */ #define UI_LCD_POSY 30 /* y position of lcd */ -#define UI_REMOTE_POSX 50 /* x position of remote lcd */ -#define UI_REMOTE_POSY 325 /* y position of remote lcd */ +#define UI_REMOTE_POSX 36 /* x position of remote lcd */ +#define UI_REMOTE_POSY 318 /* y position of remote lcd */ #else #define UI_TITLE "Olympus M:Robe 500" #define UI_WIDTH 900 /* width of GUI window */ @@ -235,9 +235,11 @@ #elif defined(MROBE_100) #define UI_TITLE "Olympus M:Robe 100" #define UI_WIDTH 247 /* width of GUI window */ -#define UI_HEIGHT 416 /* height of GUI window */ +#define UI_HEIGHT 462 /* height of GUI window */ #define UI_LCD_POSX 43 /* x position of lcd */ #define UI_LCD_POSY 25 /* y position of lcd */ +#define UI_REMOTE_POSX 34 /* x position of remote lcd */ +#define UI_REMOTE_POSY 432 /* y position of remote lcd */ #elif defined(COWON_D2) #define UI_TITLE "Cowon D2" -- cgit v1.2.3