diff options
Diffstat (limited to 'demos')
116 files changed, 1367 insertions, 1368 deletions
diff --git a/demos/3rdparty/bubbles/gfxconf.h b/demos/3rdparty/bubbles/gfxconf.h index b4fd0a9c..a6f046d2 100644 --- a/demos/3rdparty/bubbles/gfxconf.h +++ b/demos/3rdparty/bubbles/gfxconf.h @@ -10,33 +10,33 @@ #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 FALSE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_MULTITHREAD FALSE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE +#define GDISP_NEED_VALIDATION GFXOFF +#define GDISP_NEED_CLIP GFXOFF +#define GDISP_NEED_TEXT GFXOFF +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXOFF +#define GDISP_NEED_ARC GFXOFF +#define GDISP_NEED_SCROLL GFXOFF +#define GDISP_NEED_PIXELREAD GFXOFF +#define GDISP_NEED_CONTROL GFXOFF +#define GDISP_NEED_MULTITHREAD GFXOFF +#define GDISP_NEED_ASYNC GFXOFF +#define GDISP_NEED_MSGAPI GFXOFF /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_SMALL FALSE -#define GDISP_INCLUDE_FONT_LARGER FALSE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 FALSE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE +#define GDISP_INCLUDE_FONT_SMALL GFXOFF +#define GDISP_INCLUDE_FONT_LARGER GFXOFF +#define GDISP_INCLUDE_FONT_UI1 GFXOFF +#define GDISP_INCLUDE_FONT_UI2 GFXOFF +#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/3rdparty/notepad-2/gfxconf.h b/demos/3rdparty/notepad-2/gfxconf.h index 869b2ab2..7bbace41 100644 --- a/demos/3rdparty/notepad-2/gfxconf.h +++ b/demos/3rdparty/notepad-2/gfxconf.h @@ -10,55 +10,55 @@ #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_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_CONVEX_POLYGON FALSE -#define GDISP_NEED_SCROLL FALSE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_IMAGE TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXOFF +#define GDISP_NEED_ARC GFXOFF +#define GDISP_NEED_CONVEX_POLYGON GFXOFF +#define GDISP_NEED_SCROLL GFXOFF +#define GDISP_NEED_PIXELREAD GFXOFF +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_IMAGE GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_ASYNC GFXOFF +#define GDISP_NEED_MSGAPI GFXOFF /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_SMALL FALSE -#define GDISP_INCLUDE_FONT_LARGER FALSE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE +#define GDISP_INCLUDE_FONT_SMALL GFXOFF +#define GDISP_INCLUDE_FONT_LARGER GFXOFF +#define GDISP_INCLUDE_FONT_UI1 GFXOFF +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF /* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE -#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE +#define GDISP_NEED_IMAGE_NATIVE GFXOFF +#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXOFF +#define GDISP_NEED_IMAGE_JPG GFXOFF +#define GDISP_NEED_IMAGE_PNG GFXOFF /* Features for the GWIN sub-system. */ -#define GWIN_NEED_BUTTON TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_NEED_SLIDER TRUE +#define GWIN_NEED_BUTTON GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_NEED_SLIDER GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE -#define GINPUT_NEED_DIAL FALSE +#define GINPUT_NEED_MOUSE GFXON +#define GINPUT_NEED_DIAL GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/3rdparty/notepad-2/main.c b/demos/3rdparty/notepad-2/main.c index e4649146..05481b18 100644 --- a/demos/3rdparty/notepad-2/main.c +++ b/demos/3rdparty/notepad-2/main.c @@ -38,7 +38,7 @@ const NColorScheme schemeDefault = { .titleBarColor = HTML2COLOR(0x3064D8), - .titleTextColor = White, + .titleTextColor = GFX_WHITE, .winBgColor = HTML2COLOR(0xFFECB0), .drawingWinBorder = HTML2COLOR(0xCEBA77), @@ -53,7 +53,7 @@ const NColorScheme schemeDefault = { const NColorScheme schemeDefault2 = { .titleBarColor = HTML2COLOR(0x3064D8), - .titleTextColor = White, + .titleTextColor = GFX_WHITE, .winBgColor = HTML2COLOR(0xC8D8F8), .drawingWinBorder = HTML2COLOR(0x8098E0), @@ -91,9 +91,9 @@ int main(void) { gfxThreadWait(nLaunchNotepadApp()); gdispSetClip(0, 0, gdispGetWidth(), gdispGetHeight()); - gdispClear(Black); - gdispDrawString(3, 3, "Notepad Terminated.", font, White); - gdispDrawString(3, 20, "Relaunching Notepad App...", font, White); + gdispClear(GFX_BLACK); + gdispDrawString(3, 3, "Notepad Terminated.", font, GFX_WHITE); + gdispDrawString(3, 20, "Relaunching Notepad App...", font, GFX_WHITE); gfxSleepMilliseconds(1000); } diff --git a/demos/3rdparty/notepad-2/notepadApp.c b/demos/3rdparty/notepad-2/notepadApp.c index 83186d38..9f61aaa4 100644 --- a/demos/3rdparty/notepad-2/notepadApp.c +++ b/demos/3rdparty/notepad-2/notepadApp.c @@ -63,9 +63,9 @@ static GButtonObject btnClose; // Image object static gdispImage toolbarImageFilmstrip; -static color_t myColors[] = { Black, Red, Green, Blue, Cyan, Magenta, Yellow, White }; +static color_t myColors[] = { GFX_BLACK, GFX_RED, GFX_GREEN, GFX_BLUE, GFX_CYAN, GFX_MAGENTA, GFX_YELLOW, GFX_WHITE }; -static color_t selColor = Black; +static color_t selColor = GFX_BLACK; static int selColorIndex = 0, selPenWidth = 1, tbMode = 1; static NColorScheme nCurColorScheme; @@ -383,13 +383,13 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) { 0); gwinSetBgColor(ghc, nCurColorScheme.winBgColor); - gwinSetColor(ghc, Black); + gwinSetColor(ghc, GFX_BLACK); gstatusConsole = ghc; /* draw the buttons */ - gwinSetColor(nDrawingArea, Black); - gwinSetBgColor(nDrawingArea, White); + gwinSetColor(nDrawingArea, GFX_BLACK); + gwinSetBgColor(nDrawingArea, GFX_WHITE); gwinClear(nDrawingArea); gwinClear(ghc); @@ -414,8 +414,8 @@ static DECLARE_THREAD_FUNCTION(notepadThread, param) { selPenWidth = 0; ncoreSetMode(NCORE_MODE_DRAW); - gwinSetColor(nDrawingArea, Black); - gwinSetBgColor(nDrawingArea, White); + gwinSetColor(nDrawingArea, GFX_BLACK); + gwinSetBgColor(nDrawingArea, GFX_WHITE); // Refresh the buttons drawButtons(); diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c index f0b78266..c669eff2 100644 --- a/demos/applications/combo/bounce.c +++ b/demos/applications/combo/bounce.c @@ -48,15 +48,15 @@ static gfxThreadHandle thread; * your processor. * * You can modify the implementation of invsqrt() by firstly defining - * #define GMISC_INVSQRT_MIXED_ENDIAN TRUE + * #define GMISC_INVSQRT_MIXED_ENDIAN GFXON * in your gfxconf.h file. * * If it still doesn't work then instead define - * #define GMISC_INVSQRT_REAL_SLOW TRUE + * #define GMISC_INVSQRT_REAL_SLOW GFXON * in your gfxconf.h file. This should always work although it will probably be slow. */ -#define BALLCOLOR1 Red -#define BALLCOLOR2 Yellow +#define BALLCOLOR1 GFX_RED +#define BALLCOLOR2 GFX_YELLOW #define WALLCOLOR HTML2COLOR(0x303030) #define BACKCOLOR HTML2COLOR(0xC0C0C0) #define FLOORCOLOR HTML2COLOR(0x606060) @@ -117,7 +117,7 @@ static DECLARE_THREAD_FUNCTION(task, param) { // The ball shadow is darker if (g*(g+.4)+h*(h+.1) < 1) - colour = gdispBlendColor(colour, Black, SHADOWALPHA); + colour = gdispBlendColor(colour, GFX_BLACK, SHADOWALPHA); } gdispStreamColor(colour); /* pixel to the LCD */ } diff --git a/demos/applications/combo/gfxconf.h b/demos/applications/combo/gfxconf.h index aec48783..cf218206 100644 --- a/demos/applications/combo/gfxconf.h +++ b/demos/applications/combo/gfxconf.h @@ -19,109 +19,109 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_CONVEX_POLYGON TRUE -//#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_STREAMING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_CONVEX_POLYGON GFXON +//#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_STREAMING GFXON -#define GDISP_NEED_IMAGE TRUE - #define GDISP_NEED_IMAGE_BMP TRUE - #define GDISP_NEED_IMAGE_GIF TRUE +#define GDISP_NEED_IMAGE GFXON + #define GDISP_NEED_IMAGE_BMP GFXON + #define GDISP_NEED_IMAGE_GIF GFXON #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE - #define GWIN_NEED_FLASHING TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON + #define GWIN_NEED_FLASHING GFXON -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE -#define GWIN_NEED_GRAPH TRUE +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON +#define GWIN_NEED_GRAPH GFXON -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_LABEL TRUE - #define GWIN_LABEL_ATTRIBUTE TRUE - #define GWIN_NEED_BUTTON TRUE -// #define GWIN_BUTTON_LAZY_RELEASE TRUE - #define GWIN_NEED_SLIDER TRUE - #define GWIN_NEED_CHECKBOX TRUE - #define GWIN_NEED_IMAGE TRUE - #define GWIN_NEED_RADIO TRUE - #define GWIN_NEED_LIST TRUE - #define GWIN_NEED_LIST_IMAGES TRUE - #define GWIN_NEED_PROGRESSBAR TRUE - #define GWIN_PROGRESSBAR_AUTO TRUE +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_LABEL GFXON + #define GWIN_LABEL_ATTRIBUTE GFXON + #define GWIN_NEED_BUTTON GFXON +// #define GWIN_BUTTON_LAZY_RELEASE GFXON + #define GWIN_NEED_SLIDER GFXON + #define GWIN_NEED_CHECKBOX GFXON + #define GWIN_NEED_IMAGE GFXON + #define GWIN_NEED_RADIO GFXON + #define GWIN_NEED_LIST GFXON + #define GWIN_NEED_LIST_IMAGES GFXON + #define GWIN_NEED_PROGRESSBAR GFXON + #define GWIN_PROGRESSBAR_AUTO GFXON -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON -#define GWIN_NEED_TABSET TRUE +#define GWIN_NEED_TABSET GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE -//#define GINPUT_NEED_TOGGLE TRUE -//#define GINPUT_NEED_DIAL TRUE +#define GINPUT_NEED_MOUSE GFXON +//#define GINPUT_NEED_TOGGLE GFXON +//#define GINPUT_NEED_DIAL GFXON /////////////////////////////////////////////////////////////////////////// // GFILE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GFILE TRUE +#define GFX_USE_GFILE GFXON -#define GFILE_NEED_PRINTG TRUE -#define GFILE_NEED_STRINGS TRUE +#define GFILE_NEED_PRINTG GFXON +#define GFILE_NEED_STRINGS GFXON -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON /////////////////////////////////////////////////////////////////////////// // GMISC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GMISC TRUE -#define GMISC_NEED_INVSQRT TRUE +#define GFX_USE_GMISC GFXON +#define GMISC_NEED_INVSQRT GFXON #endif /* _GFXCONF_H */ diff --git a/demos/applications/combo/main.c b/demos/applications/combo/main.c index 449572d9..4585a74e 100644 --- a/demos/applications/combo/main.c +++ b/demos/applications/combo/main.c @@ -41,7 +41,7 @@ /* Our custom yellow style */ static const GWidgetStyle YellowWidgetStyle = { - Yellow, // window background + GFX_YELLOW, // window background HTML2COLOR(0x800000), // focus - for text edit. // enabled color set @@ -168,7 +168,7 @@ static void createWidgets(void) { wi.g.x = pagewidth; wi.g.width = pagewidth; ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_BLACK); gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0)); // Buttons @@ -405,7 +405,7 @@ int main(void) { font = gdispOpenFont("*"); // Get the first defined font. gwinSetDefaultFont(font); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the gwin windows/widgets createWidgets(); diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h index 99a04b5c..17c45142 100644 --- a/demos/applications/mandelbrot/gfxconf.h +++ b/demos/applications/mandelbrot/gfxconf.h @@ -31,15 +31,15 @@ #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 TRUE
+#define GDISP_NEED_VALIDATION GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h index b3920119..9110d6e8 100644 --- a/demos/applications/notepad/gfxconf.h +++ b/demos/applications/notepad/gfxconf.h @@ -31,30 +31,30 @@ #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_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP 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_CIRCLE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA TRUE
-#define GDISP_NEED_ANTIALIAS TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXON
+#define GDISP_NEED_ANTIALIAS GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c index 16120edd..de24f227 100644 --- a/demos/applications/notepad/main.c +++ b/demos/applications/notepad/main.c @@ -49,23 +49,23 @@ void drawScreen(void) { font1 = gdispOpenFont("DejaVuSans24*");
font2 = gdispOpenFont("DejaVuSans12*");
- gdispClear(White);
- gdispDrawString(gdispGetWidth()-gdispGetStringWidth(msg, font1)-3, 3, msg, font1, Black);
+ gdispClear(GFX_WHITE);
+ gdispDrawString(gdispGetWidth()-gdispGetStringWidth(msg, font1)-3, 3, msg, font1, GFX_BLACK);
/* colors */
- gdispFillArea(0 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Black); /* Black */
- gdispFillArea(1 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Red); /* Red */
- gdispFillArea(2 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Yellow); /* Yellow */
- gdispFillArea(3 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Green); /* Green */
- gdispFillArea(4 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Blue); /* Blue */
- gdispDrawBox (5 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, Black); /* White */
+ gdispFillArea(0 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_BLACK); /* Black */
+ gdispFillArea(1 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_RED); /* Red */
+ gdispFillArea(2 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_YELLOW); /* Yellow */
+ gdispFillArea(3 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_GREEN); /* Green */
+ gdispFillArea(4 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_BLUE); /* Blue */
+ gdispDrawBox (5 * COLOR_SIZE + 3, 3, COLOR_SIZE, COLOR_SIZE, GFX_WHITE); /* White */
/* pens */
- gdispFillStringBox(OFFSET * 2, DRAW_PEN(1), PEN_SIZE, PEN_SIZE, "1", font2, White, Black, justifyCenter);
- gdispFillStringBox(OFFSET * 2, DRAW_PEN(2), PEN_SIZE, PEN_SIZE, "2", font2, White, Black, justifyCenter);
- gdispFillStringBox(OFFSET * 2, DRAW_PEN(3), PEN_SIZE, PEN_SIZE, "3", font2, White, Black, justifyCenter);
- gdispFillStringBox(OFFSET * 2, DRAW_PEN(4), PEN_SIZE, PEN_SIZE, "4", font2, White, Black, justifyCenter);
- gdispFillStringBox(OFFSET * 2, DRAW_PEN(5), PEN_SIZE, PEN_SIZE, "5", font2, White, Black, justifyCenter);
+ gdispFillStringBox(OFFSET * 2, DRAW_PEN(1), PEN_SIZE, PEN_SIZE, "1", font2, GFX_WHITE, GFX_BLACK, justifyCenter);
+ gdispFillStringBox(OFFSET * 2, DRAW_PEN(2), PEN_SIZE, PEN_SIZE, "2", font2, GFX_WHITE, GFX_BLACK, justifyCenter);
+ gdispFillStringBox(OFFSET * 2, DRAW_PEN(3), PEN_SIZE, PEN_SIZE, "3", font2, GFX_WHITE, GFX_BLACK, justifyCenter);
+ gdispFillStringBox(OFFSET * 2, DRAW_PEN(4), PEN_SIZE, PEN_SIZE, "4", font2, GFX_WHITE, GFX_BLACK, justifyCenter);
+ gdispFillStringBox(OFFSET * 2, DRAW_PEN(5), PEN_SIZE, PEN_SIZE, "5", font2, GFX_WHITE, GFX_BLACK, justifyCenter);
gdispCloseFont(font1);
gdispCloseFont(font2);
@@ -74,7 +74,7 @@ void drawScreen(void) { GEventMouse ev;
int main(void) {
- color_t color = Black;
+ color_t color = GFX_BLACK;
uint16_t pen = 0;
gfxInit();
@@ -89,12 +89,12 @@ int main(void) { /* inside color box ? */
if(ev.y >= OFFSET && ev.y <= COLOR_SIZE) {
- if(GET_COLOR(0)) color = Black;
- else if(GET_COLOR(1)) color = Red;
- else if(GET_COLOR(2)) color = Yellow;
- else if(GET_COLOR(3)) color = Green;
- else if(GET_COLOR(4)) color = Blue;
- else if(GET_COLOR(5)) color = White;
+ if(GET_COLOR(0)) color = GFX_BLACK;
+ else if(GET_COLOR(1)) color = GFX_RED;
+ else if(GET_COLOR(2)) color = GFX_YELLOW;
+ else if(GET_COLOR(3)) color = GFX_GREEN;
+ else if(GET_COLOR(4)) color = GFX_BLUE;
+ else if(GET_COLOR(5)) color = GFX_WHITE;
/* inside pen box ? */
} else if(ev.x >= OFFSET && ev.x <= PEN_SIZE) {
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) {
diff --git a/demos/games/justget10/demo.mk b/demos/games/justget10/demo.mk index 1487808b..9e58121c 100644 --- a/demos/games/justget10/demo.mk +++ b/demos/games/justget10/demo.mk @@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \ GFXSRC += $(DEMODIR)/main.c \ $(DEMODIR)/jg10.c -DEFS += -DJG10_SHOW_SPLASH=TRUE +DEFS += -DJG10_SHOW_SPLASH=GFXON diff --git a/demos/games/justget10/gfxconf.h b/demos/games/justget10/gfxconf.h index 9cfb3859..834b4a9d 100644 --- a/demos/games/justget10/gfxconf.h +++ b/demos/games/justget10/gfxconf.h @@ -31,65 +31,65 @@ #define _GFXCONF_H /* GFX sub-systems to turn on */ -#define GFX_USE_GDISP TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GINPUT GFXON -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON #define GFILE_MAX_GFILES 24 /* Features for the GDISP sub-system. */ -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_IMAGE TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ARC TRUE -#define GDISP_NEED_STARTUP_LOGO FALSE +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_IMAGE GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXON +#define GDISP_NEED_ARC GFXON +#define GDISP_NEED_STARTUP_LOGO GFXOFF ////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GQUEUE_NEED_ASYNC TRUE -#define GFX_USE_GQUEUE TRUE -#define GWIN_REDRAW_IMMEDIATE TRUE -#define GWIN_REDRAW_SINGLEOP TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GQUEUE_NEED_ASYNC GFXON +#define GFX_USE_GQUEUE GFXON +#define GWIN_REDRAW_IMMEDIATE GFXON +#define GWIN_REDRAW_SINGLEOP GFXON -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_BUTTON TRUE -#define GWIN_BUTTON_LAZY_RELEASE FALSE -#define GWIN_NEED_SLIDER TRUE -#define GWIN_FLAT_STYLING FALSE +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_BUTTON GFXON +#define GWIN_BUTTON_LAZY_RELEASE GFXOFF +#define GWIN_NEED_SLIDER GFXON +#define GWIN_FLAT_STYLING GFXOFF -#define GWIN_NEED_CONTAINERS TRUE -#define GWIN_NEED_CONTAINER TRUE -#define GWIN_NEED_FRAME FALSE -#define GWIN_NEED_TABSET FALSE +#define GWIN_NEED_CONTAINERS GFXON +#define GWIN_NEED_CONTAINER GFXON +#define GWIN_NEED_FRAME GFXOFF +#define GWIN_NEED_TABSET GFXOFF -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE - #define GWIN_CONSOLE_ESCSEQ TRUE - #define GWIN_CONSOLE_USE_BASESTREAM TRUE -#define GWIN_NEED_GRAPH TRUE +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON + #define GWIN_CONSOLE_ESCSEQ GFXON + #define GWIN_CONSOLE_USE_BASESTREAM GFXON +#define GWIN_NEED_GRAPH GFXON /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/games/justget10/jg10.c b/demos/games/justget10/jg10.c index 6ea4e951..f9974fe1 100644 --- a/demos/games/justget10/jg10.c +++ b/demos/games/justget10/jg10.c @@ -209,18 +209,18 @@ static bool_t checkForPossibleMove(void) { } static void printGameOver(void) { - gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, Black); + gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, GFX_BLACK); if (jg10GameOver) { - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Game Over", font)/2), gdispGetHeight()/2, "Game Over", font, White); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Game Over", font)/2), gdispGetHeight()/2, "Game Over", font, GFX_WHITE); } } static void printCongrats(void) { char pps_str[3]; - gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, Black); - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Congrats, now try to get", font)/2), gdispGetHeight()/2, "Congrats, now try to get", font, White); + gdispFillArea(JG10_TOTAL_FIELD_WIDTH, (gdispGetHeight()/2)-10, gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH, 80, GFX_BLACK); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth("Congrats, now try to get", font)/2), gdispGetHeight()/2, "Congrats, now try to get", font, GFX_WHITE); uitoa(jg10MaxVal+1, pps_str, sizeof(pps_str)); - gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth(pps_str, font)/2), (gdispGetHeight()/2)+20, pps_str, font, Red); + gdispDrawString(JG10_TOTAL_FIELD_WIDTH+((gdispGetWidth()-JG10_TOTAL_FIELD_WIDTH)/2)-(gdispGetStringWidth(pps_str, font)/2), (gdispGetHeight()/2)+20, pps_str, font, GFX_RED); } static DECLARE_THREAD_FUNCTION(thdJg10, msg) { @@ -456,7 +456,7 @@ void guiCreate(void) { void jg10Start(void) { #if JG10_SHOW_SPLASH gtimerStop(&jg10SplashBlink); - gdispClear(Black); + gdispClear(GFX_BLACK); #endif initField(); guiCreate(); diff --git a/demos/games/justget10/jg10.h b/demos/games/justget10/jg10.h index 58e76570..7ee5ea37 100644 --- a/demos/games/justget10/jg10.h +++ b/demos/games/justget10/jg10.h @@ -7,7 +7,7 @@ #define JG10_FIELD_HEIGHT 5 #define JG10_TOTAL_FIELD_WIDTH (JG10_FIELD_WIDTH*JG10_CELL_WIDTH) #define JG10_TOTAL_FIELD_HEIGHT (JG10_FIELD_HEIGHT*JG10_CELL_HEIGHT) -#define JG10_SEL_COLOR Yellow +#define JG10_SEL_COLOR GFX_YELLOW #define JG10_MAX_COUNT 21 // Max number you can get +1, so if max number would be 20, then this number should be 21 (+ background) void jg10Init(void); diff --git a/demos/games/justget10/main.c b/demos/games/justget10/main.c index 11ee13c7..29749686 100644 --- a/demos/games/justget10/main.c +++ b/demos/games/justget10/main.c @@ -17,7 +17,7 @@ int main(void) jg10ShowSplash(); #else font = gdispOpenFont("DejaVuSans16_aa"); - gdispDrawString((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, "Touch to start!", font, White); + gdispDrawString((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, "Touch to start!", font, GFX_WHITE); gdispCloseFont(font); #endif @@ -30,7 +30,7 @@ int main(void) #if !JG10_SHOW_SPLASH font = gdispOpenFont("DejaVuSans16"); - gdispFillArea((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, gdispGetWidth()/2, 17, Black); + gdispFillArea((gdispGetWidth()/2)-(gdispGetStringWidth("Touch to start!", font)/2), gdispGetHeight()/2, gdispGetWidth()/2, 17, GFX_BLACK); gdispCloseFont(font); #endif diff --git a/demos/games/minesweeper/demo.mk b/demos/games/minesweeper/demo.mk index 43869d7e..41b18106 100644 --- a/demos/games/minesweeper/demo.mk +++ b/demos/games/minesweeper/demo.mk @@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \ GFXSRC += $(DEMODIR)/main.c \ $(DEMODIR)/mines.c -DEFS += -DMINES_SHOW_SPLASH=TRUE +DEFS += -DMINES_SHOW_SPLASH=GFXON diff --git a/demos/games/minesweeper/gfxconf.h b/demos/games/minesweeper/gfxconf.h index 468b32e2..c0961839 100644 --- a/demos/games/minesweeper/gfxconf.h +++ b/demos/games/minesweeper/gfxconf.h @@ -31,35 +31,34 @@ #define _GFXCONF_H /* 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 -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_IMAGE TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ARC TRUE -#define GDISP_NEED_STARTUP_LOGO FALSE +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_IMAGE GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXON +#define GDISP_NEED_ARC GFXON /* Builtin Fonts */ -#define GDISP_INCLUDE_USER_FONTS TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE -#define GDISP_INCLUDE_FONT_FIXED_10X20 TRUE -#define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE +#define GDISP_INCLUDE_USER_FONTS GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON +#define GDISP_INCLUDE_FONT_FIXED_10X20 GFXON +#define GDISP_INCLUDE_FONT_FIXED_5X8 GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/games/minesweeper/main.c b/demos/games/minesweeper/main.c index 84943922..e7a105bf 100644 --- a/demos/games/minesweeper/main.c +++ b/demos/games/minesweeper/main.c @@ -51,7 +51,7 @@ int main(void) minesShowSplash(); #else font = gdispOpenFont("DejaVuSans16"); - gdispDrawString((gdispGetWidth()-gdispGetStringWidth("Touch to start!", font))/2, gdispGetHeight()-25, "Touch to start!", font, White); + gdispDrawString((gdispGetWidth()-gdispGetStringWidth("Touch to start!", font))/2, gdispGetHeight()-25, "Touch to start!", font, GFX_WHITE); gdispCloseFont(font); #endif diff --git a/demos/games/minesweeper/mines.c b/demos/games/minesweeper/mines.c index 55d70984..8b0cd292 100644 --- a/demos/games/minesweeper/mines.c +++ b/demos/games/minesweeper/mines.c @@ -95,11 +95,11 @@ static void printStats(void) font_t font = gdispOpenFont("fixed_5x8"); uitoa(MINES_MINE_COUNT, pps_str, sizeof(pps_str)); - gdispFillString(minesStatusIconWidth+8, gdispGetHeight()-11, " ", font, Black, Black); - gdispDrawString(minesStatusIconWidth+8, gdispGetHeight()-11, pps_str, font, White); + gdispFillString(minesStatusIconWidth+8, gdispGetHeight()-11, " ", font, GFX_BLACK, GFX_BLACK); + gdispDrawString(minesStatusIconWidth+8, gdispGetHeight()-11, pps_str, font, GFX_WHITE); uitoa(minesFlags, pps_str, sizeof(pps_str)); - gdispFillString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, " ", font, Black, Black); - gdispDrawString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, pps_str, font, White); + gdispFillString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, " ", font, GFX_BLACK, GFX_BLACK); + gdispDrawString(8+(minesStatusIconWidth*2)+gdispGetStringWidth("99999", font), gdispGetHeight()-11, pps_str, font, GFX_WHITE); gdispCloseFont(font); } @@ -112,8 +112,8 @@ static void minesUpdateTime(void) font_t font = gdispOpenFont("digital_7__mono_20"); uitoa(minesTime, pps_str, sizeof(pps_str)); - gdispFillArea((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth("9999", font), gdispGetHeight()-15, gdispGetWidth(), 15, Black); - gdispDrawString((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth(pps_str, font), gdispGetHeight()-15, pps_str, font, Lime); + gdispFillArea((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth("9999", font), gdispGetHeight()-15, gdispGetWidth(), 15, GFX_BLACK); + gdispDrawString((MINES_FIELD_WIDTH*MINES_CELL_WIDTH)-gdispGetStringWidth(pps_str, font), gdispGetHeight()-15, pps_str, font, GFX_LIME); gdispCloseFont(font); } @@ -141,7 +141,7 @@ static void showOne(int16_t x, int16_t y) minesFlags--; } - gdispFillArea((x*MINES_CELL_WIDTH)+1, (y*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH-1, MINES_CELL_HEIGHT-1, Black); + gdispFillArea((x*MINES_CELL_WIDTH)+1, (y*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH-1, MINES_CELL_HEIGHT-1, GFX_BLACK); if ((minesField[x][y].num > 0) && (minesField[x][y].num < 9)) { gdispImageOpenFile(&minesImage, minesGraph[minesField[x][y].num-1]); @@ -253,13 +253,13 @@ static void printGameOver(void) if (minesGameOver) { font_t font = gdispOpenFont("DejaVuSans16"); if (minesGameWinner) { - gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You LIVE!", font))/2, gdispGetHeight()-15, "You LIVE!", font, White); + gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You LIVE!", font))/2, gdispGetHeight()-15, "You LIVE!", font, GFX_WHITE); } else { - gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You DIED!", font))/2, gdispGetHeight()-15, "You DIED!", font, White); + gdispDrawString((gdispGetWidth()-gdispGetStringWidth("You DIED!", font))/2, gdispGetHeight()-15, "You DIED!", font, GFX_WHITE); } gdispCloseFont(font); } else { - gdispFillArea(0, gdispGetHeight()-25, gdispGetWidth(), 25, Black); + gdispFillArea(0, gdispGetHeight()-25, gdispGetWidth(), 25, GFX_BLACK); } } @@ -317,7 +317,7 @@ static void initField(void) for (y = 0; y < MINES_FIELD_HEIGHT; y++) { i = minesField[x][y].fieldNum/MINES_FIELD_HEIGHT; j = minesField[x][y].fieldNum-(i*MINES_FIELD_HEIGHT); - gdispFillArea((i*MINES_CELL_WIDTH)+1, (j*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH, MINES_CELL_HEIGHT, Black); + gdispFillArea((i*MINES_CELL_WIDTH)+1, (j*MINES_CELL_HEIGHT)+1, MINES_CELL_WIDTH, MINES_CELL_HEIGHT, GFX_BLACK); gfxSleepMilliseconds(2); } } @@ -378,7 +378,7 @@ void minesStart(void) #if MINES_SHOW_SPLASH gtimerStop(&minesSplashBlink); - gdispClear(Black); + gdispClear(GFX_BLACK); #endif initField(); @@ -442,5 +442,5 @@ void minesInit(void) { initRng(); - gdispClear(Black); + gdispClear(GFX_BLACK); } diff --git a/demos/games/minesweeper/readme.txt b/demos/games/minesweeper/readme.txt index e820fe63..f207da09 100644 --- a/demos/games/minesweeper/readme.txt +++ b/demos/games/minesweeper/readme.txt @@ -1,6 +1,6 @@ A demo Minesweeper game using. Various configuration options can be found in mines.h -NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to FALSE. +NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to GFXOFF. Credits: Code: Fleck diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile index b1f8a710..9fa2eca9 100644 --- a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile +++ b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile @@ -176,7 +176,7 @@ CPPWARN = -Wall -Wextra # # List all default C defines here, like -D_DEBUG=1 -DDEFS = -DGFX_USE_OS_CHIBIOS=TRUE +DDEFS = -DGFX_USE_OS_CHIBIOS=GFXON # List all default ASM defines here, like -D_DEBUG=1 DADEFS = diff --git a/demos/games/tetris/gfxconf.h b/demos/games/tetris/gfxconf.h index 08997b10..72df36c7 100644 --- a/demos/games/tetris/gfxconf.h +++ b/demos/games/tetris/gfxconf.h @@ -31,38 +31,38 @@ #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_GEVENT TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GINPUT GFXON /* Features for the GDISP sub-system. */ -#define GDISP_USE_DMA TRUE -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_USE_DMA GFXON +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* Comment these out if it conflicts with your hardware */ -#define GDISP_NEED_CONTROL TRUE +#define GDISP_NEED_CONTROL GFXON #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_PORTRAIT #define GDISP_SCREEN_WIDTH 240 #define GDISP_SCREEN_HEIGHT 320 /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE -#define GDISP_NEED_ANTIALIAS FALSE +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON +#define GDISP_NEED_ANTIALIAS GFXOFF /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/games/tetris/tetris.c b/demos/games/tetris/tetris.c index 4e5c87c3..ed924781 100644 --- a/demos/games/tetris/tetris.c +++ b/demos/games/tetris/tetris.c @@ -63,7 +63,7 @@ E C D */ const uint8_t sevenSegNumbers[10] = {0x3F, 0x06, 0x5B, 0x4F, 0x66, 0x6D, 0x7D, 0x07, 0x7F, 0x6F}; // 0,1,2,3,4,5,6,7,8,9 -const color_t tetrisShapeColors[9] = {Black, HTML2COLOR(0x009000), Red, Blue, Magenta, SkyBlue, Orange, HTML2COLOR(0xBBBB00), White}; // shape colors +const color_t tetrisShapeColors[9] = {GFX_BLACK, HTML2COLOR(0x009000), GFX_RED, GFX_BLUE, GFX_MAGENTA, GFX_SKYBLUE, GFX_ORANGE, HTML2COLOR(0xBBBB00), GFX_WHITE}; // shape colors // default tetris shapes const int tetrisShapes[TETRIS_SHAPE_COUNT][4][2] = { {{4, 17},{4, 16},{5, 16},{4, 15}}, @@ -209,16 +209,16 @@ static void tellScore(uint8_t color) { uitoa(tetrisScore, pps_str, sizeof(pps_str)); gdispFillArea(0, 0, gdispGetWidth(), gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-6, tetrisShapeColors[0]); for (i = 0; i < strlen(pps_str); i++) { - if (pps_str[i] == '0') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[0], Lime); - if (pps_str[i] == '1') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[1], Lime); - if (pps_str[i] == '2') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[2], Lime); - if (pps_str[i] == '3') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[3], Lime); - if (pps_str[i] == '4') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[4], Lime); - if (pps_str[i] == '5') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[5], Lime); - if (pps_str[i] == '6') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[6], Lime); - if (pps_str[i] == '7') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[7], Lime); - if (pps_str[i] == '8') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[8], Lime); - if (pps_str[i] == '9') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[9], Lime); + if (pps_str[i] == '0') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[0], GFX_LIME); + if (pps_str[i] == '1') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[1], GFX_LIME); + if (pps_str[i] == '2') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[2], GFX_LIME); + if (pps_str[i] == '3') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[3], GFX_LIME); + if (pps_str[i] == '4') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[4], GFX_LIME); + if (pps_str[i] == '5') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[5], GFX_LIME); + if (pps_str[i] == '6') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[6], GFX_LIME); + if (pps_str[i] == '7') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[7], GFX_LIME); + if (pps_str[i] == '8') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[8], GFX_LIME); + if (pps_str[i] == '9') sevenSegDraw(TETRIS_SEVEN_SEG_SCORE_X, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-SEVEN_SEG_CHAR_HEIGHT-7, sevenSegNumbers[9], GFX_LIME); } } @@ -262,16 +262,16 @@ static void printGameOver(void) { } static void printTouchAreas(void) { - gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetFontMetric(font16, fontHeight), "Touch Area's", font16, White, justifyCenter); - gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight()/4, "Pause", font16, Grey, justifyCenter); - gdispDrawStringBox(0, gdispGetHeight()/4, gdispGetWidth(), gdispGetHeight()/2, "Rotate", font16, Grey, justifyCenter); - gdispDrawStringBox(0, gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/4, gdispGetHeight()/4, "Left", font16, Grey, justifyCenter); - gdispDrawStringBox(gdispGetWidth()/4, gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/2, gdispGetHeight()/4, "Down", font16, Grey, justifyCenter); - gdispDrawStringBox(gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/4, gdispGetHeight()/4, "Right", font16, Grey, justifyCenter); - gdispDrawLine(0, gdispGetHeight()/4, gdispGetWidth()-1, gdispGetHeight()/4, Grey); - gdispDrawLine(0, gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()-1, gdispGetHeight()-gdispGetHeight()/4, Grey); - gdispDrawLine(gdispGetWidth()/4, gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()/4, gdispGetHeight()-1, Grey); - gdispDrawLine(gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-1, Grey); + gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetFontMetric(font16, fontHeight), "Touch Area's", font16, GFX_WHITE, justifyCenter); + gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight()/4, "Pause", font16, GFX_GRAY, justifyCenter); + gdispDrawStringBox(0, gdispGetHeight()/4, gdispGetWidth(), gdispGetHeight()/2, "Rotate", font16, GFX_GRAY, justifyCenter); + gdispDrawStringBox(0, gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/4, gdispGetHeight()/4, "Left", font16, GFX_GRAY, justifyCenter); + gdispDrawStringBox(gdispGetWidth()/4, gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/2, gdispGetHeight()/4, "Down", font16, GFX_GRAY, justifyCenter); + gdispDrawStringBox(gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-(gdispGetHeight()/4), gdispGetWidth()/4, gdispGetHeight()/4, "Right", font16, GFX_GRAY, justifyCenter); + gdispDrawLine(0, gdispGetHeight()/4, gdispGetWidth()-1, gdispGetHeight()/4, GFX_GRAY); + gdispDrawLine(0, gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()-1, gdispGetHeight()-gdispGetHeight()/4, GFX_GRAY); + gdispDrawLine(gdispGetWidth()/4, gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()/4, gdispGetHeight()-1, GFX_GRAY); + gdispDrawLine(gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-gdispGetHeight()/4, gdispGetWidth()-(gdispGetWidth()/4), gdispGetHeight()-1, GFX_GRAY); } static bool_t stay(bool_t down) { @@ -484,13 +484,13 @@ static void tetrisDeinit(void) { void tetrisStart(void) { // Show the help first - gdispClear(Black); + gdispClear(GFX_BLACK); printTouchAreas(); gfxSleepMilliseconds(3000); // Draw the board - gdispClear(Black); - gdispDrawBox(0, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-5, (TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+3, (TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)+3, White); + gdispClear(GFX_BLACK); + gdispDrawBox(0, gdispGetHeight()-(TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)-5, (TETRIS_FIELD_WIDTH*TETRIS_CELL_WIDTH)+3, (TETRIS_FIELD_HEIGHT*TETRIS_CELL_HEIGHT)+3, GFX_WHITE); printText(8); // Away we go 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 */ diff --git a/demos/modules/gaudio/oscilloscope/gfxconf.h b/demos/modules/gaudio/oscilloscope/gfxconf.h index 8e20ce0b..76b2d871 100644 --- a/demos/modules/gaudio/oscilloscope/gfxconf.h +++ b/demos/modules/gaudio/oscilloscope/gfxconf.h @@ -36,23 +36,23 @@ #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_GAUDIO TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GAUDIO GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* Features for the GAUDIO sub-system */ -#define GAUDIO_NEED_RECORD TRUE +#define GAUDIO_NEED_RECORD GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gaudio/oscilloscope/main.c b/demos/modules/gaudio/oscilloscope/main.c index b544016e..335b2cee 100644 --- a/demos/modules/gaudio/oscilloscope/main.c +++ b/demos/modules/gaudio/oscilloscope/main.c @@ -79,8 +79,8 @@ int main(void) { wi.width = swidth; wi.height = sheight; ghScope = gwinScopeCreate(&gScopeWindow, &wi, MY_AUDIO_CHANNEL, MY_AUDIO_FREQUENCY, MY_AUDIO_FORMAT); } - gwinSetBgColor(ghScope, White); - gwinSetColor(ghScope, Red); + gwinSetBgColor(ghScope, GFX_WHITE); + gwinSetColor(ghScope, GFX_RED); gwinClear(ghScope); /* Just keep displaying the scope traces */ diff --git a/demos/modules/gaudio/play-vs1053/gfxconf.h b/demos/modules/gaudio/play-vs1053/gfxconf.h index a9bb6252..291a292c 100644 --- a/demos/modules/gaudio/play-vs1053/gfxconf.h +++ b/demos/modules/gaudio/play-vs1053/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_GAUDIO TRUE -#define GFX_USE_GFILE TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GAUDIO GFXON +#define GFX_USE_GFILE GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GAUDIO sub-system */ -#define GAUDIO_NEED_PLAY TRUE +#define GAUDIO_NEED_PLAY GFXON /* Features for the GFILE sub-system */ -#define GFILE_NEED_ROMFS TRUE +#define GFILE_NEED_ROMFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gaudio/play-vs1053/main.c b/demos/modules/gaudio/play-vs1053/main.c index e0204cba..66ac5f8d 100644 --- a/demos/modules/gaudio/play-vs1053/main.c +++ b/demos/modules/gaudio/play-vs1053/main.c @@ -79,7 +79,7 @@ repeatplay: } // Play the file - gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, Yellow); + gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, GFX_YELLOW); toplay = gfileGetSize(f); while(toplay) { // Get a buffer to put the data into @@ -102,17 +102,17 @@ repeatplay: // Wait for the play to finish gaudioPlayWait(TIME_INFINITE); - gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, Green); + gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing gfxSleepMilliseconds(1500); - gdispClear(Black); + gdispClear(GFX_BLACK); goto repeatplay; // The end theend: if (errmsg) - gdispDrawString(0, gdispGetHeight()/2, errmsg, font, Red); + gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED); while(TRUE) gfxSleepMilliseconds(1000); diff --git a/demos/modules/gaudio/play-wave/gfxconf.h b/demos/modules/gaudio/play-wave/gfxconf.h index a9bb6252..291a292c 100644 --- a/demos/modules/gaudio/play-wave/gfxconf.h +++ b/demos/modules/gaudio/play-wave/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_GAUDIO TRUE -#define GFX_USE_GFILE TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GAUDIO GFXON +#define GFX_USE_GFILE GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GAUDIO sub-system */ -#define GAUDIO_NEED_PLAY TRUE +#define GAUDIO_NEED_PLAY GFXON /* Features for the GFILE sub-system */ -#define GFILE_NEED_ROMFS TRUE +#define GFILE_NEED_ROMFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gaudio/play-wave/main.c b/demos/modules/gaudio/play-wave/main.c index 888e4c8e..af3df7d1 100644 --- a/demos/modules/gaudio/play-wave/main.c +++ b/demos/modules/gaudio/play-wave/main.c @@ -162,7 +162,7 @@ repeatplay: } // Play the file - gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, Yellow); + gdispDrawString(0, gdispGetHeight()/2, "Playing...", font, GFX_YELLOW); while(toplay) { // Get a buffer to put the data into pd = gfxBufferGet(TIME_INFINITE); // This should never fail as we are waiting forever @@ -184,17 +184,17 @@ repeatplay: // Wait for the play to finish gaudioPlayWait(TIME_INFINITE); - gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, Green); + gdispDrawString(0, gdispGetHeight()/2+10, "Done", font, GFX_GREEN); // Repeat the whole thing gfxSleepMilliseconds(1500); - gdispClear(Black); + gdispClear(GFX_BLACK); goto repeatplay; // The end theend: if (errmsg) - gdispDrawString(0, gdispGetHeight()/2, errmsg, font, Red); + gdispDrawString(0, gdispGetHeight()/2, errmsg, font, GFX_RED); while(TRUE) gfxSleepMilliseconds(1000); diff --git a/demos/modules/gdisp/arcsectors/gfxconf.h b/demos/modules/gdisp/arcsectors/gfxconf.h index df6d85c0..b2c64fbd 100644 --- a/demos/modules/gdisp/arcsectors/gfxconf.h +++ b/demos/modules/gdisp/arcsectors/gfxconf.h @@ -31,17 +31,17 @@ #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 subsystem. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_ARCSECTORS TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_ARCSECTORS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/arcsectors/main.c b/demos/modules/gdisp/arcsectors/main.c index 9908523f..7c73201c 100644 --- a/demos/modules/gdisp/arcsectors/main.c +++ b/demos/modules/gdisp/arcsectors/main.c @@ -49,9 +49,9 @@ int main(void) { while(1) { // Draw the arc sectors - gdispClear(White); - gdispDrawArcSectors(cx, cy, r1, sectors, Blue); - gdispFillArcSectors(cx, cy, r2, sectors, Red); + gdispClear(GFX_WHITE); + gdispDrawArcSectors(cx, cy, r1, sectors, GFX_BLUE); + gdispFillArcSectors(cx, cy, r2, sectors, GFX_RED); // Increase the sectors counter sectors++; diff --git a/demos/modules/gdisp/basics/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h index a37ef1e7..931f2fe7 100644 --- a/demos/modules/gdisp/basics/gfxconf.h +++ b/demos/modules/gdisp/basics/gfxconf.h @@ -31,17 +31,17 @@ #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 TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/basics/main.c b/demos/modules/gdisp/basics/main.c index 48d4a652..ccf98d22 100644 --- a/demos/modules/gdisp/basics/main.c +++ b/demos/modules/gdisp/basics/main.c @@ -41,12 +41,12 @@ int main(void) { height = gdispGetHeight();
// Code Here
- gdispDrawBox(10, 10, width/2, height/2, Yellow);
- gdispFillArea(width/2, height/2, width/2-10, height/2-10, Blue);
- gdispDrawLine(5, 30, width-50, height-40, Red);
+ gdispDrawBox(10, 10, width/2, height/2, GFX_YELLOW);
+ gdispFillArea(width/2, height/2, width/2-10, height/2-10, GFX_BLUE);
+ gdispDrawLine(5, 30, width-50, height-40, GFX_RED);
for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20)
- gdispDrawPixel(i, j, White);
+ gdispDrawPixel(i, j, GFX_WHITE);
while(TRUE) {
gfxSleepMilliseconds(500);
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h index 4bb605ac..a0534700 100644 --- a/demos/modules/gdisp/circles/gfxconf.h +++ b/demos/modules/gdisp/circles/gfxconf.h @@ -31,25 +31,25 @@ #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_GMISC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GMISC GFXON
/* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
/* Features for the GMISC subsystem */
-#define GMISC_NEED_FIXEDTRIG TRUE
-#define GMISC_NEED_FASTTRIG TRUE
+#define GMISC_NEED_FIXEDTRIG GFXON
+#define GMISC_NEED_FASTTRIG GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/circles/main.c b/demos/modules/gdisp/circles/main.c index 9253439d..4efb896a 100644 --- a/demos/modules/gdisp/circles/main.c +++ b/demos/modules/gdisp/circles/main.c @@ -40,12 +40,12 @@ int main(void) { height = gdispGetHeight();
// Code Here
- gdispFillArc(width/2, height/2, width/4, -10, -45, White);
- gdispDrawCircle(width/2+width/8, height/2-height/8, 13, Green);
- gdispFillCircle (width/2+width/8, height/2-height/8, 10, Red);
- gdispDrawArc(width/2+width/8, height/2-height/8, 20, 25, 115, Gray);
- gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, Blue);
- gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, Yellow);
+ gdispFillArc(width/2, height/2, width/4, -10, -45, GFX_WHITE);
+ gdispDrawCircle(width/2+width/8, height/2-height/8, 13, GFX_GREEN);
+ gdispFillCircle (width/2+width/8, height/2-height/8, 10, GFX_RED);
+ gdispDrawArc(width/2+width/8, height/2-height/8, 20, 25, 115, GFX_GRAY);
+ gdispFillEllipse (width-width/6, height-height/6, width/8, height/16, GFX_BLUE);
+ gdispDrawEllipse (width-width/6, height-height/6, width/16, height/8, GFX_YELLOW);
while(TRUE) {
gfxSleepMilliseconds(500);
diff --git a/demos/modules/gdisp/fonts/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h index 1ea84e1b..2e24dd64 100644 --- a/demos/modules/gdisp/fonts/gfxconf.h +++ b/demos/modules/gdisp/fonts/gfxconf.h @@ -31,41 +31,41 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_ANTIALIAS TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_ANTIALIAS GFXON /* GDISP - fonts to include */ -#define GDISP_INCLUDE_USER_FONTS TRUE -#define GDISP_INCLUDE_FONT_UI1 FALSE -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE -#define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE -#define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE -#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE -#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE +#define GDISP_INCLUDE_USER_FONTS GFXON +#define GDISP_INCLUDE_FONT_UI1 GFXOFF +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_10x20 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_7x14 GFXOFF +#define GDISP_INCLUDE_FONT_FIXED_5x8 GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF +#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/fonts/main.c b/demos/modules/gdisp/fonts/main.c index b43e32dc..73d7c54e 100644 --- a/demos/modules/gdisp/fonts/main.c +++ b/demos/modules/gdisp/fonts/main.c @@ -60,21 +60,21 @@ int main(void) { line2 = "0123456789~!@#$%^&*_-+=(){}[]<>|/\\:;,.?'\"`"; // Font 1 - gdispFillStringBox(0, y, width, fheight1, line1, font1, Black, White, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, line1, font1, GFX_BLACK, GFX_WHITE, justifyCenter); y += fheight1+1; - gdispFillStringBox(0, y, width, fheight1, line2, font1, Black, White, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, line2, font1, GFX_BLACK, GFX_WHITE, justifyCenter); y += fheight1+1; // Font 2 - gdispFillStringBox(0, y, width, fheight2, line1, font2, Black, White, justifyCenter); + gdispFillStringBox(0, y, width, fheight2, line1, font2, GFX_BLACK, GFX_WHITE, justifyCenter); y += fheight2+1; - gdispFillStringBox(0, y, width, fheight2, line2, font2, Black, White, justifyCenter); + gdispFillStringBox(0, y, width, fheight2, line2, font2, GFX_BLACK, GFX_WHITE, justifyCenter); y += fheight2+1; // Font 1 drawing White on the (black) background - gdispDrawStringBox(0, y, width, fheight1, line1, font1, White, justifyCenter); + gdispDrawStringBox(0, y, width, fheight1, line1, font1, GFX_WHITE, justifyCenter); y += fheight1+1; - gdispDrawStringBox(0, y, width, fheight1, line2, font1, White, justifyCenter); + gdispDrawStringBox(0, y, width, fheight1, line2, font1, GFX_WHITE, justifyCenter); y += fheight1+1; // Show Sizes @@ -85,7 +85,7 @@ int main(void) { buf[4] = (fheight2-2)/10 + '0'; buf[5] = (fheight2-2)%10 + '0'; buf[6] = 0; - gdispFillStringBox(0, y, width, fheight1, buf, font1, Red, White, justifyCenter); + gdispFillStringBox(0, y, width, fheight1, buf, font1, GFX_RED, GFX_WHITE, justifyCenter); // Wait forever while(TRUE) { diff --git a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h index dab77ba1..359061de 100644 --- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h +++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h @@ -31,26 +31,26 @@ #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 subsystems to turn on */ -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON /* Features for the GDISP subsystem */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE TRUE -#define GDISP_NEED_ANTIALIAS TRUE -#define GDISP_NEED_UTF8 TRUE -#define GDISP_NEED_TEXT_KERNING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXON +#define GDISP_NEED_ANTIALIAS GFXON +#define GDISP_NEED_UTF8 GFXON +#define GDISP_NEED_TEXT_KERNING GFXON /* GDISP - fonts to include */ -#define GDISP_INCLUDE_USER_FONTS TRUE +#define GDISP_INCLUDE_USER_FONTS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/fonts_cyrillic/main.c b/demos/modules/gdisp/fonts_cyrillic/main.c index bd504722..b65801a1 100644 --- a/demos/modules/gdisp/fonts_cyrillic/main.c +++ b/demos/modules/gdisp/fonts_cyrillic/main.c @@ -39,7 +39,7 @@ int main(void) { font1 = gdispOpenFont("Archangelsk Regular 12");
// Demonstrate our other fonts
- gdispDrawString(10, 10, "привет мир", font1, Yellow);
+ gdispDrawString(10, 10, "привет мир", font1, GFX_YELLOW);
// Wait forever
while(TRUE) {
diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h index 55420275..7a37b48e 100644 --- a/demos/modules/gdisp/images/gfxconf.h +++ b/demos/modules/gdisp/images/gfxconf.h @@ -31,30 +31,30 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON #define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0) /* GDISP image decoders */ -//#define GDISP_NEED_IMAGE_NATIVE TRUE -//#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -//#define GDISP_NEED_IMAGE_JPG TRUE -//#define GDISP_NEED_IMAGE_PNG TRUE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +//#define GDISP_NEED_IMAGE_NATIVE GFXON +//#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +//#define GDISP_NEED_IMAGE_JPG GFXON +//#define GDISP_NEED_IMAGE_PNG GFXON + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h index fddda437..edbe126d 100644 --- a/demos/modules/gdisp/images_animated/gfxconf.h +++ b/demos/modules/gdisp/images_animated/gfxconf.h @@ -31,28 +31,28 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON /* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE -#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE +#define GDISP_NEED_IMAGE_NATIVE GFXOFF +#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXOFF +#define GDISP_NEED_IMAGE_JPG GFXOFF +#define GDISP_NEED_IMAGE_PNG GFXOFF + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 039cf584..a50e593f 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -36,7 +36,7 @@ * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS. */ -#define USE_IMAGE_CACHE FALSE // Only if you want to get performance at the expense of RAM +#define USE_IMAGE_CACHE GFXOFF // Only if you want to get performance at the expense of RAM #define MY_BG_COLOR RGB2COLOR(220, 220, 255) // Pale blue so we can see the transparent parts static gdispImage myImage; @@ -85,21 +85,21 @@ int main(void) { gdispImageCache(&myImage); #endif if (gdispImageDraw(&myImage, 0, 0, myImage.width, myImage.height, 0, 0) != GDISP_IMAGE_ERR_OK) { - SHOW_ERROR(Orange); + SHOW_ERROR(GFX_ORANGE); break; } delay = gdispImageNext(&myImage); if (delay == TIME_INFINITE) { - SHOW_ERROR(Green); + SHOW_ERROR(GFX_GREEN); break; } - SHOW_ERROR(Yellow); + SHOW_ERROR(GFX_YELLOW); if (delay != TIME_IMMEDIATE) gfxSleepMilliseconds(delay); } gdispImageClose(&myImage); } else - SHOW_ERROR(Red); + SHOW_ERROR(GFX_RED); while(1) { gfxSleepMilliseconds(1000); diff --git a/demos/modules/gdisp/images_palettes/gfxconf.h b/demos/modules/gdisp/images_palettes/gfxconf.h index a98776f5..db09cf0b 100644 --- a/demos/modules/gdisp/images_palettes/gfxconf.h +++ b/demos/modules/gdisp/images_palettes/gfxconf.h @@ -31,30 +31,30 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_IMAGE GFXON #define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0) /* GDISP image decoders */ -//#define GDISP_NEED_IMAGE_NATIVE TRUE -//#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP TRUE -//#define GDISP_NEED_IMAGE_JPG TRUE -//#define GDISP_NEED_IMAGE_PNG TRUE - -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +//#define GDISP_NEED_IMAGE_NATIVE GFXON +//#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXON +//#define GDISP_NEED_IMAGE_JPG GFXON +//#define GDISP_NEED_IMAGE_PNG GFXON + +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c index 7d63088b..b9327e52 100644 --- a/demos/modules/gdisp/images_palettes/main.c +++ b/demos/modules/gdisp/images_palettes/main.c @@ -36,7 +36,7 @@ * the same time there's still just one copy of the image in memory at all times. */ -#define USE_PRINTF TRUE +#define USE_PRINTF GFXON #include "gfx.h" @@ -48,7 +48,7 @@ int main(void) // Initialize everything gfxInit(); - gdispClear(Silver); + gdispClear(GFX_SILVER); // Open the image file gdispImageOpenFile(&_imgHome, "icon_home.bmp"); @@ -56,7 +56,7 @@ int main(void) // Retrieve the color palette size and dump it - just for fun. paletteSize = gdispImageGetPaletteSize(&_imgHome); if (paletteSize != 2) { // With this image we expect the palette to have only two entries! - gdispClear(Red); + gdispClear(GFX_RED); while (1); } @@ -64,33 +64,33 @@ int main(void) gdispImageDraw(&_imgHome, 10, 10, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, Blue); - gdispImageAdjustPalette(&_imgHome, 1, Red); + gdispImageAdjustPalette(&_imgHome, 0, GFX_BLUE); + gdispImageAdjustPalette(&_imgHome, 1, GFX_RED); gdispImageDraw(&_imgHome, 10, 60, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, White); - gdispImageAdjustPalette(&_imgHome, 1, Black); + gdispImageAdjustPalette(&_imgHome, 0, GFX_WHITE); + gdispImageAdjustPalette(&_imgHome, 1, GFX_BLACK); gdispImageDraw(&_imgHome, 10, 110, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, Lime); - gdispImageAdjustPalette(&_imgHome, 1, Navy); + gdispImageAdjustPalette(&_imgHome, 0, GFX_LIME); + gdispImageAdjustPalette(&_imgHome, 1, GFX_NAVY); gdispImageDraw(&_imgHome, 10, 160, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, Gray); - gdispImageAdjustPalette(&_imgHome, 1, Yellow); + gdispImageAdjustPalette(&_imgHome, 0, GFX_GRAY); + gdispImageAdjustPalette(&_imgHome, 1, GFX_YELLOW); gdispImageDraw(&_imgHome, 60, 60, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, Green); - gdispImageAdjustPalette(&_imgHome, 1, Black); + gdispImageAdjustPalette(&_imgHome, 0, GFX_GREEN); + gdispImageAdjustPalette(&_imgHome, 1, GFX_BLACK); gdispImageDraw(&_imgHome, 60, 110, gdispGetWidth(), gdispGetHeight(), 0, 0); // Modify the palette & redraw at a different location - gdispImageAdjustPalette(&_imgHome, 0, Lime); - gdispImageAdjustPalette(&_imgHome, 1, Teal); + gdispImageAdjustPalette(&_imgHome, 0, GFX_LIME); + gdispImageAdjustPalette(&_imgHome, 1, GFX_TEAL); gdispImageDraw(&_imgHome, 60, 160, gdispGetWidth(), gdispGetHeight(), 0, 0); // We're done. Clean up. diff --git a/demos/modules/gdisp/multiple_displays/gfxconf.h b/demos/modules/gdisp/multiple_displays/gfxconf.h index af71500e..a07c2993 100644 --- a/demos/modules/gdisp/multiple_displays/gfxconf.h +++ b/demos/modules/gdisp/multiple_displays/gfxconf.h @@ -31,20 +31,20 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* You must either define GDISP_TOTAL_DISPLAYS or GDISP_DRIVER_LIST for multiple displays. * You cannot define both! @@ -66,15 +66,15 @@ * as the program doesn't have to detect the hardware method to use on each call. * * Hardware definitions can be set to: - * - TRUE - all controllers support this routine - * - FALSE - no controllers support this routine + * - GFXON - all controllers support this routine + * - GFXOFF - no controllers support this routine * - if not specified then the code auto-detects the hardware. * * e.g - * #define GDISP_HARDWARE_STREAM_WRITE FALSE - * #define GDISP_HARDWARE_STREAM_READ FALSE - * #define GDISP_HARDWARE_DRAWPIXEL TRUE - * #define GDISP_HARDWARE_FILLS TRUE + * #define GDISP_HARDWARE_STREAM_WRITE GFXOFF + * #define GDISP_HARDWARE_STREAM_READ GFXOFF + * #define GDISP_HARDWARE_DRAWPIXEL GFXON + * #define GDISP_HARDWARE_FILLS GFXON */ #if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX // Emulator @@ -90,8 +90,8 @@ /* * The following are needed only for the sprintg() call */ -#define GFX_USE_GFILE TRUE -#define GFILE_NEED_PRINTG TRUE -#define GFILE_NEED_STRINGS TRUE +#define GFX_USE_GFILE GFXON +#define GFILE_NEED_PRINTG GFXON +#define GFILE_NEED_STRINGS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c index 0a474d0f..8b38a22a 100644 --- a/demos/modules/gdisp/multiple_displays/main.c +++ b/demos/modules/gdisp/multiple_displays/main.c @@ -41,7 +41,7 @@ * and method 1 for any extra displays. */ -#define USE_METHOD_1 FALSE +#define USE_METHOD_1 GFXOFF #if USE_METHOD_1 int main(void) { @@ -71,16 +71,16 @@ /* Draw draw draw */ sprintg(buf, "Display %u", display); if (width < 128) { - gdispGDrawBox(g, 0, 0, width/2, height/2, Yellow); - gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, Black, Blue, justifyCenter); + gdispGDrawBox(g, 0, 0, width/2, height/2, GFX_YELLOW); + gdispGFillStringBox(g, 0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter); } else { - gdispGDrawBox(g, 10, 10, width/2, height/2, Yellow); - gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, White, Blue, justifyCenter); + gdispGDrawBox(g, 10, 10, width/2, height/2, GFX_YELLOW); + gdispGFillStringBox(g, width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter); } - gdispGDrawLine(g, 5, 30, width-50, height-40, Red); + gdispGDrawLine(g, 5, 30, width-50, height-40, GFX_RED); for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20) - gdispGDrawPixel(g, i, j, White); + gdispGDrawPixel(g, i, j, GFX_WHITE); } while(TRUE) { @@ -114,16 +114,16 @@ /* Draw draw draw */ sprintg(buf, "Display %u", display); if (width < 128) { - gdispDrawBox(0, 0, width/2, height/2, Yellow); - gdispFillStringBox(0, height/2, width, height/2, buf, f, Black, Blue, justifyCenter); + gdispDrawBox(0, 0, width/2, height/2, GFX_YELLOW); + gdispFillStringBox(0, height/2, width, height/2, buf, f, GFX_BLACK, GFX_BLUE, justifyCenter); } else { - gdispDrawBox(10, 10, width/2, height/2, Yellow); - gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, White, Blue, justifyCenter); + gdispDrawBox(10, 10, width/2, height/2, GFX_YELLOW); + gdispFillStringBox(width/2, height/2, width/2-10, height/2-10, buf, f, GFX_WHITE, GFX_BLUE, justifyCenter); } - gdispDrawLine(5, 30, width-50, height-40, Red); + gdispDrawLine(5, 30, width-50, height-40, GFX_RED); for(i = 5, j = 0; i < width && j < height; i += 7, j += i/20) - gdispDrawPixel(i, j, White); + gdispDrawPixel(i, j, GFX_WHITE); } while(TRUE) { diff --git a/demos/modules/gdisp/pixmap/gfxconf.h b/demos/modules/gdisp/pixmap/gfxconf.h index ddd7d1ec..122caec2 100644 --- a/demos/modules/gdisp/pixmap/gfxconf.h +++ b/demos/modules/gdisp/pixmap/gfxconf.h @@ -31,18 +31,18 @@ #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 TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_PIXMAP TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_PIXMAP GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/pixmap/main.c b/demos/modules/gdisp/pixmap/main.c index c1cb9b55..a6791ec9 100644 --- a/demos/modules/gdisp/pixmap/main.c +++ b/demos/modules/gdisp/pixmap/main.c @@ -59,12 +59,12 @@ int main(void) { surface[j*PIXMAP_WIDTH + i] = RGB2COLOR(0, 255-i*(256/PIXMAP_WIDTH), j*(256/PIXMAP_HEIGHT)); // Secondly, show drawing a line on it like a virtual display - gdispGDrawLine(pixmap, 0, 0, gdispGGetWidth(pixmap)-1, gdispGGetHeight(pixmap)-1, White); + gdispGDrawLine(pixmap, 0, 0, gdispGGetWidth(pixmap)-1, gdispGGetHeight(pixmap)-1, GFX_WHITE); i = j = 0; while(TRUE) { // Clear the old position - gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, Black); + gdispFillArea(i, j, PIXMAP_WIDTH, PIXMAP_HEIGHT, GFX_BLACK); // Change the position i += PIXMAP_WIDTH/2; diff --git a/demos/modules/gdisp/polygons/gfxconf.h b/demos/modules/gdisp/polygons/gfxconf.h index 51170ecc..d0388c34 100644 --- a/demos/modules/gdisp/polygons/gfxconf.h +++ b/demos/modules/gdisp/polygons/gfxconf.h @@ -31,19 +31,19 @@ #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_GMISC TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GMISC GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CONVEX_POLYGON TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CONVEX_POLYGON GFXON /* For this demo define either: * GMISC_NEED_MATRIXFLOAT2D to use floating point math operations @@ -56,11 +56,11 @@ * If you choose fixed point you MUST define GMISC_NEED_FIXEDTRIG for this demo. */ -//#define GMISC_NEED_FASTTRIG TRUE -//#define GMISC_NEED_MATRIXFLOAT2D TRUE +//#define GMISC_NEED_FASTTRIG GFXON +//#define GMISC_NEED_MATRIXFLOAT2D GFXON -#define GMISC_NEED_FIXEDTRIG TRUE -#define GMISC_NEED_MATRIXFIXED2D TRUE +#define GMISC_NEED_FIXEDTRIG GFXON +#define GMISC_NEED_MATRIXFIXED2D GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/polygons/main.c b/demos/modules/gdisp/polygons/main.c index f71505d9..8a4f7df3 100644 --- a/demos/modules/gdisp/polygons/main.c +++ b/demos/modules/gdisp/polygons/main.c @@ -81,7 +81,7 @@ int main(void) { // Initialize and clear the display gfxInit(); - gdispClear(White); + gdispClear(GFX_WHITE); // Get the screen size width = gdispGetWidth(); @@ -136,16 +136,16 @@ int main(void) { #endif // Clear the old shape - gdispDrawPoly(0, 0, oldresult, NUM_POINTS, White); - gdispFillConvexPoly(0, 0, oldresult, NUM_POINTS, White); + gdispDrawPoly(0, 0, oldresult, NUM_POINTS, GFX_WHITE); + gdispFillConvexPoly(0, 0, oldresult, NUM_POINTS, GFX_WHITE); // Play the new shape position // NOTE: Because our shape is not a true convex polygon, we get some frames // where the line outline and the filled shape don't match. This is // expected due to the shapes non-convex nature and was left in the // demo to demonstrate this exact point. - gdispFillConvexPoly(0, 0, result, NUM_POINTS, Red); - gdispDrawPoly(0, 0, result, NUM_POINTS, Blue); + gdispFillConvexPoly(0, 0, result, NUM_POINTS, GFX_RED); + gdispDrawPoly(0, 0, result, NUM_POINTS, GFX_BLUE); // Make sure the display is updated gdispFlush(); diff --git a/demos/modules/gdisp/streaming/gfxconf.h b/demos/modules/gdisp/streaming/gfxconf.h index 82843184..6d83defe 100644 --- a/demos/modules/gdisp/streaming/gfxconf.h +++ b/demos/modules/gdisp/streaming/gfxconf.h @@ -10,22 +10,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_GMISC TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GMISC GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_STREAMING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_STREAMING GFXON -#define GFX_USE_GMISC TRUE -#define GMISC_NEED_INVSQRT TRUE -//#define GMISC_INVSQRT_MIXED_ENDIAN TRUE -//#define GMISC_INVSQRT_REAL_SLOW TRUE +#define GFX_USE_GMISC GFXON +#define GMISC_NEED_INVSQRT GFXON +//#define GMISC_INVSQRT_MIXED_ENDIAN GFXON +//#define GMISC_INVSQRT_REAL_SLOW GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/streaming/main.c b/demos/modules/gdisp/streaming/main.c index 33b69c91..a360ecc2 100644 --- a/demos/modules/gdisp/streaming/main.c +++ b/demos/modules/gdisp/streaming/main.c @@ -42,15 +42,15 @@ * your processor. * * You can modify the implementation of invsqrt() by firstly defining - * #define GMISC_INVSQRT_MIXED_ENDIAN TRUE + * #define GMISC_INVSQRT_MIXED_ENDIAN GFXON * in your gfxconf.h file. * * If it still doesn't work then instead define - * #define GMISC_INVSQRT_REAL_SLOW TRUE + * #define GMISC_INVSQRT_REAL_SLOW GFXON * in your gfxconf.h file. This should always work although it will probably be slow. */ -#define BALLCOLOR1 Red -#define BALLCOLOR2 Yellow +#define BALLCOLOR1 GFX_RED +#define BALLCOLOR2 GFX_YELLOW #define WALLCOLOR HTML2COLOR(0x303030) #define BACKCOLOR HTML2COLOR(0xC0C0C0) #define FLOORCOLOR HTML2COLOR(0x606060) @@ -110,7 +110,7 @@ int main(void) { // The ball shadow is darker if (g*(g+.4)+h*(h+.1) < 1) - colour = gdispBlendColor(colour, Black, SHADOWALPHA); + colour = gdispBlendColor(colour, GFX_BLACK, SHADOWALPHA); } gdispStreamColor(colour); /* pixel to the LCD */ } diff --git a/demos/modules/gdisp/thickarcs/gfxconf.h b/demos/modules/gdisp/thickarcs/gfxconf.h index 50e3092e..e81b5e06 100644 --- a/demos/modules/gdisp/thickarcs/gfxconf.h +++ b/demos/modules/gdisp/thickarcs/gfxconf.h @@ -31,17 +31,17 @@ #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 subsystem. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_ARC TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_ARC GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/thickarcs/main.c b/demos/modules/gdisp/thickarcs/main.c index 5ddd38c7..adf42810 100644 --- a/demos/modules/gdisp/thickarcs/main.c +++ b/demos/modules/gdisp/thickarcs/main.c @@ -32,8 +32,8 @@ // This function draws a thick arc and a non-thick arc together static void _drawCombinedArc(int x, int y, int angle1, int angle2) { - gdispDrawThickArc(x, y, 40, 60, angle1, angle2, Red); - gdispDrawArc(x, y, 50, angle1, angle2, White); + gdispDrawThickArc(x, y, 40, 60, angle1, angle2, GFX_RED); + gdispDrawArc(x, y, 50, angle1, angle2, GFX_WHITE); } int main(void) @@ -45,7 +45,7 @@ int main(void) while(TRUE) { // Clear the entire screen - gdispClear(Black); + gdispClear(GFX_BLACK); // Draw some thick arcs with an outline _drawCombinedArc(150, 150, (i / 360) * 15 + 55, 55+i); diff --git a/demos/modules/gfile/fatfs/gfxconf.h b/demos/modules/gfile/fatfs/gfxconf.h index 31738ec6..739eda64 100644 --- a/demos/modules/gfile/fatfs/gfxconf.h +++ b/demos/modules/gfile/fatfs/gfxconf.h @@ -1,10 +1,10 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -#define GFX_USE_GFILE TRUE +#define GFX_USE_GFILE GFXON -#define GFILE_NEED_FATFS TRUE -#define GFILE_NEED_NOAUTOMOUNT TRUE -#define GFILE_NEED_PRINTG TRUE +#define GFILE_NEED_FATFS GFXON +#define GFILE_NEED_NOAUTOMOUNT GFXON +#define GFILE_NEED_PRINTG GFXON #endif /* _GFXCONF_H */
\ No newline at end of file diff --git a/demos/modules/ginput/keyboard/gfxconf.h b/demos/modules/ginput/keyboard/gfxconf.h index 9ee7eac3..09947006 100644 --- a/demos/modules/ginput/keyboard/gfxconf.h +++ b/demos/modules/ginput/keyboard/gfxconf.h @@ -31,31 +31,31 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER 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_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_CONSOLE TRUE +#define GWIN_NEED_CONSOLE GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_KEYBOARD TRUE +#define GINPUT_NEED_KEYBOARD GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/ginput/keyboard/main.c b/demos/modules/ginput/keyboard/main.c index 32c7652f..dec93125 100644 --- a/demos/modules/ginput/keyboard/main.c +++ b/demos/modules/ginput/keyboard/main.c @@ -59,8 +59,8 @@ int main(void) { GW = gwinConsoleCreate(0, &wi); /* Set the fore- and background colors for the console */ - gwinSetColor(GW, Yellow); - gwinSetBgColor(GW, Black); + gwinSetColor(GW, GFX_YELLOW); + gwinSetBgColor(GW, GFX_BLACK); gwinClear(GW); } diff --git a/demos/modules/gos/threads/gfxconf.h b/demos/modules/gos/threads/gfxconf.h index dd36bf3d..45f9564a 100644 --- a/demos/modules/gos/threads/gfxconf.h +++ b/demos/modules/gos/threads/gfxconf.h @@ -26,15 +26,15 @@ /////////////////////////////////////////////////////////////////////////// // GOS - One of these must be defined, preferably in your Makefile // /////////////////////////////////////////////////////////////////////////// -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_FREERTOS FALSE -// #define GFX_FREERTOS_USE_TRACE FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE -//#define GFX_USE_OS_ECOS FALSE -//#define GFX_USE_OS_RAWRTOS FALSE -//#define GFX_USE_OS_RAW32 FALSE +//#define GFX_USE_OS_CHIBIOS GFXOFF +//#define GFX_USE_OS_FREERTOS GFXOFF +// #define GFX_FREERTOS_USE_TRACE GFXOFF +//#define GFX_USE_OS_WIN32 GFXOFF +//#define GFX_USE_OS_LINUX GFXOFF +//#define GFX_USE_OS_OSX GFXOFF +//#define GFX_USE_OS_ECOS GFXOFF +//#define GFX_USE_OS_RAWRTOS GFXOFF +//#define GFX_USE_OS_RAW32 GFXOFF // We define this here in case you are using raw32 or arduino with this demo // and have a non-thread-safe C library. diff --git a/demos/modules/gos/threads_advanced/gfxconf.h b/demos/modules/gos/threads_advanced/gfxconf.h index 9a35130a..ead115eb 100644 --- a/demos/modules/gos/threads_advanced/gfxconf.h +++ b/demos/modules/gos/threads_advanced/gfxconf.h @@ -33,21 +33,21 @@ /////////////////////////////////////////////////////////////////////////// // GOS - One of these must be defined, preferably in your Makefile // /////////////////////////////////////////////////////////////////////////// -//#define GFX_USE_OS_CHIBIOS FALSE -//#define GFX_USE_OS_FREERTOS FALSE -// #define GFX_FREERTOS_USE_TRACE FALSE -//#define GFX_USE_OS_WIN32 FALSE -//#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE -//#define GFX_USE_OS_ECOS FALSE -//#define GFX_USE_OS_RAWRTOS FALSE -//#define GFX_USE_OS_RAW32 FALSE +//#define GFX_USE_OS_CHIBIOS GFXOFF +//#define GFX_USE_OS_FREERTOS GFXOFF +// #define GFX_FREERTOS_USE_TRACE GFXOFF +//#define GFX_USE_OS_WIN32 GFXOFF +//#define GFX_USE_OS_LINUX GFXOFF +//#define GFX_USE_OS_OSX GFXOFF +//#define GFX_USE_OS_ECOS GFXOFF +//#define GFX_USE_OS_RAWRTOS GFXOFF +//#define GFX_USE_OS_RAW32 GFXOFF // We define this here in case you are using raw32 or arduino with this demo // and have a non-thread-safe C library. #define GOS_RAW_HEAP_SIZE 10240 -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gtimer/gfxconf.h b/demos/modules/gtimer/gfxconf.h index 8786fafe..4a6807e0 100644 --- a/demos/modules/gtimer/gfxconf.h +++ b/demos/modules/gtimer/gfxconf.h @@ -31,12 +31,12 @@ #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_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gtrans/basic/gfxconf.h b/demos/modules/gtrans/basic/gfxconf.h index c4f75e22..e41aaf03 100644 --- a/demos/modules/gtrans/basic/gfxconf.h +++ b/demos/modules/gtrans/basic/gfxconf.h @@ -31,21 +31,21 @@ #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 -#define GFX_USE_GTRANS TRUE -#define GFX_USE_GDISP TRUE +#define GFX_USE_GTRANS GFXON +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_ANTIALIAS TRUE -#define GDISP_NEED_UTF8 TRUE -#define GDISP_NEED_TEXT_KERNING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_ANTIALIAS GFXON +#define GDISP_NEED_UTF8 GFXON +#define GDISP_NEED_TEXT_KERNING GFXON -#define GDISP_INCLUDE_USER_FONTS TRUE +#define GDISP_INCLUDE_USER_FONTS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gtrans/basic/main.c b/demos/modules/gtrans/basic/main.c index e15b3f6a..77430a46 100644 --- a/demos/modules/gtrans/basic/main.c +++ b/demos/modules/gtrans/basic/main.c @@ -30,8 +30,8 @@ #include <stdio.h> #include "gfx.h" -#define COLOR_BACKGROUND Silver -#define COLOR_TEXT Black +#define COLOR_BACKGROUND GFX_SILVER +#define COLOR_TEXT GFX_BLACK font_t font; diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h index c5050cef..21055ab7 100644 --- a/demos/modules/gwin/basic/gfxconf.h +++ b/demos/modules/gwin/basic/gfxconf.h @@ -31,19 +31,19 @@ #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_GDISP GFXON +#define GFX_USE_GWIN GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON /* Features for the GWIN subsystem. */ diff --git a/demos/modules/gwin/basic/main.c b/demos/modules/gwin/basic/main.c index fca150c9..e5b66f17 100644 --- a/demos/modules/gwin/basic/main.c +++ b/demos/modules/gwin/basic/main.c @@ -37,7 +37,7 @@ int main(void) { /* Initialize and clear the display */ gfxInit(); - gdispClear(White); + gdispClear(GFX_WHITE); /* Create two windows */ { @@ -51,10 +51,10 @@ int main(void) { } /* Set fore- and background colors for both windows */ - gwinSetColor(GW1, Black); - gwinSetBgColor(GW1, White); - gwinSetColor(GW2, White); - gwinSetBgColor(GW2, Blue); + gwinSetColor(GW1, GFX_BLACK); + gwinSetBgColor(GW1, GFX_WHITE); + gwinSetColor(GW2, GFX_WHITE); + gwinSetBgColor(GW2, GFX_BLUE); /* Clear both windows - to set background color */ gwinClear(GW1); diff --git a/demos/modules/gwin/button/gfxconf.h b/demos/modules/gwin/button/gfxconf.h index eba3f4ef..23a4be7f 100644 --- a/demos/modules/gwin/button/gfxconf.h +++ b/demos/modules/gwin/button/gfxconf.h @@ -31,35 +31,35 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_CONTROL TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CONTROL GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_BUTTON TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_BUTTON GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/button/main.c b/demos/modules/gwin/button/main.c index 1d8aa2e6..29a5641f 100644 --- a/demos/modules/gwin/button/main.c +++ b/demos/modules/gwin/button/main.c @@ -65,7 +65,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); @@ -89,7 +89,7 @@ int main(void) { // GWIN windows. In this case however we know that the button is in the top-left // corner which should translate safely into any orientation. gdispSetOrientation(orients[which]); - gdispClear(White); + gdispClear(GFX_WHITE); gwinRedrawDisplay(GDISP, FALSE); } break; diff --git a/demos/modules/gwin/checkbox/gfxconf.h b/demos/modules/gwin/checkbox/gfxconf.h index f9060599..2f4a78bb 100644 --- a/demos/modules/gwin/checkbox/gfxconf.h +++ b/demos/modules/gwin/checkbox/gfxconf.h @@ -31,34 +31,34 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_CHECKBOX TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_CHECKBOX GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/checkbox/main.c b/demos/modules/gwin/checkbox/main.c index 22963e40..00f3ebdb 100644 --- a/demos/modules/gwin/checkbox/main.c +++ b/demos/modules/gwin/checkbox/main.c @@ -59,7 +59,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h index 9efba8eb..fc23d44c 100644 --- a/demos/modules/gwin/console/gfxconf.h +++ b/demos/modules/gwin/console/gfxconf.h @@ -31,31 +31,31 @@ #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_GDISP GFXON +#define GFX_USE_GWIN 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_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_CONSOLE_ESCSEQ TRUE -#define GWIN_CONSOLE_USE_HISTORY TRUE -#define GWIN_CONSOLE_HISTORY_AVERAGING TRUE -#define GWIN_CONSOLE_HISTORY_ATCREATE TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_CONSOLE_ESCSEQ GFXON +#define GWIN_CONSOLE_USE_HISTORY GFXON +#define GWIN_CONSOLE_HISTORY_AVERAGING GFXON +#define GWIN_CONSOLE_HISTORY_ATCREATE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/console/main.c b/demos/modules/gwin/console/main.c index 0e9000b5..248aeedf 100644 --- a/demos/modules/gwin/console/main.c +++ b/demos/modules/gwin/console/main.c @@ -62,12 +62,12 @@ int main(void) { gwinSetFont(GW1, font2); /* Set the fore- and background colors for each console */ - gwinSetColor(GW1, Green); - gwinSetBgColor(GW1, Black); - gwinSetColor(GW2, White); - gwinSetBgColor(GW2, Blue); - gwinSetColor(GW3, Black); - gwinSetBgColor(GW3, Red); + gwinSetColor(GW1, GFX_GREEN); + gwinSetBgColor(GW1, GFX_BLACK); + gwinSetColor(GW2, GFX_WHITE); + gwinSetBgColor(GW2, GFX_BLUE); + gwinSetColor(GW3, GFX_BLACK); + gwinSetBgColor(GW3, GFX_RED); /* clear all console windows - to set background */ gwinClear(GW1); diff --git a/demos/modules/gwin/container/gfxconf.h b/demos/modules/gwin/container/gfxconf.h index fdddc3f3..e37c8653 100644 --- a/demos/modules/gwin/container/gfxconf.h +++ b/demos/modules/gwin/container/gfxconf.h @@ -19,69 +19,69 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE - -#define GWIN_NEED_WINDOWMANAGER TRUE - -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE - #define GWIN_CONSOLE_ESCSEQ TRUE - #define GWIN_CONSOLE_USE_BASESTREAM TRUE -#define GWIN_NEED_GRAPH TRUE - -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_BUTTON TRUE - #define GWIN_BUTTON_LAZY_RELEASE TRUE -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE +#define GFX_USE_GWIN GFXON + +#define GWIN_NEED_WINDOWMANAGER GFXON + +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON + #define GWIN_CONSOLE_ESCSEQ GFXON + #define GWIN_CONSOLE_USE_BASESTREAM GFXON +#define GWIN_NEED_GRAPH GFXON + +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_BUTTON GFXON + #define GWIN_BUTTON_LAZY_RELEASE GFXON +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE -#define GQUEUE_NEED_GSYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON +#define GQUEUE_NEED_GSYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/container/main.c b/demos/modules/gwin/container/main.c index 75e3f78b..af2e8b1f 100644 --- a/demos/modules/gwin/container/main.c +++ b/demos/modules/gwin/container/main.c @@ -40,7 +40,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the widget createWidgets(); diff --git a/demos/modules/gwin/container_nested/gfxconf.h b/demos/modules/gwin/container_nested/gfxconf.h index ef2ff2bc..938d03d5 100644 --- a/demos/modules/gwin/container_nested/gfxconf.h +++ b/demos/modules/gwin/container_nested/gfxconf.h @@ -19,70 +19,70 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE - -#define GWIN_NEED_WINDOWMANAGER TRUE - -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE - #define GWIN_CONSOLE_ESCSEQ TRUE - #define GWIN_CONSOLE_USE_BASESTREAM TRUE -#define GWIN_NEED_GRAPH TRUE - -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_BUTTON TRUE - #define GWIN_BUTTON_LAZY_RELEASE TRUE - #define GWIN_NEED_CHECKBOX TRUE -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE +#define GFX_USE_GWIN GFXON + +#define GWIN_NEED_WINDOWMANAGER GFXON + +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON + #define GWIN_CONSOLE_ESCSEQ GFXON + #define GWIN_CONSOLE_USE_BASESTREAM GFXON +#define GWIN_NEED_GRAPH GFXON + +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_BUTTON GFXON + #define GWIN_BUTTON_LAZY_RELEASE GFXON + #define GWIN_NEED_CHECKBOX GFXON +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE -#define GQUEUE_NEED_GSYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON +#define GQUEUE_NEED_GSYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/container_nested/main.c b/demos/modules/gwin/container_nested/main.c index 5cd5e793..0e5a2634 100644 --- a/demos/modules/gwin/container_nested/main.c +++ b/demos/modules/gwin/container_nested/main.c @@ -118,7 +118,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the widget createWidgets(); diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h index 0c14f6b4..853bcd76 100644 --- a/demos/modules/gwin/frame/gfxconf.h +++ b/demos/modules/gwin/frame/gfxconf.h @@ -19,62 +19,62 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON // Oops - rand() seems to use malloc() -#define GFX_EMULATE_MALLOC TRUE +#define GFX_EMULATE_MALLOC GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_TEXT TRUE - //#define GDISP_NEED_ANTIALIAS TRUE // Not needed for UI2 font - //#define GDISP_NEED_TEXT_KERNING TRUE // Not needed for UI2 font - //#define GDISP_NEED_UTF8 TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_TEXT GFXON + //#define GDISP_NEED_ANTIALIAS GFXON // Not needed for UI2 font + //#define GDISP_NEED_TEXT_KERNING GFXON // Not needed for UI2 font + //#define GDISP_NEED_UTF8 GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_MULTITHREAD GFXON #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_LABEL TRUE - #define GWIN_NEED_BUTTON TRUE - #define GWIN_NEED_SLIDER TRUE -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_FRAME TRUE +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_LABEL GFXON + #define GWIN_NEED_BUTTON GFXON + #define GWIN_NEED_SLIDER GFXON +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_FRAME GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE - #define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON + #define GQUEUE_NEED_ASYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE - #define GINPUT_NEED_MOUSE TRUE +#define GFX_USE_GINPUT GFXON + #define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/frame/main.c b/demos/modules/gwin/frame/main.c index 6668ddbb..aae4cfac 100644 --- a/demos/modules/gwin/frame/main.c +++ b/demos/modules/gwin/frame/main.c @@ -120,7 +120,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget _createWidgets(); diff --git a/demos/modules/gwin/gl3d-gears/gfxconf.h b/demos/modules/gwin/gl3d-gears/gfxconf.h index d0375a19..b1a48ca5 100644 --- a/demos/modules/gwin/gl3d-gears/gfxconf.h +++ b/demos/modules/gwin/gl3d-gears/gfxconf.h @@ -31,21 +31,21 @@ #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_GDISP GFXON +#define GFX_USE_GWIN GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_GL3D TRUE +#define GWIN_NEED_GL3D GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/gl3d-gears/main.c b/demos/modules/gwin/gl3d-gears/main.c index 2bc4ed84..2b450799 100644 --- a/demos/modules/gwin/gl3d-gears/main.c +++ b/demos/modules/gwin/gl3d-gears/main.c @@ -263,7 +263,7 @@ static void init( void ) int main(void) { /* Initialize and clear the display */ gfxInit(); - gdispClear(White); + gdispClear(GFX_WHITE); /* Create the 3D window */ { diff --git a/demos/modules/gwin/gl3d-spin/gfxconf.h b/demos/modules/gwin/gl3d-spin/gfxconf.h index d0375a19..b1a48ca5 100644 --- a/demos/modules/gwin/gl3d-spin/gfxconf.h +++ b/demos/modules/gwin/gl3d-spin/gfxconf.h @@ -31,21 +31,21 @@ #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_GDISP GFXON +#define GFX_USE_GWIN GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_GL3D TRUE +#define GWIN_NEED_GL3D GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/gl3d-spin/main.c b/demos/modules/gwin/gl3d-spin/main.c index 2b80994f..4da6b053 100644 --- a/demos/modules/gwin/gl3d-spin/main.c +++ b/demos/modules/gwin/gl3d-spin/main.c @@ -134,7 +134,7 @@ static void spin( void ) int main(void) { /* Initialize and clear the display */ gfxInit(); - gdispClear(White); + gdispClear(GFX_WHITE); /* Create the 3D window */ { diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h index 3fc8fde1..c2ec7963 100644 --- a/demos/modules/gwin/graph/gfxconf.h +++ b/demos/modules/gwin/graph/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_GMISC TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GMISC GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GQUEUE GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_GRAPH TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_GRAPH GFXON /* Features for the GQUEUE subsystem. */ -#define GQUEUE_NEED_ASYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON /* Features for the GMISC subsystem. */ -#define GMISC_NEED_FASTTRIG TRUE +#define GMISC_NEED_FASTTRIG GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/graph/main.c b/demos/modules/gwin/graph/main.c index 23a6a564..2ca4d1a6 100644 --- a/demos/modules/gwin/graph/main.c +++ b/demos/modules/gwin/graph/main.c @@ -41,23 +41,23 @@ static const point data[5] = { // A graph styling static GGraphStyle GraphStyle1 = { - { GGRAPH_POINT_DOT, 0, Blue }, // Point - { GGRAPH_LINE_NONE, 2, Gray }, // Line - { GGRAPH_LINE_SOLID, 0, White }, // X axis - { GGRAPH_LINE_SOLID, 0, White }, // Y axis - { GGRAPH_LINE_DASH, 5, Gray, 50 }, // X grid - { GGRAPH_LINE_DOT, 7, Yellow, 50 }, // Y grid + { GGRAPH_POINT_DOT, 0, GFX_BLUE }, // Point + { GGRAPH_LINE_NONE, 2, GFX_GRAY }, // Line + { GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // X axis + { GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // Y axis + { GGRAPH_LINE_DASH, 5, GFX_GRAY, 50 }, // X grid + { GGRAPH_LINE_DOT, 7, GFX_YELLOW, 50 }, // Y grid GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags }; // Another graph styling static const GGraphStyle GraphStyle2 = { - { GGRAPH_POINT_SQUARE, 5, Red }, // Point - { GGRAPH_LINE_DOT, 2, Pink }, // Line - { GGRAPH_LINE_SOLID, 0, White }, // X axis - { GGRAPH_LINE_SOLID, 0, White }, // Y axis - { GGRAPH_LINE_DASH, 5, Gray, 50 }, // X grid - { GGRAPH_LINE_DOT, 7, Yellow, 50 }, // Y grid + { GGRAPH_POINT_SQUARE, 5, GFX_RED }, // Point + { GGRAPH_LINE_DOT, 2, GFX_PINK }, // Line + { GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // X axis + { GGRAPH_LINE_SOLID, 0, GFX_WHITE }, // Y axis + { GGRAPH_LINE_DASH, 5, GFX_GRAY, 50 }, // X grid + { GGRAPH_LINE_DOT, 7, GFX_YELLOW, 50 }, // Y grid GWIN_GRAPH_STYLE_POSITIVE_AXIS_ARROWS // Flags }; @@ -90,7 +90,7 @@ int main(void) { // Modify the style gwinGraphStartSet(gh); - GraphStyle1.point.color = Green; + GraphStyle1.point.color = GFX_GREEN; gwinGraphSetStyle(gh, &GraphStyle1); // Draw a different sine wave diff --git a/demos/modules/gwin/imagebox/gfxconf.h b/demos/modules/gwin/imagebox/gfxconf.h index d068141a..e186e140 100644 --- a/demos/modules/gwin/imagebox/gfxconf.h +++ b/demos/modules/gwin/imagebox/gfxconf.h @@ -19,72 +19,72 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -//#define GDISP_NEED_AUTOFLUSH FALSE -//#define GDISP_NEED_TIMERFLUSH FALSE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE +//#define GDISP_NEED_AUTOFLUSH GFXOFF +//#define GDISP_NEED_TIMERFLUSH GFXOFF +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON -#define GDISP_NEED_IMAGE TRUE - #define GDISP_NEED_IMAGE_GIF TRUE - #define GDISP_NEED_IMAGE_BMP TRUE - #define GDISP_NEED_IMAGE_BMP_24 TRUE +#define GDISP_NEED_IMAGE GFXON + #define GDISP_NEED_IMAGE_GIF GFXON + #define GDISP_NEED_IMAGE_BMP GFXON + #define GDISP_NEED_IMAGE_BMP_24 GFXON #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_IMAGE TRUE - #define GWIN_NEED_IMAGE_ANIMATION TRUE +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_IMAGE GFXON + #define GWIN_NEED_IMAGE_ANIMATION GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE -#define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON +#define GQUEUE_NEED_ASYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON /////////////////////////////////////////////////////////////////////////// // GFILE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GFILE TRUE +#define GFX_USE_GFILE GFXON -#define GFILE_NEED_ROMFS TRUE +#define GFILE_NEED_ROMFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/imagebox/main.c b/demos/modules/gwin/imagebox/main.c index 4b864f00..c4f70df2 100644 --- a/demos/modules/gwin/imagebox/main.c +++ b/demos/modules/gwin/imagebox/main.c @@ -53,7 +53,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/keyboard/gfxconf.h b/demos/modules/gwin/keyboard/gfxconf.h index bfae0e7c..79d443dc 100644 --- a/demos/modules/gwin/keyboard/gfxconf.h +++ b/demos/modules/gwin/keyboard/gfxconf.h @@ -19,37 +19,37 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -//#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +//#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON -//#define GDISP_NEED_CONTROL TRUE +//#define GDISP_NEED_CONTROL GFXON //#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_MULTITHREAD GFXON -#define GFX_USE_GWIN TRUE -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_KEYBOARD TRUE +#define GFX_USE_GWIN GFXON +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_KEYBOARD GFXON -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON -#define GFX_USE_GQUEUE TRUE -#define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON +#define GQUEUE_NEED_ASYNC GFXON -#define GFX_USE_GINPUT TRUE -#define GINPUT_NEED_MOUSE TRUE -//#define GINPUT_NEED_KEYBOARD TRUE +#define GFX_USE_GINPUT GFXON +#define GINPUT_NEED_MOUSE GFXON +//#define GINPUT_NEED_KEYBOARD GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/keyboard/main.c b/demos/modules/gwin/keyboard/main.c index 47a10fc0..d81ac6a3 100644 --- a/demos/modules/gwin/keyboard/main.c +++ b/demos/modules/gwin/keyboard/main.c @@ -47,7 +47,7 @@ static void createWidgets(void) { wi.g.x = 0; wi.g.y = 0; wi.g.width = gdispGetWidth(); wi.g.height = gdispGetHeight()/2; ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_BLACK); gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0)); gwinShow(ghConsole); gwinClear(ghConsole); @@ -71,7 +71,7 @@ int main(void) { font = gdispOpenFont("*"); // Get the first defined font. gwinSetDefaultFont(font); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the gwin windows/widgets createWidgets(); diff --git a/demos/modules/gwin/label/gfxconf.h b/demos/modules/gwin/label/gfxconf.h index 568ea4fe..c84992f1 100644 --- a/demos/modules/gwin/label/gfxconf.h +++ b/demos/modules/gwin/label/gfxconf.h @@ -19,59 +19,59 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -//#define GDISP_NEED_AUTOFLUSH FALSE -//#define GDISP_NEED_TIMERFLUSH FALSE -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_NEED_ANTIALIAS TRUE - #define GDISP_NEED_UTF8 TRUE - #define GDISP_NEED_TEXT_KERNING TRUE - #define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE +//#define GDISP_NEED_AUTOFLUSH GFXOFF +//#define GDISP_NEED_TIMERFLUSH GFXOFF +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_NEED_ANTIALIAS GFXON + #define GDISP_NEED_UTF8 GFXON + #define GDISP_NEED_TEXT_KERNING GFXON + #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON - #define GWIN_NEED_LABEL TRUE - #define GWIN_LABEL_ATTRIBUTE TRUE + #define GWIN_NEED_LABEL GFXON + #define GWIN_LABEL_ATTRIBUTE GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/label/main.c b/demos/modules/gwin/label/main.c index 425436ea..f1fb6b92 100644 --- a/demos/modules/gwin/label/main.c +++ b/demos/modules/gwin/label/main.c @@ -61,7 +61,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h index 0e6d6d11..6ace3daa 100644 --- a/demos/modules/gwin/list/gfxconf.h +++ b/demos/modules/gwin/list/gfxconf.h @@ -17,77 +17,77 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CONVEX_POLYGON TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_IMAGE TRUE - #define GDISP_NEED_IMAGE_GIF TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CONVEX_POLYGON GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_IMAGE GFXON + #define GDISP_NEED_IMAGE_GIF GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_LABEL TRUE - #define GWIN_NEED_LIST TRUE - #define GWIN_NEED_LIST_IMAGES FALSE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_LABEL GFXON + #define GWIN_NEED_LIST GFXON + #define GWIN_NEED_LIST_IMAGES GFXOFF /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE FALSE +#define GFX_USE_GQUEUE GFXOFF /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE -#define GINPUT_NEED_MOUSE TRUE +#define GFX_USE_GINPUT GFXON +#define GINPUT_NEED_MOUSE GFXON /////////////////////////////////////////////////////////////////////////// // GADC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GADC FALSE +#define GFX_USE_GADC GFXOFF /////////////////////////////////////////////////////////////////////////// // GAUDIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDIN FALSE +#define GFX_USE_GAUDIN GFXOFF /////////////////////////////////////////////////////////////////////////// // GAUDOUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDOUT FALSE +#define GFX_USE_GAUDOUT GFXOFF /////////////////////////////////////////////////////////////////////////// // GMISC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GMISC FALSE +#define GFX_USE_GMISC GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/list/main.c b/demos/modules/gwin/list/main.c index 0102f276..22a2074e 100644 --- a/demos/modules/gwin/list/main.c +++ b/demos/modules/gwin/list/main.c @@ -77,7 +77,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/progressbar/gfxconf.h b/demos/modules/gwin/progressbar/gfxconf.h index 6af70faf..04ce034d 100644 --- a/demos/modules/gwin/progressbar/gfxconf.h +++ b/demos/modules/gwin/progressbar/gfxconf.h @@ -29,64 +29,64 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON /* 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_CIRCLE TRUE -#define GDISP_NEED_ELLIPSE FALSE -#define GDISP_NEED_ARC FALSE -#define GDISP_NEED_CONVEX_POLYGON TRUE -#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_IMAGE TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_ELLIPSE GFXOFF +#define GDISP_NEED_ARC GFXOFF +#define GDISP_NEED_CONVEX_POLYGON GFXON +#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_PIXELREAD GFXOFF +#define GDISP_NEED_CONTROL GFXOFF +#define GDISP_NEED_IMAGE GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_ASYNC GFXOFF +#define GDISP_NEED_MSGAPI GFXOFF /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_ANTIALIAS FALSE +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_NEED_ANTIALIAS GFXOFF /* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE -#define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE +#define GDISP_NEED_IMAGE_NATIVE GFXOFF +#define GDISP_NEED_IMAGE_GIF GFXON +#define GDISP_NEED_IMAGE_BMP GFXOFF +#define GDISP_NEED_IMAGE_JPG GFXOFF +#define GDISP_NEED_IMAGE_PNG GFXOFF /* Features for the GWIN sub-system. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_CONSOLE FALSE -#define GWIN_NEED_GRAPH FALSE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_BUTTON FALSE -#define GWIN_NEED_SLIDER FALSE -#define GWIN_NEED_CHECKBOX FALSE -#define GWIN_NEED_LABEL FALSE -#define GWIN_NEED_IMAGE FALSE -#define GWIN_NEED_RADIO FALSE -#define GWIN_NEED_LIST FALSE -#define GWIN_NEED_IMAGE_ANIMATION FALSE -#define GWIN_NEED_LIST_IMAGES FALSE -#define GWIN_NEED_PROGRESSBAR TRUE -#define GWIN_PROGRESSBAR_AUTO TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_CONSOLE GFXOFF +#define GWIN_NEED_GRAPH GFXOFF +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_BUTTON GFXOFF +#define GWIN_NEED_SLIDER GFXOFF +#define GWIN_NEED_CHECKBOX GFXOFF +#define GWIN_NEED_LABEL GFXOFF +#define GWIN_NEED_IMAGE GFXOFF +#define GWIN_NEED_RADIO GFXOFF +#define GWIN_NEED_LIST GFXOFF +#define GWIN_NEED_IMAGE_ANIMATION GFXOFF +#define GWIN_NEED_LIST_IMAGES GFXOFF +#define GWIN_NEED_PROGRESSBAR GFXON +#define GWIN_PROGRESSBAR_AUTO GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE -#define GINPUT_NEED_TOGGLE FALSE -#define GINPUT_NEED_DIAL FALSE +#define GINPUT_NEED_MOUSE GFXON +#define GINPUT_NEED_TOGGLE GFXOFF +#define GINPUT_NEED_DIAL GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/progressbar/main.c b/demos/modules/gwin/progressbar/main.c index 8e9e8352..374728cf 100644 --- a/demos/modules/gwin/progressbar/main.c +++ b/demos/modules/gwin/progressbar/main.c @@ -17,7 +17,7 @@ int main(void) { gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); _createWidget(); diff --git a/demos/modules/gwin/radio/gfxconf.h b/demos/modules/gwin/radio/gfxconf.h index 7c3e441e..3c5c64a5 100644 --- a/demos/modules/gwin/radio/gfxconf.h +++ b/demos/modules/gwin/radio/gfxconf.h @@ -31,34 +31,34 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_TEXT GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_RADIO TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_RADIO GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/radio/main.c b/demos/modules/gwin/radio/main.c index 59b86983..18c34e4c 100644 --- a/demos/modules/gwin/radio/main.c +++ b/demos/modules/gwin/radio/main.c @@ -81,7 +81,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h index 9d55d29f..367a87f5 100644 --- a/demos/modules/gwin/slider/gfxconf.h +++ b/demos/modules/gwin/slider/gfxconf.h @@ -31,40 +31,40 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER GFXON +#define GFX_USE_GQUEUE GFXON /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_SLIDER TRUE -#define GWIN_NEED_CONSOLE TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_SLIDER GFXON +#define GWIN_NEED_CONSOLE GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON /* Features for the GQUEUE subsystem. */ -#define GQUEUE_NEED_ASYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/slider/main.c b/demos/modules/gwin/slider/main.c index 66cd7a1b..5e90c554 100644 --- a/demos/modules/gwin/slider/main.c +++ b/demos/modules/gwin/slider/main.c @@ -70,12 +70,12 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); - gwinSetColor(ghConsole, Green); - gwinSetBgColor(ghConsole, White); + gwinSetColor(ghConsole, GFX_GREEN); + gwinSetBgColor(ghConsole, GFX_WHITE); gwinClear(ghConsole); // We want to listen for widget events diff --git a/demos/modules/gwin/tabset/gfxconf.h b/demos/modules/gwin/tabset/gfxconf.h index 72d257f1..916b9ffd 100644 --- a/demos/modules/gwin/tabset/gfxconf.h +++ b/demos/modules/gwin/tabset/gfxconf.h @@ -17,80 +17,80 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_MULTITHREAD GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE +#define GFX_USE_GWIN GFXON -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_LABEL TRUE -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE - #define GWIN_NEED_TABSET TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_LABEL GFXON +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON + #define GWIN_NEED_TABSET GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE -#define GQUEUE_NEED_GSYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON +#define GQUEUE_NEED_GSYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE -#define GINPUT_NEED_MOUSE TRUE +#define GFX_USE_GINPUT GFXON +#define GINPUT_NEED_MOUSE GFXON /////////////////////////////////////////////////////////////////////////// // GADC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GADC FALSE +#define GFX_USE_GADC GFXOFF /////////////////////////////////////////////////////////////////////////// // GAUDIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDIN FALSE +#define GFX_USE_GAUDIN GFXOFF /////////////////////////////////////////////////////////////////////////// // GAUDOUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GAUDOUT FALSE +#define GFX_USE_GAUDOUT GFXOFF /////////////////////////////////////////////////////////////////////////// // GMISC // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GMISC FALSE +#define GFX_USE_GMISC GFXOFF #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/tabset/main.c b/demos/modules/gwin/tabset/main.c index f70ab909..c4472c39 100644 --- a/demos/modules/gwin/tabset/main.c +++ b/demos/modules/gwin/tabset/main.c @@ -76,7 +76,7 @@ int main(void) { // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("UI2")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // create the widget createWidgets(); diff --git a/demos/modules/gwin/textedit/gfxconf.h b/demos/modules/gwin/textedit/gfxconf.h index 263ae035..482b9e94 100644 --- a/demos/modules/gwin/textedit/gfxconf.h +++ b/demos/modules/gwin/textedit/gfxconf.h @@ -31,46 +31,46 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER 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_TEXT_KERNING TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_TEXT_KERNING GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_NEED_TEXTEDIT TRUE -#define GWIN_NEED_BUTTON TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_NEED_TEXTEDIT GFXON +#define GWIN_NEED_BUTTON GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON /* One or both of these */ -//#define GINPUT_NEED_KEYBOARD TRUE -#define GWIN_NEED_KEYBOARD TRUE +//#define GINPUT_NEED_KEYBOARD GFXON +#define GWIN_NEED_KEYBOARD GFXON /* Features for the GQUEUE subsystem. */ -#define GFX_USE_GQUEUE TRUE -#define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON +#define GQUEUE_NEED_ASYNC GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/textedit/main.c b/demos/modules/gwin/textedit/main.c index 4072f983..b3fafcf0 100644 --- a/demos/modules/gwin/textedit/main.c +++ b/demos/modules/gwin/textedit/main.c @@ -50,8 +50,8 @@ static void guiCreate(void) wi.g.width = gdispGetWidth()/2; wi.g.height = gdispGetHeight(); ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Yellow); - gwinSetBgColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_YELLOW); + gwinSetBgColor(ghConsole, GFX_BLACK); gwinSetFont(ghConsole, gdispOpenFont("UI2")); gwinClear(ghConsole); @@ -102,11 +102,11 @@ int main(void) { gfxInit(); - gdispClear(Silver); + gdispClear(GFX_SILVER); gwinSetDefaultFont(gdispOpenFont("DejaVuSans16")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gwinSetDefaultColor(Black); - gwinSetDefaultBgColor(White); + gwinSetDefaultColor(GFX_BLACK); + gwinSetDefaultBgColor(GFX_WHITE); geventListenerInit(&gl); geventAttachSource(&gl, ginputGetKeyboard(0), GLISTEN_KEYTRANSITIONS|GLISTEN_KEYUP); diff --git a/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h b/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h index 05790758..37a83c89 100644 --- a/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h +++ b/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h @@ -31,46 +31,46 @@ #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_GINPUT TRUE -#define GFX_USE_GEVENT TRUE -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GDISP GFXON +#define GFX_USE_GWIN GFXON +#define GFX_USE_GINPUT GFXON +#define GFX_USE_GEVENT GFXON +#define GFX_USE_GTIMER 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_TEXT_KERNING TRUE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_TEXT_KERNING GFXON +#define GDISP_NEED_MULTITHREAD GFXON /* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON +#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON /* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_CONSOLE TRUE -#define GWIN_NEED_TEXTEDIT TRUE -#define GWIN_NEED_BUTTON TRUE +#define GWIN_NEED_WINDOWMANAGER GFXON +#define GWIN_NEED_WIDGET GFXON +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_NEED_TEXTEDIT GFXON +#define GWIN_NEED_BUTTON GFXON /* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON /* One or both of these */ -#define GINPUT_NEED_KEYBOARD FALSE -#define GWIN_NEED_KEYBOARD TRUE +#define GINPUT_NEED_KEYBOARD GFXOFF +#define GWIN_NEED_KEYBOARD GFXON /* Features for the GQUEUE subsystem. */ -#define GFX_USE_GQUEUE TRUE -#define GQUEUE_NEED_ASYNC TRUE +#define GFX_USE_GQUEUE GFXON +#define GQUEUE_NEED_ASYNC GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/textedit_virtual_keyboard/main.c b/demos/modules/gwin/textedit_virtual_keyboard/main.c index 7b89423f..6bc29a57 100644 --- a/demos/modules/gwin/textedit_virtual_keyboard/main.c +++ b/demos/modules/gwin/textedit_virtual_keyboard/main.c @@ -80,11 +80,11 @@ int main(void) { gfxInit(); - gdispClear(Silver); + gdispClear(GFX_SILVER); gwinSetDefaultFont(gdispOpenFont("DejaVuSans16")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gwinSetDefaultColor(Black); - gwinSetDefaultBgColor(White); + gwinSetDefaultColor(GFX_BLACK); + gwinSetDefaultBgColor(GFX_WHITE); geventListenerInit(&gl); geventAttachSource(&gl, ginputGetKeyboard(0), 0); diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 4ba2c21d..79ef8795 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -19,100 +19,100 @@ #define _GFXCONF_H /* The operating system to use. One of these must be defined - preferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_LINUX TRUE -//#define GFX_USE_OS_OSX TRUE +//#define GFX_USE_OS_CHIBIOS GFXON +//#define GFX_USE_OS_WIN32 GFXON +//#define GFX_USE_OS_LINUX GFXON +//#define GFX_USE_OS_OSX GFXON /////////////////////////////////////////////////////////////////////////// // GDISP // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GDISP TRUE +#define GFX_USE_GDISP GFXON -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_CIRCLE TRUE -#define GDISP_NEED_CONVEX_POLYGON TRUE -//#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_TEXT TRUE - #define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_CLIP GFXON +#define GDISP_NEED_CIRCLE GFXON +#define GDISP_NEED_CONVEX_POLYGON GFXON +//#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_TEXT GFXON + #define GDISP_INCLUDE_FONT_UI2 GFXON -#define GDISP_NEED_IMAGE TRUE - #define GDISP_NEED_IMAGE_GIF TRUE +#define GDISP_NEED_IMAGE GFXON + #define GDISP_NEED_IMAGE_GIF GFXON #define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE -#define GDISP_NEED_MULTITHREAD TRUE +#define GDISP_NEED_MULTITHREAD GFXON /////////////////////////////////////////////////////////////////////////// // GWIN // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GWIN TRUE - -#define GWIN_NEED_WINDOWMANAGER TRUE - #define GWIN_NEED_FLASHING TRUE - -#define GWIN_NEED_CONSOLE TRUE - #define GWIN_CONSOLE_USE_HISTORY TRUE - #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE - #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE -#define GWIN_NEED_GRAPH TRUE - -#define GWIN_NEED_WIDGET TRUE - #define GWIN_NEED_LABEL TRUE - #define GWIN_LABEL_ATTRIBUTE TRUE - #define GWIN_NEED_BUTTON TRUE -// #define GWIN_BUTTON_LAZY_RELEASE TRUE - #define GWIN_NEED_SLIDER TRUE - #define GWIN_NEED_CHECKBOX TRUE - #define GWIN_NEED_IMAGE TRUE - #define GWIN_NEED_RADIO TRUE - #define GWIN_NEED_LIST TRUE - #define GWIN_NEED_LIST_IMAGES TRUE - #define GWIN_NEED_PROGRESSBAR TRUE - #define GWIN_PROGRESSBAR_AUTO TRUE - -#define GWIN_NEED_CONTAINERS TRUE - #define GWIN_NEED_CONTAINER TRUE - -#define GWIN_NEED_TABSET TRUE +#define GFX_USE_GWIN GFXON + +#define GWIN_NEED_WINDOWMANAGER GFXON + #define GWIN_NEED_FLASHING GFXON + +#define GWIN_NEED_CONSOLE GFXON + #define GWIN_CONSOLE_USE_HISTORY GFXON + #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON + #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON +#define GWIN_NEED_GRAPH GFXON + +#define GWIN_NEED_WIDGET GFXON + #define GWIN_NEED_LABEL GFXON + #define GWIN_LABEL_ATTRIBUTE GFXON + #define GWIN_NEED_BUTTON GFXON +// #define GWIN_BUTTON_LAZY_RELEASE GFXON + #define GWIN_NEED_SLIDER GFXON + #define GWIN_NEED_CHECKBOX GFXON + #define GWIN_NEED_IMAGE GFXON + #define GWIN_NEED_RADIO GFXON + #define GWIN_NEED_LIST GFXON + #define GWIN_NEED_LIST_IMAGES GFXON + #define GWIN_NEED_PROGRESSBAR GFXON + #define GWIN_PROGRESSBAR_AUTO GFXON + +#define GWIN_NEED_CONTAINERS GFXON + #define GWIN_NEED_CONTAINER GFXON + +#define GWIN_NEED_TABSET GFXON /////////////////////////////////////////////////////////////////////////// // GEVENT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GEVENT TRUE +#define GFX_USE_GEVENT GFXON /////////////////////////////////////////////////////////////////////////// // GTIMER // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GTIMER TRUE +#define GFX_USE_GTIMER GFXON /////////////////////////////////////////////////////////////////////////// // GQUEUE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GQUEUE TRUE +#define GFX_USE_GQUEUE GFXON -#define GQUEUE_NEED_ASYNC TRUE +#define GQUEUE_NEED_ASYNC GFXON /////////////////////////////////////////////////////////////////////////// // GINPUT // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GINPUT GFXON -#define GINPUT_NEED_MOUSE TRUE -//#define GINPUT_NEED_TOGGLE TRUE -//#define GINPUT_NEED_DIAL TRUE +#define GINPUT_NEED_MOUSE GFXON +//#define GINPUT_NEED_TOGGLE GFXON +//#define GINPUT_NEED_DIAL GFXON /////////////////////////////////////////////////////////////////////////// // GFILE // /////////////////////////////////////////////////////////////////////////// -#define GFX_USE_GFILE TRUE +#define GFX_USE_GFILE GFXON -#define GFILE_NEED_PRINTG TRUE -#define GFILE_NEED_STRINGS TRUE +#define GFILE_NEED_PRINTG GFXON +#define GFILE_NEED_STRINGS GFXON -#define GFILE_NEED_ROMFS TRUE -//#define GFILE_NEED_NATIVEFS TRUE +#define GFILE_NEED_ROMFS GFXON +//#define GFILE_NEED_NATIVEFS GFXON #endif /* _GFXCONF_H */ diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 8252002b..5f98387e 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -48,7 +48,7 @@ /* Our custom yellow style */ static const GWidgetStyle YellowWidgetStyle = { - Yellow, // window background + GFX_YELLOW, // window background HTML2COLOR(0x800000), // focus // enabled color set @@ -225,7 +225,7 @@ static void createWidgets(void) { wi.g.x = pagewidth; wi.g.width = pagewidth; ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_BLACK); gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0)); #else @@ -268,7 +268,7 @@ static void createWidgets(void) { wi.g.x = ScrWidth/2+border; wi.g.width = ScrWidth/2 - 2*border; ghConsole = gwinConsoleCreate(0, &wi.g); - gwinSetColor(ghConsole, Black); + gwinSetColor(ghConsole, GFX_BLACK); gwinSetBgColor(ghConsole, HTML2COLOR(0xF0F0F0)); pagewidth = gwinGetInnerWidth(ghPgButtons); @@ -504,7 +504,7 @@ int main(void) { font = gdispOpenFont("*"); // Get the first defined font. gwinSetDefaultFont(font); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); - gdispClear(White); + gdispClear(GFX_WHITE); // Create the gwin windows/widgets createWidgets(); diff --git a/demos/tools/touch_calibration_grabber/gfxconf.h b/demos/tools/touch_calibration_grabber/gfxconf.h index c073a5d3..b21ffad4 100644 --- a/demos/tools/touch_calibration_grabber/gfxconf.h +++ b/demos/tools/touch_calibration_grabber/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_CONSOLE_USE_FLOAT TRUE +#define GWIN_NEED_CONSOLE GFXON +#define GWIN_CONSOLE_USE_FLOAT GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON #endif /* _GFXCONF_H */ diff --git a/demos/tools/touch_calibration_grabber/main.c b/demos/tools/touch_calibration_grabber/main.c index 3ce791ee..9f16bb90 100644 --- a/demos/tools/touch_calibration_grabber/main.c +++ b/demos/tools/touch_calibration_grabber/main.c @@ -56,7 +56,7 @@ int main(void) { font = gdispOpenFont("UI2"); gwinSetDefaultFont(font); bHeight = gdispGetFontMetric(font, fontHeight)+4; - gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, Red, White, justifyCenter); + gdispFillStringBox(0, 0, swidth, bHeight, "Touchscreen Calibration Grabber", font, GFX_RED, GFX_WHITE, justifyCenter); // Create our main display writing window { 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 diff --git a/demos/tools/touch_raw_readings/gfxconf.h b/demos/tools/touch_raw_readings/gfxconf.h index 3d93a138..dd278222 100644 --- a/demos/tools/touch_raw_readings/gfxconf.h +++ b/demos/tools/touch_raw_readings/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_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index fb1b0772..27c799f7 100644 --- a/demos/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c @@ -61,7 +61,7 @@ int main(void) { font = gdispOpenFont("UI2"); gwinSetDefaultFont(font); bHeight = gdispGetFontMetric(font, fontHeight)+4; - gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, Red, White, justifyCenter); + gdispFillStringBox(0, 0, swidth, bHeight, "Raw Touch Readings", font, GFX_RED, GFX_WHITE, justifyCenter); // Create our main display writing window { diff --git a/demos/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h index 4df44bc4..4cbe4981 100644 --- a/demos/tools/uGFXnetDisplay/gfxconf.h +++ b/demos/tools/uGFXnetDisplay/gfxconf.h @@ -9,30 +9,30 @@ #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_GEVENT TRUE -#define GFX_USE_GTIMER TRUE -#define GFX_USE_GINPUT TRUE +#define GFX_USE_GDISP 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_TEXT TRUE -#define GDISP_NEED_CONTROL TRUE -#define GDISP_NEED_SCROLL TRUE -#define GDISP_NEED_PIXELREAD TRUE -#define GDISP_NEED_STREAMING TRUE +#define GDISP_NEED_VALIDATION GFXON +#define GDISP_NEED_TEXT GFXON +#define GDISP_NEED_CONTROL GFXON +#define GDISP_NEED_SCROLL GFXON +#define GDISP_NEED_PIXELREAD GFXON +#define GDISP_NEED_STREAMING GFXON /* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_UI2 TRUE +#define GDISP_INCLUDE_FONT_UI2 GFXON /* Features for the GINPUT sub-system. */ -#define GINPUT_NEED_MOUSE TRUE +#define GINPUT_NEED_MOUSE GFXON /* We need to use this specific pixel format to match the network protocol */ #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c index 26ae4b89..6f4ad4b6 100644 --- a/demos/tools/uGFXnetDisplay/main.c +++ b/demos/tools/uGFXnetDisplay/main.c @@ -20,14 +20,14 @@ // Do we wish to use old style socket calls. Some socket libraries only support the old version. // It is better to use the new version where possible however as it also supports IPv6. #ifndef OLD_STYLE_SOCKETS - #define OLD_STYLE_SOCKETS FALSE + #define OLD_STYLE_SOCKETS GFXOFF #endif // Which operating systems support a command line #if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_OSX || GFX_USE_OS_LINUX - #define EMBEDED_OS FALSE + #define EMBEDED_OS GFXOFF #else - #define EMBEDED_OS TRUE + #define EMBEDED_OS GFXON #endif #if GNETCODE_VERSION != GNETCODE_VERSION_1_0 @@ -103,7 +103,7 @@ COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.") #endif #undef GDISP_GFXNET_UNSAFE_SOCKETS - #define GDISP_GFXNET_UNSAFE_SOCKETS TRUE + #define GDISP_GFXNET_UNSAFE_SOCKETS GFXON #endif #endif @@ -336,12 +336,12 @@ int main(proto_args) { font = gdispOpenFont("UI2"); // Open the connection - gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, White, justifyCenter); + gdispDrawStringBox(0, 0, gdispGetWidth(), gdispGetHeight(), "Connecting to host...", font, GFX_WHITE, justifyCenter); StartSockets(); netfd = doConnect(cmd_args); if (netfd == (SOCKET_TYPE)-1) gfxHalt("Could not connect to the specified server"); - gdispClear(Black); + gdispClear(GFX_BLACK); // Get the initial packet from the host if (!getpkt(cmd, 2)) goto alldone; @@ -395,7 +395,7 @@ int main(proto_args) { #if GDISP_NEED_SCROLL case GNETCODE_SCROLL: if (!getpkt(cmd, 5)) goto alldone; // cmd[] = x, y, cx, cy, lines - gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], Black); + gdispVerticalScroll(cmd[0], cmd[1], cmd[2], cmd[3], cmd[4], GFX_BLACK); break; #endif case GNETCODE_CONTROL: |