diff options
Diffstat (limited to 'demos/modules/gadc')
| -rw-r--r-- | demos/modules/gadc/gfxconf.h | 28 | ||||
| -rw-r--r-- | demos/modules/gadc/main.c | 8 |
2 files changed, 18 insertions, 18 deletions
diff --git a/demos/modules/gadc/gfxconf.h b/demos/modules/gadc/gfxconf.h index d0da3943..84c8b9d4 100644 --- a/demos/modules/gadc/gfxconf.h +++ b/demos/modules/gadc/gfxconf.h @@ -36,27 +36,27 @@ #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_GTIMER TRUE -#define GFX_USE_GADC TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GADC 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 /* GDISP - 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 #endif /* _GFXCONF_H */ diff --git a/demos/modules/gadc/main.c b/demos/modules/gadc/main.c index ae508278..ee54a118 100644 --- a/demos/modules/gadc/main.c +++ b/demos/modules/gadc/main.c @@ -160,8 +160,8 @@ int main(void) { wi.height = sheight; ghText = gwinConsoleCreate(&gTextWindow, &wi); } - gwinSetBgColor(ghText, Black); - gwinSetColor(ghText, Yellow); + gwinSetBgColor(ghText, GFX_BLACK); + gwinSetColor(ghText, GFX_YELLOW); gwinClear(ghText); /* Start our timer for reading the dial */ @@ -195,8 +195,8 @@ int main(void) { wi.height = SCOPE_CY; ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_MIC_DEVICE, MY_MIC_FREQUENCY); } - gwinSetBgColor(ghScope, White); - gwinSetColor(ghScope, Red); + gwinSetBgColor(ghScope, GFX_WHITE); + gwinSetColor(ghScope, GFX_RED); gwinClear(ghScope); /* Just keep displaying the scope traces */ |