First set of V3 macro changes

17 files changed, 94 insertions, 94 deletions

diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c
index e833b99e..5e2661a3 100644
--- a/drivers/multiple/SDL/gdisp_lld_SDL.c
+++ b/drivers/multiple/SDL/gdisp_lld_SDL.c
@@ -25,7 +25,7 @@
 #include "../../../src/gdisp/gdisp_driver.h"
 
 #ifndef GDISP_FORCE_24BIT
-	#define GDISP_FORCE_24BIT			FALSE
+	#define GDISP_FORCE_24BIT			GFXOFF
 #endif
 #ifndef GDISP_SCREEN_WIDTH
 	#define GDISP_SCREEN_WIDTH			640
diff --git a/drivers/multiple/SDL/gdisp_lld_config.h b/drivers/multiple/SDL/gdisp_lld_config.h
index 22fc4180..4a1af08e 100644
--- a/drivers/multiple/SDL/gdisp_lld_config.h
+++ b/drivers/multiple/SDL/gdisp_lld_config.h
@@ -12,12 +12,12 @@
 /* Driver hardware support.                                                  */
 /*===========================================================================*/
 
-#define GDISP_HARDWARE_DRAWPIXEL		TRUE
-#define GDISP_HARDWARE_FILLS			TRUE
-#define GDISP_HARDWARE_BITFILLS			FALSE
-#define GDISP_HARDWARE_SCROLL			FALSE
-#define GDISP_HARDWARE_PIXELREAD		TRUE
-#define GDISP_HARDWARE_CONTROL			FALSE
+#define GDISP_HARDWARE_DRAWPIXEL		GFXON
+#define GDISP_HARDWARE_FILLS			GFXON
+#define GDISP_HARDWARE_BITFILLS			GFXOFF
+#define GDISP_HARDWARE_SCROLL			GFXOFF
+#define GDISP_HARDWARE_PIXELREAD		GFXON
+#define GDISP_HARDWARE_CONTROL			GFXOFF
 
 #define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_RGB888
 
diff --git a/drivers/multiple/SDL/readme.txt b/drivers/multiple/SDL/readme.txt
index 3bbaec59..9e9530d9 100644
--- a/drivers/multiple/SDL/readme.txt
+++ b/drivers/multiple/SDL/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
 and a touchscreen driver.
 
 1. Add in your gfxconf.h:
-	a) #define GFX_USE_GDISP			TRUE
-	b) #define GFX_USE_GINPUT			TRUE
-		#define GINPUT_USE_MOUSE		TRUE
+	a) #define GFX_USE_GDISP			GFXON
+	b) #define GFX_USE_GINPUT			GFXON
+		#define GINPUT_USE_MOUSE		GFXON
 	c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
 	d) Optionally the following (with appropriate values):
 		#define GDISP_SCREEN_WIDTH	640
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index a724769d..0ce0f25a 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -25,7 +25,7 @@
 #endif
 #ifndef GDISP_WIN32_USE_INDIRECT_UPDATE
 	/**
-	 * Setting this to TRUE delays updating the screen
+	 * Setting this to GFXON delays updating the screen
 	 * to the windows paint routine. Due to the
 	 * drawing lock this does not add as much speed
 	 * as might be expected but it is still faster in
@@ -37,20 +37,20 @@
 	 * if you are debugging drawing and want to see each
 	 * pixel as it is set.
 	 */
-	#define GDISP_WIN32_USE_INDIRECT_UPDATE		TRUE
+	#define GDISP_WIN32_USE_INDIRECT_UPDATE		GFXON
 #endif
 #ifndef GKEYBOARD_WIN32_NO_LAYOUT
 	/**
-	 * Setting this to TRUE turns off the layout engine.
+	 * Setting this to GFXON turns off the layout engine.
 	 * In this situation "cooked" characters are returned but
 	 * shift states etc are lost.
 	 * As only a limited number of keyboard layouts are currently
 	 * defined for Win32 in uGFX (currently only US English), setting this
-	 * to TRUE enables the windows keyboard mapping to be pass non-English
+	 * to GFXON enables the windows keyboard mapping to be pass non-English
 	 * characters to uGFX or to handle non-standard keyboard layouts at
 	 * the expense of losing special function keys etc.
 	 */
