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 /apps/plugins | |
parent | 9c32dde82c5018fe28abad84f62e449ca0d90958 (diff) | |
download | rockbox-1317ebb1a0f53d1a7c666da39f69ede260c5227b.tar.gz rockbox-1317ebb1a0f53d1a7c666da39f69ede260c5227b.zip |
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
Diffstat (limited to 'apps/plugins')
-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] = | |||
367 | LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(0, 255, 0), | 367 | LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(255, 0, 0), LCD_RGBPACK(0, 255, 0), |
368 | LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 0, 255), LCD_RGBPACK(0, 0, 255) | 368 | LCD_RGBPACK(0, 255, 0), LCD_RGBPACK(0, 0, 255), LCD_RGBPACK(0, 0, 255) |
369 | #elif defined(USE_GSLIB) | 369 | #elif defined(USE_GSLIB) |
370 | #ifdef MROBE_100 | ||
371 | GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, | ||
372 | GREY_DARKGRAY, GREY_WHITE, GREY_WHITE | ||
373 | #else | ||
370 | GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, | 374 | GREY_LIGHTGRAY, GREY_LIGHTGRAY, GREY_DARKGRAY, |
371 | GREY_DARKGRAY, GREY_BLACK, GREY_BLACK | 375 | GREY_DARKGRAY, GREY_BLACK, GREY_BLACK |
376 | #endif | ||
372 | #else | 377 | #else |
373 | LCD_LIGHTGRAY, LCD_LIGHTGRAY, LCD_DARKGRAY, | 378 | LCD_LIGHTGRAY, LCD_LIGHTGRAY, LCD_DARKGRAY, |
374 | LCD_DARKGRAY, LCD_BLACK, LCD_BLACK | 379 | LCD_DARKGRAY, LCD_BLACK, LCD_BLACK |
@@ -592,6 +597,10 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
592 | lcdfuncs.drawline = rb->lcd_drawline; | 597 | lcdfuncs.drawline = rb->lcd_drawline; |
593 | lcdfuncs.putsxy = rb->lcd_putsxy; | 598 | lcdfuncs.putsxy = rb->lcd_putsxy; |
594 | 599 | ||
600 | #ifdef MROBE_100 | ||
601 | grey_set_background(GREY_BLACK); | ||
602 | #endif | ||
603 | |||
595 | grey_setfont(FONT_SYSFIXED); | 604 | grey_setfont(FONT_SYSFIXED); |
596 | #endif | 605 | #endif |
597 | rb->lcd_setfont(FONT_SYSFIXED); | 606 | 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) | |||
255 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | 255 | #define DOOMBUTTON_SHOOT BUTTON_SELECT |
256 | #define DOOMBUTTON_ENTER BUTTON_MENU | 256 | #define DOOMBUTTON_ENTER BUTTON_MENU |
257 | #define DOOMBUTTON_WEAPON BUTTON_MINUS | 257 | #define DOOMBUTTON_WEAPON BUTTON_MINUS |
258 | #elif CONFIG_KEYPAD == MROBE100_PAD | ||
259 | #define DOOMBUTTON_UP BUTTON_UP | ||
260 | #define DOOMBUTTON_DOWN BUTTON_DOWN | ||
261 | #define DOOMBUTTON_LEFT BUTTON_LEFT | ||
262 | #define DOOMBUTTON_RIGHT BUTTON_RIGHT | ||
263 | #define DOOMBUTTON_SHOOT BUTTON_SELECT | ||
264 | #define DOOMBUTTON_OPEN BUTTON_PLAY | ||
265 | #define DOOMBUTTON_ESC BUTTON_POWER | ||
266 | #define DOOMBUTTON_ENTER BUTTON_MENU | ||
267 | #define DOOMBUTTON_WEAPON BUTTON_DISPLAY | ||
258 | #else | 268 | #else |
259 | #error Keymap not defined! | 269 | #error Keymap not defined! |
260 | #endif | 270 | #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) | |||
744 | rb->profile_thread(); | 744 | rb->profile_thread(); |
745 | #endif | 745 | #endif |
746 | 746 | ||
747 | #if LCD_DEPTH>1 | ||
747 | rb->lcd_set_backdrop(NULL); | 748 | rb->lcd_set_backdrop(NULL); |
749 | #endif | ||
748 | 750 | ||
749 | D_DoomMain (); | 751 | D_DoomMain (); |
750 | 752 | ||
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 | |||
54 | 54 | ||
55 | #define GREYSCALE_RC_OFF BUTTON_RC_STOP | 55 | #define GREYSCALE_RC_OFF BUTTON_RC_STOP |
56 | 56 | ||
57 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 57 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) || (CONFIG_KEYPAD == MROBE100_PAD) |
58 | #define GREYSCALE_SHIFT BUTTON_PLAY /* won't work, but define it anyway */ | 58 | #define GREYSCALE_SHIFT BUTTON_PLAY /* won't work, but define it anyway */ |
59 | #define GREYSCALE_UP BUTTON_UP | 59 | #define GREYSCALE_UP BUTTON_UP |
60 | #define GREYSCALE_DOWN BUTTON_DOWN | 60 | #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 | |||
31 | #define SCANRATE_INC BUTTON_RIGHT | 31 | #define SCANRATE_INC BUTTON_RIGHT |
32 | #define SCANRATE_DEC BUTTON_LEFT | 32 | #define SCANRATE_DEC BUTTON_LEFT |
33 | 33 | ||
34 | #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD | 34 | #elif (CONFIG_KEYPAD == IAUDIO_X5M5_PAD) \ |
35 | || (CONFIG_KEYPAD == MROBE100_PAD) | ||
35 | #define SCANRATE_DONE BUTTON_POWER | 36 | #define SCANRATE_DONE BUTTON_POWER |
36 | #define SCANRATE_FASTINC BUTTON_UP | 37 | #define SCANRATE_FASTINC BUTTON_UP |
37 | #define SCANRATE_FASTDEC BUTTON_DOWN | 38 | #define SCANRATE_FASTDEC BUTTON_DOWN |