diff options
Diffstat (limited to 'demos/tools/touch_driver_test')
| -rw-r--r-- | demos/tools/touch_driver_test/gfxconf.h | 34 | ||||
| -rw-r--r-- | demos/tools/touch_driver_test/main.c | 28 |
2 files changed, 31 insertions, 31 deletions
diff --git a/demos/tools/touch_driver_test/gfxconf.h b/demos/tools/touch_driver_test/gfxconf.h index 3d93a138..dd278222 100644 --- a/demos/tools/touch_driver_test/gfxconf.h +++ b/demos/tools/touch_driver_test/gfxconf.h @@ -31,32 +31,32 @@ #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_GWIN TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GINPUT GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN sub-system. */ -#define GWIN_NEED_CONSOLE TRUE +#define GWIN_NEED_CONSOLE GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE -#define GINPUT_TOUCH_STARTRAW TRUE +#define GINPUT_NEED_MOUSE GFXON +#define GINPUT_TOUCH_STARTRAW GFXON #endif /* _GFXCONF_H */ diff --git a/demos/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index 39924032..5182056a 100644 --- a/demos/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c @@ -46,19 +46,19 @@ static void DrawHeader(const char *title, bool_t btnNext, bool_t btnPrev, bool_t #if GDISP_NEED_CLIP gdispSetClip(0, 0, swidth, sheight); #endif - gdispFillStringBox(0, 0, swidth, bHeight, "Touch Calibration", font, Red, White, justifyLeft); + gdispFillStringBox(0, 0, swidth, bHeight, "Touch Calibration", font, GFX_RED, GFX_WHITE, justifyLeft); if (btnNext) - gdispFillStringBox(swidth-1*bWidth, 0, bWidth , bHeight, "Next", font, Black, Gray, justifyCenter); + gdispFillStringBox(swidth-1*bWidth, 0, bWidth , bHeight, "Next", font, GFX_BLACK, GFX_GRAY, justifyCenter); if (btnPrev) - gdispFillStringBox(swidth-2*bWidth, 0, bWidth-1, bHeight, "Prev", font, Black, Gray, justifyCenter); + gdispFillStringBox(swidth-2*bWidth, 0, bWidth-1, bHeight, "Prev", font, GFX_BLACK, GFX_GRAY, justifyCenter); if (btnPlusMinus) { - gdispFillStringBox(swidth-2*bWidth-1*bWidth2, 0, bWidth2-1, bHeight, "+", font, Black, Gray, justifyCenter); - gdispFillStringBox(swidth-2*bWidth-2*bWidth2, 0, bWidth2-1, bHeight, "-", font, Black, Gray, justifyCenter); + gdispFillStringBox(swidth-2*bWidth-1*bWidth2, 0, bWidth2-1, bHeight, "+", font, GFX_BLACK, GFX_GRAY, justifyCenter); + gdispFillStringBox(swidth-2*bWidth-2*bWidth2, 0, bWidth2-1, bHeight, "-", font, GFX_BLACK, GFX_GRAY, justifyCenter); } gwinClear(ghc); - gwinSetColor(ghc, Yellow); + gwinSetColor(ghc, GFX_YELLOW); gwinPrintf(ghc, "\n%s\n\n", title); - gwinSetColor(ghc, White); + gwinSetColor(ghc, GFX_WHITE); } #define BTN_NONE 0 @@ -385,10 +385,10 @@ StepMovementJitter: StepClickJitter: gwinClear(ghc); - gwinSetColor(ghc, Yellow); + gwinSetColor(ghc, GFX_YELLOW); gwinPrintf(ghc, "\n6. Click Jitter\n\n"); - gwinSetColor(ghc, White); + gwinSetColor(ghc, GFX_WHITE); if (isTouch) gwinPrintf(ghc, "Press and release the touch surface to \"click\".\nTry both short and long presses.\n"); else @@ -416,11 +416,11 @@ StepClickJitter: continue; default: if ((pem->buttons & GMETA_MOUSE_CLICK)) { - gwinSetColor(ghc, Yellow); + gwinSetColor(ghc, GFX_YELLOW); gwinPrintf(ghc, "-"); } if ((pem->buttons & GMETA_MOUSE_CXTCLICK)) { - gwinSetColor(ghc, Red); + gwinSetColor(ghc, GFX_RED); gwinPrintf(ghc, "x"); } continue; @@ -434,10 +434,10 @@ StepClickJitter: StepDrawing: gwinClear(ghc); - gwinSetColor(ghc, Yellow); + gwinSetColor(ghc, GFX_YELLOW); gwinPrintf(ghc, "\n7. Drawing\n\n"); - gwinSetColor(ghc, White); + gwinSetColor(ghc, GFX_WHITE); gwinPrintf(ghc, "Press firmly on the surface (or press and hold the mouse button) and move around as if to draw.\n\n"); gwinPrintf(ghc, "A green line will follow your %s.\n\n", deviceText); gwinPrintf(ghc, "Pressing Next will start the tests again but with the option of changing pen/finger mode.\n\n"); @@ -452,7 +452,7 @@ StepDrawing: goto StepClickJitter; } } - gdispDrawPixel(pem->x, pem->y, Green); + gdispDrawPixel(pem->x, pem->y, GFX_GREEN); } // Can't let this really exit |