-	#define GKEYBOARD_WIN32_NO_LAYOUT			FALSE
+	#define GKEYBOARD_WIN32_NO_LAYOUT			GFXOFF
 #endif
 #ifndef GKEYBOARD_WIN32_DEFAULT_LAYOUT
 	#define GKEYBOARD_WIN32_DEFAULT_LAYOUT		KeyboardLayout_Win32_US
@@ -136,7 +136,7 @@
 
 	#if !GKEYBOARD_WIN32_NO_LAYOUT
 		#if GKEYBOARD_LAYOUT_OFF
-			#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
+			#error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=GFXOFF or GKEYBOARD_WIN32_NO_LAYOUT=GFXON."
 		#endif
 
 		#include "../../../src/ginput/ginput_keyboard_microcode.h"
@@ -381,9 +381,9 @@
 		};
 	#elif !GKEYBOARD_LAYOUT_OFF
 		#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
-			#warning "The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size."
+			#warning "The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size."
 		#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
-			COMPILER_WARNING("The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size.")
+			COMPILER_WARNING("The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size.")
 		#endif
 	#endif
 
@@ -467,7 +467,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
 		priv->mousebuttons = buttons;
 		priv->mousex = x;
 		priv->mousey = y;
-		if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL))		// For normal setup this is always TRUE
+		if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL))		// For normal setup this is always true
 			_gmouseWakeup(priv->mouse);
 	}
 	void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled) {
@@ -634,7 +634,7 @@ static LRESULT myWindowProc(HWND hWnd,	UINT Msg, WPARAM wParam, LPARAM lParam)
 				priv->mousebuttons = btns;
 				priv->mousex = (coord_t)LOWORD(lParam);
 				priv->mousey = (coord_t)HIWORD(lParam);
-				if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL))		// For normal setup this is always TRUE
+				if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL))		// For normal setup this is always true
 					_gmouseWakeup(priv->mouse);
 			}
 			break;
@@ -652,7 +652,7 @@ static LRESULT myWindowProc(HWND hWnd,	UINT Msg, WPARAM wParam, LPARAM lParam)
 				else if (HIWORD(lParam) & KF_REPEAT)
 					keybuffer[keypos++] = 0x01;			// Repeat
 				keybuffer[keypos++] = wParam;
-				if ((gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL))		// For normal setup this is always TRUE
+				if ((gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL))		// For normal setup this is always true
 					_gkeyboardWakeup(keyboard);
 			}
 			return 0;
@@ -666,7 +666,7 @@ static LRESULT myWindowProc(HWND hWnd,	UINT Msg, WPARAM wParam, LPARAM lParam)
 				w = wParam;
 				len = WideCharToMultiByte(CP_UTF8, 0, &w, 1, (char *)(keybuffer+keypos), sizeof(keybuffer)-keypos, 0, 0);
 				keypos += len;
-				if (len && (gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL))		// For normal setup this is always TRUE
+				if (len && (gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL))		// For normal setup this is always true
 					_gkeyboardWakeup(keyboard);
 			}
 			return 0;
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index 4178a948..710cd3fb 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -17,31 +17,31 @@
 // Calling gdispGFlush() is optional for this driver but can be used by the
 //	application to force a display update. eg after streaming.
 
-#define GDISP_HARDWARE_FLUSH			TRUE
-#define GDISP_HARDWARE_CONTROL			TRUE
+#define GDISP_HARDWARE_FLUSH			GFXON
+#define GDISP_HARDWARE_CONTROL			GFXON
 
 //#define GDISP_WIN32_STREAMING_TEST
 #ifdef GDISP_WIN32_STREAMING_TEST
 	// These streaming routines are here only to debug the high level gdisp
 	//	code for streaming controllers. They are slow, inefficient and have
 	//	lots of debugging turned on.
-	#define GDISP_HARDWARE_STREAM_WRITE		TRUE
-	#define GDISP_HARDWARE_STREAM_READ		TRUE
-	#define GDISP_HARDWARE_STREAM_POS		TRUE
+	#define GDISP_HARDWARE_STREAM_WRITE		GFXON
+	#define GDISP_HARDWARE_STREAM_READ		GFXON
+	#define GDISP_HARDWARE_STREAM_POS		GFXON
 #else
 	// The proper way on the Win32. These routines are nice and fast.
