diff options
Diffstat (limited to 'demos/benchmarks')
| -rw-r--r-- | demos/benchmarks/gfxconf.h | 20 | ||||
| -rw-r--r-- | demos/benchmarks/main.c | 12 |
2 files changed, 16 insertions, 16 deletions
diff --git a/demos/benchmarks/gfxconf.h b/demos/benchmarks/gfxconf.h index aaacd3a2..3133e757 100644 --- a/demos/benchmarks/gfxconf.h +++ b/demos/benchmarks/gfxconf.h @@ -31,22 +31,22 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_CHIBIOS GFXOFF +//#define GFX_USE_OS_WIN32 GFXOFF +//#define GFX_USE_OS_LINUX GFXOFF +//#define GFX_USE_OS_OSX GFXOFF /* GFX sub-systems to turn on */ -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION FALSE -#define GDISP_NEED_CLIP FALSE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CONTROL TRUE +#define GDISP_NEED_VALIDATION GFXOFF +#define GDISP_NEED_CLIP GFXOFF +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CONTROL GFXON /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON #endif /* _GFXCONF_H */ diff --git a/demos/benchmarks/main.c b/demos/benchmarks/main.c index d8c02338..12d719ca 100644 --- a/demos/benchmarks/main.c +++ b/demos/benchmarks/main.c @@ -98,10 +98,10 @@ void benchmark(void) { height = gdispGetHeight();
font = gdispOpenFont("UI2 Double");
- gdispDrawStringBox(0, 0, width, 30, "ChibiOS/GFX - Benchmark", font, White, justifyCenter);
+ gdispDrawStringBox(0, 0, width, 30, "ChibiOS/GFX - Benchmark", font, GFX_WHITE, justifyCenter);
font = gdispOpenFont("UI2");
- gdispDrawStringBox(0, height/2, width, 30, "5000 random rectangles", font, White, justifyCenter);
+ gdispDrawStringBox(0, height/2, width, 30, "5000 random rectangles", font, GFX_WHITE, justifyCenter);
gfxSleepMilliseconds(3000);
@@ -130,10 +130,10 @@ void benchmark(void) { strcat(pps_str, " Pixels/s");
font = gdispOpenFont("UI2 Double");
- gdispClear(Black);
- gdispDrawStringBox(0, 0, width, 30, "ChibiOS/GFX - Benchmark", font, White, justifyCenter);
- gdispDrawStringBox(0, height/2, width, 30, pps_str, font, White, justifyCenter);
- //gdispDrawString(20, height/2, pps_str, font, White);
+ gdispClear(GFX_BLACK);
+ gdispDrawStringBox(0, 0, width, 30, "ChibiOS/GFX - Benchmark", font, GFX_WHITE, justifyCenter);
+ gdispDrawStringBox(0, height/2, width, 30, pps_str, font, GFX_WHITE, justifyCenter);
+ //gdispDrawString(20, height/2, pps_str, font, GFX_WHITE);
}
int main(void) {
|