From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 27 Feb 2018 17:44:21 +1000 Subject: First set of V3 macro changes --- demos/3rdparty/bubbles/gfxconf.h | 44 ++++---- demos/3rdparty/notepad-2/gfxconf.h | 76 +++++++------- demos/applications/combo/bounce.c | 4 +- demos/applications/combo/gfxconf.h | 114 ++++++++++---------- demos/applications/mandelbrot/gfxconf.h | 12 +-- demos/applications/notepad/gfxconf.h | 34 +++--- demos/benchmarks/gfxconf.h | 20 ++-- demos/games/justget10/demo.mk | 2 +- demos/games/justget10/gfxconf.h | 82 +++++++-------- demos/games/minesweeper/demo.mk | 2 +- demos/games/minesweeper/gfxconf.h | 45 ++++---- demos/games/minesweeper/readme.txt | 2 +- .../tetris/Example_Makefiles/stm32f4/Makefile | 2 +- demos/games/tetris/gfxconf.h | 40 +++---- demos/modules/gadc/gfxconf.h | 28 ++--- demos/modules/gaudio/oscilloscope/gfxconf.h | 24 ++--- demos/modules/gaudio/play-vs1053/gfxconf.h | 24 ++--- demos/modules/gaudio/play-wave/gfxconf.h | 24 ++--- demos/modules/gdisp/arcsectors/gfxconf.h | 14 +-- demos/modules/gdisp/basics/gfxconf.h | 14 +-- demos/modules/gdisp/circles/gfxconf.h | 26 ++--- demos/modules/gdisp/fonts/gfxconf.h | 58 +++++------ demos/modules/gdisp/fonts_cyrillic/gfxconf.h | 28 ++--- demos/modules/gdisp/images/gfxconf.h | 34 +++--- demos/modules/gdisp/images_animated/gfxconf.h | 32 +++--- demos/modules/gdisp/images_animated/main.c | 2 +- demos/modules/gdisp/images_palettes/gfxconf.h | 34 +++--- demos/modules/gdisp/images_palettes/main.c | 2 +- demos/modules/gdisp/multiple_displays/gfxconf.h | 36 +++---- demos/modules/gdisp/multiple_displays/main.c | 2 +- demos/modules/gdisp/pixmap/gfxconf.h | 16 +-- demos/modules/gdisp/polygons/gfxconf.h | 26 ++--- demos/modules/gdisp/streaming/gfxconf.h | 24 ++--- demos/modules/gdisp/streaming/main.c | 4 +- demos/modules/gdisp/thickarcs/gfxconf.h | 14 +-- demos/modules/gfile/fatfs/gfxconf.h | 8 +- demos/modules/ginput/keyboard/gfxconf.h | 30 +++--- demos/modules/gos/threads/gfxconf.h | 18 ++-- demos/modules/gos/threads_advanced/gfxconf.h | 20 ++-- demos/modules/gtimer/gfxconf.h | 10 +- demos/modules/gtrans/basic/gfxconf.h | 26 ++--- demos/modules/gwin/basic/gfxconf.h | 18 ++-- demos/modules/gwin/button/gfxconf.h | 38 +++---- demos/modules/gwin/checkbox/gfxconf.h | 36 +++---- demos/modules/gwin/console/gfxconf.h | 34 +++--- demos/modules/gwin/container/gfxconf.h | 68 ++++++------ demos/modules/gwin/container_nested/gfxconf.h | 70 ++++++------- demos/modules/gwin/frame/gfxconf.h | 52 ++++----- demos/modules/gwin/gl3d-gears/gfxconf.h | 18 ++-- demos/modules/gwin/gl3d-spin/gfxconf.h | 18 ++-- demos/modules/gwin/graph/gfxconf.h | 32 +++--- demos/modules/gwin/imagebox/gfxconf.h | 58 +++++------ demos/modules/gwin/keyboard/gfxconf.h | 48 ++++----- demos/modules/gwin/label/gfxconf.h | 48 ++++----- demos/modules/gwin/list/gfxconf.h | 54 +++++----- demos/modules/gwin/progressbar/gfxconf.h | 94 ++++++++--------- demos/modules/gwin/radio/gfxconf.h | 36 +++---- demos/modules/gwin/slider/gfxconf.h | 44 ++++---- demos/modules/gwin/tabset/gfxconf.h | 56 +++++----- demos/modules/gwin/textedit/gfxconf.h | 52 ++++----- .../gwin/textedit_virtual_keyboard/gfxconf.h | 52 ++++----- demos/modules/gwin/widgets/gfxconf.h | 116 ++++++++++----------- demos/tools/touch_calibration_grabber/gfxconf.h | 34 +++--- demos/tools/touch_driver_test/gfxconf.h | 34 +++--- demos/tools/touch_raw_readings/gfxconf.h | 34 +++--- demos/tools/uGFXnetDisplay/gfxconf.h | 32 +++--- demos/tools/uGFXnetDisplay/main.c | 8 +- 67 files changed, 1120 insertions(+), 1121 deletions(-) (limited to 'demos') 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/applications/combo/bounce.c b/demos/applications/combo/bounce.c index f0b78266..54938414 100644 --- a/demos/applications/combo/bounce.c +++ b/demos/applications/combo/bounce.c @@ -48,11 +48,11 @@ 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 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/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/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/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/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/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/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/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/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-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/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/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/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/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_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/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..5f24c0fc 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; 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..ceb9534f 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" 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..8c590f6d 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) { 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/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/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..be94608f 100644 --- a/demos/modules/gdisp/streaming/main.c +++ b/demos/modules/gdisp/streaming/main.c @@ -42,11 +42,11 @@ * 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 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/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/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/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/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/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/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/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_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/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/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-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/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/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/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/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/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/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/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/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/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/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_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/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/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_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_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/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..69703825 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 -- cgit v1.2.3