-	#define GDISP_HARDWARE_DRAWPIXEL		TRUE
-	#define GDISP_HARDWARE_FILLS			TRUE
-	#define GDISP_HARDWARE_PIXELREAD		TRUE
-	#define GDISP_HARDWARE_SCROLL			TRUE
+	#define GDISP_HARDWARE_DRAWPIXEL		GFXON
+	#define GDISP_HARDWARE_FILLS			GFXON
+	#define GDISP_HARDWARE_PIXELREAD		GFXON
+	#define GDISP_HARDWARE_SCROLL			GFXON
 
 	// Bit-blits on Win32 are currently only supported for True-Color bit-depths greater than 8 bits
 	// Note: At the time this file is included we have not calculated all our color
 	//			definitions so we need to do this by hand.
 	#if !defined(GDISP_PIXELFORMAT)
-		#define GDISP_HARDWARE_BITFILLS			TRUE
+		#define GDISP_HARDWARE_BITFILLS			GFXON
 	#elif (GDISP_PIXELFORMAT & 0x2000) && (((GDISP_PIXELFORMAT & 0x0F00)>>8)+((GDISP_PIXELFORMAT & 0x00F0)>>4)+((GDISP_PIXELFORMAT & 0x000F))) > 8
-		#define GDISP_HARDWARE_BITFILLS			TRUE
+		#define GDISP_HARDWARE_BITFILLS			GFXON
 	#endif
 #endif
 
diff --git a/drivers/multiple/Win32/readme.txt b/drivers/multiple/Win32/readme.txt
index 932deb8b..47080f73 100644
--- a/drivers/multiple/Win32/readme.txt
+++ b/drivers/multiple/Win32/readme.txt
@@ -4,10 +4,10 @@ This driver is special in that it implements both the gdisp low level driver,
 optionally a touchscreen driver, and optionally a toggle driver.

 

 1. Add in your gfxconf.h:

-	a) #define GFX_USE_GDISP			TRUE

-	b) Optionally #define GFX_USE_GINPUT			TRUE

-					#define GINPUT_USE_MOUSE		TRUE

-					#define GINPUT_USE_TOGGLE		TRUE

+	a) #define GFX_USE_GDISP			GFXON

+	b) Optionally #define GFX_USE_GINPUT			GFXON

+					#define GINPUT_USE_MOUSE		GFXON

+					#define GINPUT_USE_TOGGLE		GFXON

 	c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD

 	d) Optionally the following (with appropriate values):

 		#define GDISP_SCREEN_WIDTH	640

diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index 0d471d09..f27795a8 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -24,7 +24,7 @@
 
 // Configuration parameters for this driver
 #ifndef GDISP_FORCE_24BIT
-	#define GDISP_FORCE_24BIT			FALSE
+	#define GDISP_FORCE_24BIT			GFXOFF
 #endif
 #ifndef GDISP_SCREEN_WIDTH
 	#define GDISP_SCREEN_WIDTH			640
@@ -34,17 +34,17 @@
 #endif
 #ifndef GKEYBOARD_X_NO_LAYOUT
 	/**
-	 * Setting this to TRUE turns off the layout engine.
+	 * Setting this to GFXON turns off the layout engine.
 	 * In this situation "cooked" characters are returned but
 	 * shift states etc are lost.
 	 * As only a limited number of keyboard layouts are currently
 	 * defined for X in uGFX (currently none), setting this
-	 * to TRUE enables the X keyboard mapping to be pass non-English
+	 * to GFXON enables the X keyboard mapping to be pass non-English
 	 * characters to uGFX or to handle non-standard keyboard layouts at
 	 * the expense of losing special function keys etc.
 	 */
-	// We set this to TRUE by default as currently the X layout code is not complete!
-	#define GKEYBOARD_X_NO_LAYOUT		TRUE
+	// We set this to GFXON by default as currently the X layout code is not complete!
+	#define GKEYBOARD_X_NO_LAYOUT		GFXON
 #endif
 #ifndef GKEYBOARD_X_DEFAULT_LAYOUT
 	#define GKEYBOARD_X_DEFAULT_LAYOUT	KeyboardLayout_X_US
@@ -102,7 +102,7 @@
 
 	#if !GKEYBOARD_X_NO_LAYOUT
 		#if GKEYBOARD_LAYOUT_OFF
