diff options
| author | Robert Kukla <roolku@rockbox.org> | 2008-04-07 22:09:14 +0000 |
|---|---|---|
| committer | Robert Kukla <roolku@rockbox.org> | 2008-04-07 22:09:14 +0000 |
| commit | 1317ebb1a0f53d1a7c666da39f69ede260c5227b (patch) | |
| tree | 2ed4ca211abf89b23a74bba5dff1a86c6e700aaa | |
| parent | 9c32dde82c5018fe28abad84f62e449ca0d90958 (diff) | |
m:robe 100: a few button defines and other greyscale related changes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17030 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/plugins/cube.c | 9 | ||||
| -rw-r--r-- | apps/plugins/doom/i_video.c | 10 | ||||
| -rw-r--r-- | apps/plugins/doom/rockdoom.c | 2 | ||||
| -rw-r--r-- | apps/plugins/greyscale.c | 2 | ||||
| -rw-r--r-- | apps/plugins/test_scanrate.c | 3 |
5 files changed, 24 insertions, 2 deletions
diff --git a/apps/plugins/cube.c b/apps/plugins/cube.c index 78a0015713..7dca203f7c 100644 --- a/apps/plugins/cube.c +++ b/apps/plugins/cube.c @@ -367,8 +367,13 @@ static const unsigned face_colors[6] = LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 0, 255), LCD_RGBPACK(0, 0, 255) #elif defined(USE_GSLIB) +#ifdef MROBE_100 + GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, + GREY_DARKGRAY, GREY_WHITE, GREY_WHITE +#else GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, GREY_DARKGRAY, GREY_BLACK, GREY_BLACK +#endif #else LCD_LIGHTGRAY, LCD_LIGHTGRAY, LCD_DARKGRAY, LCD_DARKGRAY, LCD_BLACK, LCD_BLACK @@ -592,6 +597,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) lcdfuncs.drawline = rb->lcd_drawline; lcdfuncs.putsxy = rb->lcd_putsxy; +#ifdef MROBE_100 + grey_set_background(GREY_BLACK); +#endif + grey_setfont(FONT_SYSFIXED); #endif rb->lcd_setfont(FONT_SYSFIXED); diff --git a/apps/plugins/doom/i_video.c b/apps/plugins/doom/i_video.c index 2e98ce9f85..3e781270ff 100644 --- a/apps/plugins/doom/i_video.c +++ b/apps/plugins/doom/i_video.c @@ -255,6 +255,16 @@ void I_ShutdownGraphics(void) #define DOOMBUTTON_SHOOT BUTTON_SELECT #define DOOMBUTTON_ENTER BUTTON_MENU #define DOOMBUTTON_WEAPON BUTTON_MINUS +#elif CONFIG_KEYPAD == MROBE100_PAD +#define DOOMBUTTON_UP BUTTON_UP +#define DOOMBUTTON_DOWN BUTTON_DOWN +#define DOOMBUTTON_LEFT BUTTON_LEFT +#define DOOMBUTTON_RIGHT BUTTON_RIGHT +#define DOOMBUTTON_SHOOT BUTTON_SELECT +#define DOOMBUTTON_OPEN BUTTON_PLAY +#define DOOMBUTTON_ESC BUTTON_POWER +#define DOOMBUTTON_ENTER BUTTON_MENU +#define DOOMBUTTON_WEAPON BUTTON_DISPLAY #else #error Keymap not defined! #endif diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index 360ddf0358..f23e856fdc 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c @@ -744,7 +744,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->profile_thread(); #endif +#if LCD_DEPTH>1 rb->lcd_set_backdrop(NULL); +#endif D_DoomMain (); diff --git a/apps/plugins/greyscale.c b/apps/plugins/greyscale.c index aba5dcc05b..17449b9f62 100644 --- a/apps/plugins/greyscale.c +++ b/apps/plugins/greyscale.c @@ -54,7 +54,7 @@ PLUGIN_HEADER #define GREYSCALE_RC_OFF BUTTON_RC_STOP -#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD +#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || (CONFIG_KEYPAD == MROBE100_PAD) #define GREYSCALE_SHIFT BUTTON_PLAY /* won't work, but define it anyway */ #define GREYSCALE_UP BUTTON_UP #define GREYSCALE_DOWN BUTTON_DOWN diff --git a/apps/plugins/test_scanrate.c b/apps/plugins/test_scanrate.c index e88ac99a0f..bd189bc85e 100644 --- a/apps/plugins/test_scanrate.c +++ b/apps/plugins/test_scanrate.c @@ -31,7 +31,8 @@ PLUGIN_HEADER #define SCANRATE_INC BUTTON_RIGHT #define SCANRATE_DEC BUTTON_LEFT -#elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD +#elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ + || (CONFIG_KEYPAD == MROBE100_PAD) #define SCANRATE_DONE BUTTON_POWER #define SCANRATE_FASTINC BUTTON_UP #define SCANRATE_FASTDEC BUTTON_DOWN |