-			#error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_X_NO_LAYOUT=TRUE."
+			#error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=GFXOFF or GKEYBOARD_X_NO_LAYOUT=GFXON."
 		#endif
 
 		// Forward definitions
@@ -133,9 +133,9 @@
 		};
 	#elif !GKEYBOARD_LAYOUT_OFF
 		#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
-			#warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size."
+			#warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size."
 		#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
-			COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size.")
+			COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size.")
 		#endif
 	#endif
 
diff --git a/drivers/multiple/X/gdisp_lld_config.h b/drivers/multiple/X/gdisp_lld_config.h
index 55d61d74..87aca5cf 100644
--- a/drivers/multiple/X/gdisp_lld_config.h
+++ b/drivers/multiple/X/gdisp_lld_config.h
@@ -14,12 +14,12 @@
 /* Driver hardware support.                                                  */
 /*===========================================================================*/
 
-#define GDISP_HARDWARE_DRAWPIXEL		TRUE
-#define GDISP_HARDWARE_FILLS			TRUE
-#define GDISP_HARDWARE_BITFILLS			FALSE
-#define GDISP_HARDWARE_SCROLL			TRUE
-#define GDISP_HARDWARE_PIXELREAD		TRUE
-#define GDISP_HARDWARE_CONTROL			FALSE
+#define GDISP_HARDWARE_DRAWPIXEL		GFXON
+#define GDISP_HARDWARE_FILLS			GFXON
+#define GDISP_HARDWARE_BITFILLS			GFXOFF
+#define GDISP_HARDWARE_SCROLL			GFXON
+#define GDISP_HARDWARE_PIXELREAD		GFXON
+#define GDISP_HARDWARE_CONTROL			GFXOFF
 
 #define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_RGB888
 
diff --git a/drivers/multiple/X/readme.txt b/drivers/multiple/X/readme.txt
index b26dce5d..622b7334 100644
--- a/drivers/multiple/X/readme.txt
+++ b/drivers/multiple/X/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
 and a touchscreen driver.
 
 1. Add in your gfxconf.h:
-	a) #define GFX_USE_GDISP			TRUE
-	b) #define GFX_USE_GINPUT			TRUE
-		#define GINPUT_USE_MOUSE		TRUE
+	a) #define GFX_USE_GDISP			GFXON
+	b) #define GFX_USE_GINPUT			GFXON
+		#define GINPUT_USE_MOUSE		GFXON
 	c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
 	d) Optionally the following (with appropriate values):
 		#define GDISP_SCREEN_WIDTH	640
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_config.h b/drivers/multiple/uGFXnet/gdisp_lld_config.h
index e181d91e..1d2056f6 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_config.h
+++ b/drivers/multiple/uGFXnet/gdisp_lld_config.h
@@ -17,13 +17,13 @@
 // Calling gdispGFlush() is optional for this driver but can be used by the
 //	application to force a display update. eg after streaming.
 
-#define GDISP_HARDWARE_FLUSH			TRUE
-#define GDISP_HARDWARE_DRAWPIXEL		TRUE
-#define GDISP_HARDWARE_FILLS			TRUE
-#define GDISP_HARDWARE_BITFILLS			TRUE
-#define GDISP_HARDWARE_PIXELREAD		TRUE
-#define GDISP_HARDWARE_SCROLL			TRUE
-#define GDISP_HARDWARE_CONTROL			TRUE
+#define GDISP_HARDWARE_FLUSH			GFXON
+#define GDISP_HARDWARE_DRAWPIXEL		GFXON
+#define GDISP_HARDWARE_FILLS			GFXON
+#define GDISP_HARDWARE_BITFILLS			GFXON
+#define GDISP_HARDWARE_PIXELREAD		GFXON
+#define GDISP_HARDWARE_SCROLL			GFXON
+#define GDISP_HARDWARE_CONTROL			GFXON
 
 #define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_RGB565
 
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index 01c6ac89..bb8ffbe6 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -27,13 +27,13 @@
 	#define GDISP_GFXNET_PORT	GNETCODE_DEFAULT_PORT
 #endif
 #ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY
-	#define GDISP_DONT_WAIT_FOR_NET_DISPLAY	FALSE
+	#define GDISP_DONT_WAIT_FOR_NET_DISPLAY	GFXOFF
 #endif
 #ifndef GDISP_GFXNET_UNSAFE_SOCKETS
-	#define GDISP_GFXNET_UNSAFE_SOCKETS	FALSE
+	#define GDISP_GFXNET_UNSAFE_SOCKETS	GFXOFF
 #endif
 #ifndef GDISP_GFXNET_BROKEN_LWIP_ACCEPT
-	#define GDISP_GFXNET_BROKEN_LWIP_ACCEPT		FALSE
+	#define GDISP_GFXNET_BROKEN_LWIP_ACCEPT		GFXOFF
 #endif
 
 #if GINPUT_NEED_MOUSE
@@ -143,7 +143,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
 
diff --git a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
index 576df7ee..3d8841cf 100644
--- a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
@@ -14,8 +14,8 @@
 #if 1
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE
 	#define GINPUT_MOUSE_CLICK_TIME					TIME_INFINITE			// Long click != Context Click
-	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE
-	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
+	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF
+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
 	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		-1
 	#define GINPUT_MOUSE_MAX_CLICK_JITTER			0
@@ -23,8 +23,8 @@
 #else
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH
 	#define GINPUT_MOUSE_CLICK_TIME					700						// Long click = Context Click
-	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE					// Can be set to TRUE just for testing
-	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
+	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF					// Can be set to GFXON just for testing
+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
 	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		2
 	#define GINPUT_MOUSE_MAX_CLICK_JITTER			2
@@ -36,6 +36,6 @@
 //#define GINPUT_MOUSE_POLL_PERIOD				25						// Poll driven
 
 // This driver does not require rotation of co-ordinates for orientations other than 0.
-#define GINPUT_MOUSE_NO_ROTATION				TRUE
+#define GINPUT_MOUSE_NO_ROTATION				GFXON
 
 #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
diff --git a/drivers/multiple/uGFXnet/readme.txt b/drivers/multiple/uGFXnet/readme.txt
index 0cb3ee07..bc380829 100644
--- a/drivers/multiple/uGFXnet/readme.txt
+++ b/drivers/multiple/uGFXnet/readme.txt
@@ -4,17 +4,17 @@ This driver is special in that it implements both the gdisp low level driver
 and a touchscreen driver.
 
 1. Add in your gfxconf.h:
-	a) #define GFX_USE_GDISP		TRUE
-	b) Optionally #define GFX_USE_GINPUT			TRUE
-					#define GINPUT_USE_MOUSE		TRUE
+	a) #define GFX_USE_GDISP		GFXON
+	b) Optionally #define GFX_USE_GINPUT			GFXON
+					#define GINPUT_USE_MOUSE		GFXON
 	c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
 	d) Optionally the following (with appropriate values):
 		#define GDISP_SCREEN_WIDTH					640			// Virtual display width
 		#define GDISP_SCREEN_HEIGHT					480			// Virtual display height
-		#define GDISP_GFXNET_UNSAFE_SOCKETS			FALSE		// Your socket library is not thread-safe
-																//		LWIP automatically sets this to TRUE
-		#define GDISP_GFXNET_CUSTOM_LWIP_STARTUP	FALSE		// You want a custom Start_LWIP() function (LWIP only)
-		#define GDISP_DONT_WAIT_FOR_NET_DISPLAY		FALSE		// Don't halt waiting for the first connection
+		#define GDISP_GFXNET_UNSAFE_SOCKETS			GFXOFF		// Your socket library is not thread-safe
+																//		LWIP automatically sets this to GFXON
+		#define GDISP_GFXNET_CUSTOM_LWIP_STARTUP	GFXOFF		// You want a custom Start_LWIP() function (LWIP only)
+		#define GDISP_DONT_WAIT_FOR_NET_DISPLAY		GFXOFF		// Don't halt waiting for the first connection
 		$define GDISP_GFXNET_PORT					13001		// The TCP port the display sits on
 
 2. To your makefile add the following lines:
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h b/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
index e181d91e..1d2056f6 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
@@ -17,13 +17,13 @@
 // Calling gdispGFlush() is optional for this driver but can be used by the
 //	application to force a display update. eg after streaming.
 
-#define GDISP_HARDWARE_FLUSH			TRUE
-#define GDISP_HARDWARE_DRAWPIXEL		TRUE
-#define GDISP_HARDWARE_FILLS			TRUE
-#define GDISP_HARDWARE_BITFILLS			TRUE
-#define GDISP_HARDWARE_PIXELREAD		TRUE
-#define GDISP_HARDWARE_SCROLL			TRUE
-#define GDISP_HARDWARE_CONTROL			TRUE
+#define GDISP_HARDWARE_FLUSH			GFXON
+#define GDISP_HARDWARE_DRAWPIXEL		GFXON
+#define GDISP_HARDWARE_FILLS			GFXON
+#define GDISP_HARDWARE_BITFILLS			GFXON
+#define GDISP_HARDWARE_PIXELREAD		GFXON
+#define GDISP_HARDWARE_SCROLL			GFXON
+#define GDISP_HARDWARE_CONTROL			GFXON
 
 #define GDISP_LLD_PIXELFORMAT			GDISP_PIXELFORMAT_RGB565
 
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
index 7963acab..dc208cbe 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
@@ -29,7 +29,7 @@
 	#define GDISP_GFXNET_PORT	GNETCODE_DEFAULT_PORT
 #endif
 #ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY
-	#define GDISP_DONT_WAIT_FOR_NET_DISPLAY	FALSE
+	#define GDISP_DONT_WAIT_FOR_NET_DISPLAY	GFXOFF
 #endif
 
 static WiFiServer	server(GDISP_GFXNET_PORT);
diff --git a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
index 576df7ee..3d8841cf 100644
--- a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
@@ -14,8 +14,8 @@
 #if 1
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_MOUSE
 	#define GINPUT_MOUSE_CLICK_TIME					TIME_INFINITE			// Long click != Context Click
-	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE
-	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
+	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF
+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
 	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		-1
 	#define GINPUT_MOUSE_MAX_CLICK_JITTER			0
@@ -23,8 +23,8 @@
 #else
 	#define GINPUT_MOUSE_EVENT_TYPE					GEVENT_TOUCH
 	#define GINPUT_MOUSE_CLICK_TIME					700						// Long click = Context Click
-	#define GINPUT_MOUSE_NEED_CALIBRATION			FALSE					// Can be set to TRUE just for testing
-	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	FALSE
+	#define GINPUT_MOUSE_NEED_CALIBRATION			GFXOFF					// Can be set to GFXON just for testing
+	#define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE	GFXOFF
 	#define GINPUT_MOUSE_READ_CYCLES				1
 	#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR		2
 	#define GINPUT_MOUSE_MAX_CLICK_JITTER			2
@@ -36,6 +36,6 @@
 //#define GINPUT_MOUSE_POLL_PERIOD				25						// Poll driven
 
 // This driver does not require rotation of co-ordinates for orientations other than 0.
-#define GINPUT_MOUSE_NO_ROTATION				TRUE
+#define GINPUT_MOUSE_NO_ROTATION				GFXON
 
 #endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
diff --git a/drivers/multiple/uGFXnetESP8266/readme.txt b/drivers/multiple/uGFXnetESP8266/readme.txt
index d7ce2178..c06be3aa 100644
--- a/drivers/multiple/uGFXnetESP8266/readme.txt
+++ b/drivers/multiple/uGFXnetESP8266/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
 and a touchscreen driver.
 
 1. Add in your gfxconf.h:
-	a) #define GFX_USE_GDISP		TRUE
-	b) Optionally #define GFX_USE_GINPUT			TRUE
-					#define GINPUT_USE_MOUSE		TRUE
+	a) #define GFX_USE_GDISP		GFXON
+	b) Optionally #define GFX_USE_GINPUT			GFXON
+					#define GINPUT_USE_MOUSE		GFXON
 	c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
 	d) Optionally the following (with appropriate values):
 		#define GDISP_SCREEN_WIDTH					640			// Virtual display width
@@ -21,7 +21,7 @@ and a touchscreen driver.
 		#define GDISP_GFXNET_WIFI_PASSWORD			"password"	// Your wifi password.
 																//  Not required if GDISP_GFXNET_WIFI_INIT_FUNCTION
 																//  is specified.
-		#define GDISP_DONT_WAIT_FOR_NET_DISPLAY		FALSE		// Don't halt waiting for the first connection
+		#define GDISP_DONT_WAIT_FOR_NET_DISPLAY		GFXOFF		// Don't halt waiting for the first connection
 		$define GDISP_GFXNET_PORT					13001		// The TCP port the display sits on