First set of V3 macro changes

36 files changed, 66 insertions, 66 deletions

diff --git a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
index df11a337..9bc40367 100644
--- a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
+++ b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
@@ -31,7 +31,7 @@
 #define SET_RST				palSetPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
 #define CLR_RST				palClearPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
 
-#define USE_SOFT_SPI            TRUE
+#define USE_SOFT_SPI            GFXON
 #define USE_HARD_SPI            !(USE_SOFT_SPI)
 
 #if USE_HARD_SPI
diff --git a/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h b/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
index 0987f369..c0d9354b 100644
--- a/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
+++ b/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
@@ -25,11 +25,11 @@
 // How much extra data to allocate at the end of the GMouse structure for the board's use
 #define GMOUSE_FT5316_BOARD_DATA_SIZE			0
 
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
 //	NOTE:	This is not as accurate as real calibration.
 //			It requires the orientation of the touch panel to match the display.
 //			It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5316_SELF_CALIBRATE			TRUE
+#define GMOUSE_FT5316_SELF_CALIBRATE			GFXON
 
 static unsigned int device_write(unsigned char device_address, unsigned char sub_address, unsigned char wdata)
 {
diff --git a/boards/base/ArduinoTinyScreen/gfx/gfxconf.h b/boards/base/ArduinoTinyScreen/gfx/gfxconf.h
index 1a1f8623..117b734c 100644
--- a/boards/base/ArduinoTinyScreen/gfx/gfxconf.h
+++ b/boards/base/ArduinoTinyScreen/gfx/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_ARDUINO      TRUE
+//#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_OS_ARDUINO      GFXON
 
 /* 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/boards/base/Embest-STM32-DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/board.mk
index cd17a8ae..fcc10a60 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board.mk
+++ b/boards/base/Embest-STM32-DMSTF4BB/board.mk
@@ -1,6 +1,6 @@
 GFXINC	+= $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB
 GFXSRC	+=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
 
 include $(GFXLIB)/drivers/gdisp/SSD2119/driver.mk
 include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
diff --git a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
index fc18c0ec..853c13a8 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
@@ -20,16 +20,16 @@
 #define GMOUSE_STMPE811_BOARD_DATA_SIZE			0
 
 // Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE811_READ_PRESSURE		FALSE
-//#define GMOUSE_STMPE811_SELF_CALIBRATE	FALSE
-//#define GMOUSE_STMPE811_TEST_MODE			FALSE
+//#define GMOUSE_STMPE811_READ_PRESSURE		GFXOFF
+//#define GMOUSE_STMPE811_SELF_CALIBRATE	GFXOFF
+//#define GMOUSE_STMPE811_TEST_MODE			GFXOFF
 
-// If TRUE this board has the STMPE811 IRQ pin connected to a GPIO.
+// If GFXON this board has the STMPE811 IRQ pin connected to a GPIO.
 // Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
-#define GMOUSE_STMPE811_GPIO_IRQPIN				FALSE
+#define GMOUSE_STMPE811_GPIO_IRQPIN				GFXOFF
 
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE811_SLOW_CPU				FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE811_SLOW_CPU				GFXOFF
 
 // Slave address
 #define STMPE811_ADDR				(0x82 >> 1)
diff --git a/boards/base/FireBull-STM32F103-FB/board.mk b/boards/base/FireBull-STM32F103-FB/board.mk
index 11714dc7..02ee0dcb 100644
--- a/boards/base/FireBull-STM32F103-FB/board.mk
+++ b/boards/base/FireBull-STM32F103-FB/board.mk
@@ -1,6 +1,6 @@
 GFXINC	+= $(GFXLIB)/boards/base/FireBull-STM32F103-FB
 GFXSRC	+=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
 
 include $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board/board.mk
 include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
diff --git a/boards/base/HY-MiniSTM32V/board.mk b/boards/base/HY-MiniSTM32V/board.mk
index eddf09e3..bb07caa9 100644
--- a/boards/base/HY-MiniSTM32V/board.mk
+++ b/boards/base/HY-MiniSTM32V/board.mk
@@ -1,6 +1,6 @@
 GFXINC	+= $(GFXLIB)/boards/base/HY-MiniSTM32V
 GFXSRC	+=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
 
 include $(GFXLIB)/boards/base/HY-MiniSTM32V/chibios_board/board.mk
 include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
diff --git a/boards/base/Linux-Framebuffer-Touch/board.mk b/boards/base/Linux-Framebuffer-Touch/board.mk
index 813e6ef0..a12ca67b 100644
--- a/boards/base/Linux-Framebuffer-Touch/board.mk
+++ b/boards/base/Linux-Framebuffer-Touch/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Linux-Framebuffer-Touch
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
 GFXLIBS += rt
 
 include $(GFXLIB)/boards/base/Linux-Framebuffer/board.mk
diff --git a/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h b/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
index c6bf5a7b..9f3acdd3 100644
--- a/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
+++ b/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
@@ -21,12 +21,12 @@
 // The linux device input used for touchscreen
 #define GMOUSE_LINUX_EVENT_DEVICE					"/dev/input/event0"
 
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
 //	NOTE:	This is not as accurate as real calibration.
 //			It requires the orientation of the touch panel to match the display.
 //			It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE			FALSE
+#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE			GFXOFF
 
-#define GMOUSE_LINUX_EVENT_FINGERMODE				TRUE
+#define GMOUSE_LINUX_EVENT_FINGERMODE				GFXON
 
 #endif /* _GINPUT_LLD_MOUSE_BOARD_H */
diff --git a/boards/base/Linux-Framebuffer/board.mk b/boards/base/Linux-Framebuffer/board.mk
index a9acce0a..91dcfed4 100644
--- a/boards/base/Linux-Framebuffer/board.mk
+++ b/boards/base/Linux-Framebuffer/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Linux-Framebuffer
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
 GFXLIBS += rt
 
 include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk
diff --git a/boards/base/Linux-SDL/board.mk b/boards/base/Linux-SDL/board.mk
index 591d09d0..ae3cc20b 100644
--- a/boards/base/Linux-SDL/board.mk
+++ b/boards/base/Linux-SDL/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Linux
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
 GFXLIBS += rt
 
 include $(GFXLIB)/drivers/multiple/SDL/driver.mk
diff --git a/boards/base/Linux-X/board.mk b/boards/base/Linux-X/board.mk
index beb156b8..fd3d3f22 100644
--- a/boards/base/Linux-X/board.mk
+++ b/boards/base/Linux-X/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Linux
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
 GFXLIBS += rt
 
 include $(GFXLIB)/drivers/multiple/X/driver.mk
diff --git a/boards/base/Marlin/board.mk b/boards/base/Marlin/board.mk
index ac3d55f1..bb3ac9b8 100644
--- a/boards/base/Marlin/board.mk
+++ b/boards/base/Marlin/board.mk
@@ -1,6 +1,6 @@
 GFXINC	+= $(GFXLIB)/boards/base/Marlin
 GFXSRC	+=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
 
 include $(GFXLIB)/boards/base/Marlin/chibios_board/board.mk
 include $(GFXLIB)/drivers/gdisp/RA8875/driver.mk
diff --git a/boards/base/Marlin/gmouse_lld_FT5x06_board.h b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
index f879ca0c..872dd208 100644
--- a/boards/base/Marlin/gmouse_lld_FT5x06_board.h
+++ b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
@@ -19,11 +19,11 @@
 // How much extra data to allocate at the end of the GMouse structure for the board's use
 #define GMOUSE_FT5x06_BOARD_DATA_SIZE			0
 
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
 //	NOTE:	This is not as accurate as real calibration.
 //			It requires the orientation of the touch panel to match the display.
 //			It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5x06_SELF_CALIBRATE			FALSE
+#define GMOUSE_FT5x06_SELF_CALIBRATE			GFXOFF
 
 /* I2C interface #2 - Touchscreen controller */
 static const I2CConfig i2ccfg2 = {
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/board.mk b/boards/base/Mikromedia-Plus-STM32-M4/board.mk
index 61a87888..282649d0 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/board.mk
+++ b/boards/base/Mikromedia-Plus-STM32-M4/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-Plus-STM32-M4
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
 include $(GFXLIB)/drivers/gdisp/SSD1963/driver.mk
 include $(GFXLIB)/drivers/ginput/touch/STMPE610/driver.mk
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
index 75a1194b..c18e7450 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
+++ b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
@@ -20,16 +20,16 @@
 #define GMOUSE_STMPE610_BOARD_DATA_SIZE			0
 
 // Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE610_READ_PRESSURE		FALSE
-//#define GMOUSE_STMPE610_SELF_CALIBRATE	FALSE
-//#define GMOUSE_STMPE610_TEST_MODE			FALSE
+//#define GMOUSE_STMPE610_READ_PRESSURE		GFXOFF
+//#define GMOUSE_STMPE610_SELF_CALIBRATE	GFXOFF
+//#define GMOUSE_STMPE610_TEST_MODE			GFXOFF
 
-// If TRUE this board has the STMPE610 IRQ pin connected to a GPIO.
+// If GFXON this board has the STMPE610 IRQ pin connected to a GPIO.
 // Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
-#define GMOUSE_STMPE610_GPIO_IRQPIN				FALSE
+#define GMOUSE_STMPE610_GPIO_IRQPIN				GFXOFF
 
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE610_SLOW_CPU				FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE610_SLOW_CPU				GFXOFF
 
 // Slave address
 #define STMPE610_ADDR				(0x88 >> 1)
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
index 0f472bcc..60b2a91e 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
 include $(GFXLIB)/drivers/gdisp/ILI9341/driver.mk
 include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/OSX/board.mk b/boards/base/OSX/board.mk
index b2f46341..5b806fc2 100644
--- a/boards/base/OSX/board.mk
+++ b/boards/base/OSX/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/OSX
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_OSX=TRUE
+GFXDEFS += -DGFX_USE_OS_OSX=GFXON
 GFXLIBS +=
 
 include $(GFXLIB)/drivers/multiple/SDL/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board.mk b/boards/base/Olimex-SAM7EX256-GE12/board.mk
index ec712c18..c5cc9418 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE12/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE12 $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
 include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/driver.mk
 include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
 include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
index 67e81f4c..6da500be 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
+++ b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
@@ -17,7 +17,7 @@
  * Set various display properties. These properties mostly depend on the exact controller chip you get.
  * The defaults should work for most controllers.
  */
-//#define GDISP_GE8_BROKEN_CONTROLLER		FALSE	// Uncomment this out if you have a controller thats not window wrap broken.
+//#define GDISP_GE8_BROKEN_CONTROLLER		GFXOFF	// Uncomment this out if you have a controller thats not window wrap broken.
 //#define GDISP_SCREEN_HEIGHT				130		// The visible display height
 //#define GDISP_SCREEN_WIDTH				130		// The visible display width
 //#define GDISP_RAM_X_OFFSET				0		// The x offset of the visible area
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk
index 031bbe61..6642f57f 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk
@@ -1,6 +1,6 @@
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
 include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/driver.mk
 include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
 include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
index 8f0eb357..a11766e4 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
@@ -17,7 +17,7 @@
  * Set various display properties. These properties mostly depend on the exact controller chip you get.
  * The defaults should work for most controllers.
  */
-//#define GDISP_GE8_BROKEN_CONTROLLER		FALSE	// Uncomment this out if you have a controller thats not window wrap broken.
+//#define GDISP_GE8_BROKEN_CONTROLLER		GFXOFF	// Uncomment this out if you have a controller thats not window wrap broken.
 //#define GDISP_SCREEN_HEIGHT				130		// The visible display height
 //#define GDISP_SCREEN_WIDTH				130		// The visible display width
 //#define GDISP_RAM_X_OFFSET				0		// The x offset of the visible area
diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
index 68063881..1b3c547a 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
@@ -22,7 +22,7 @@
 /**
  * @brief	Whether each channel is mono or stereo
  */
-#define GAUDIO_RECORD_CHANNEL0_IS_STEREO			FALSE
+#define GAUDIO_RECORD_CHANNEL0_IS_STEREO			GFXOFF
 
 /**
  * The list of audio channels and their uses
diff --git a/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h b/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
index c0d3ab3f..ef84da66 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
@@ -22,7 +22,7 @@
 #define GINPUT_DIAL_NUM_PORTS			1
 #define GINPUT_DIAL_DEVICE0				GADC_PHYSDEV_DIAL
 #define GINPUT_DIAL_POLL_PERIOD			200
-#define GINPUT_DIAL_CYCLE_POLL			FALSE
+#define GINPUT_DIAL_CYCLE_POLL			GFXOFF
 
 #endif	/* GFX_USE_GINPUT && GINPUT_NEED_DIAL */
 
diff --git a/boards/base/Olimex-STM32-LCD/board.mk b/boards/base/Olimex-STM32-LCD/board.mk
index 2dd9d97a..2dbf3385 100644
--- a/boards/base/Olimex-STM32-LCD/board.mk
+++ b/boards/base/Olimex-STM32-LCD/board.mk
@@ -1,6 +1,6 @@
 GFXINC	+= $(GFXLIB)/boards/base/Olimex-STM32-LCD
 GFXSRC	+=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
 
 include $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board/board.mk
 include $(GFXLIB)/drivers/gdisp/ILI9320/driver.mk
diff --git a/boards/base/STM32F429i-Discovery/chibios/board.mk b/boards/base/STM32F429i-Discovery/chibios/board.mk
index 292cd42e..730bb083 100644
--- a/boards/base/STM32F429i-Discovery/chibios/board.mk
+++ b/boards/base/STM32F429i-Discovery/chibios/board.mk
@@ -2,6 +2,6 @@ GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
 GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \

 			$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c

 

-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE

+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON

 include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk

 include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

diff --git a/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h b/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
index a6e41f86..3b8234f5 100644
--- a/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
+++ b/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
@@ -23,7 +23,7 @@ static const SPIConfig spi_cfg = {
 	((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR

 };

 

-#define ALLOW_2ND_LAYER		TRUE

+#define ALLOW_2ND_LAYER		GFXON

 

 static const ltdcConfig driverCfg = {

 	240, 320,

diff --git a/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h b/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
index ef3a628f..02abc43d 100644
--- a/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
+++ b/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
@@ -20,15 +20,15 @@
 #define GMOUSE_STMPE811_BOARD_DATA_SIZE			0

 

 // Options - Leave these commented to make it user configurable in the gfxconf.h

-//#define GMOUSE_STMPE811_READ_PRESSURE		FALSE

-//#define GMOUSE_STMPE811_SELF_CALIBRATE	FALSE

-//#define GMOUSE_STMPE811_TEST_MODE			FALSE

+//#define GMOUSE_STMPE811_READ_PRESSURE		GFXOFF

+//#define GMOUSE_STMPE811_SELF_CALIBRATE	GFXOFF

+//#define GMOUSE_STMPE811_TEST_MODE			GFXOFF

 

-// Set to FALSE because it does not work properly on this board even though the pin exists.

-#define GMOUSE_STMPE811_GPIO_IRQPIN				FALSE

+// Set to GFXOFF because it does not work properly on this board even though the pin exists.

+#define GMOUSE_STMPE811_GPIO_IRQPIN				GFXOFF

 

-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.

-#define GMOUSE_STMPE811_SLOW_CPU				FALSE

+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.

+#define GMOUSE_STMPE811_SLOW_CPU				GFXOFF

 

 // Slave address

 #define STMPE811_ADDR				0x41

diff --git a/boards/base/STM32F439i-Eval/CubeHal/board.mk b/boards/base/STM32F439i-Eval/CubeHal/board.mk
index a3bb8ad2..cdeba6d7 100644
--- a/boards/base/STM32F439i-Eval/CubeHal/board.mk
+++ b/boards/base/STM32F439i-Eval/CubeHal/board.mk
@@ -19,7 +19,7 @@ ifeq ($(OPT_OS),raw32)
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_ugfx.c \
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_system.c \
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_interrupts.c
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F4xx/Include \
 				$(CMSIS)/Include \
 				$(STMHAL)/Inc
diff --git a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
index a2c99be6..7ddd554f 100644
--- a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
+++ b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
@@ -17,7 +17,7 @@
 #include "stm32f4xx_hal.h"
 #include "stm324x9i_eval_sdram.h"
 
-#define ALLOW_2ND_LAYER		TRUE
+#define ALLOW_2ND_LAYER		GFXON
 
 // Panel parameters
 // This panel is a AMPIRE640480 panel.
diff --git a/boards/base/STM32F469i-Discovery/board.mk b/boards/base/STM32F469i-Discovery/board.mk
index ab704c17..26cde4a5 100644
--- a/boards/base/STM32F469i-Discovery/board.mk
+++ b/boards/base/STM32F469i-Discovery/board.mk
@@ -23,7 +23,7 @@ ifeq ($(OPT_OS),raw32)
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c \
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_system.c \
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_it.c
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F4xx/Include \
 			$(CMSIS)/Include
 	LDSCRIPT = 	$(GFXLIB)/boards/base/STM32F469i-Discovery/STM32_FLASH.ld
diff --git a/boards/base/STM32F746-Discovery/board.mk b/boards/base/STM32F746-Discovery/board.mk
index eb9bec61..a67d602a 100644
--- a/boards/base/STM32F746-Discovery/board.mk
+++ b/boards/base/STM32F746-Discovery/board.mk
@@ -17,7 +17,7 @@ ifeq ($(OPT_OS),raw32)
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c \
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c \
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F7xx/Include \
 				$(CMSIS)/Include
 	LDSCRIPT = $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746nghx_flash.ld
diff --git a/boards/base/STM32F746-Discovery/board_STM32LTDC.h b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
index 55a322b6..231d51b3 100644
--- a/boards/base/STM32F746-Discovery/board_STM32LTDC.h
+++ b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
@@ -11,7 +11,7 @@
 #include "stm32f746g_discovery_sdram.h"
 
 #ifndef GFX_LTDC_USE_DIRECTIO
-	#define GFX_LTDC_USE_DIRECTIO	TRUE
+	#define GFX_LTDC_USE_DIRECTIO	GFXON
 #endif
 #ifndef GFX_LTDC_TIMING_SET
 	/* Options are:
@@ -36,7 +36,7 @@
 	#define AFRH	AFR[1]
 #endif
 
-#define ALLOW_2ND_LAYER		TRUE
+#define ALLOW_2ND_LAYER		GFXON
 
 static const ltdcConfig driverCfg = {
 	480, 272,								// Width, Height (pixels)
diff --git a/boards/base/Win32/board.mk b/boards/base/Win32/board.mk
index b4577927..d69cfcc4 100644
--- a/boards/base/Win32/board.mk
+++ b/boards/base/Win32/board.mk
@@ -5,5 +5,5 @@ include $(GFXLIB)/drivers/multiple/Win32/driver.mk
 include $(GFXLIB)/drivers/gaudio/Win32/driver.mk
 
 ifeq ($(OPT_OS),win32.raw32)
-	GFXDEFS += GFX_OS_INIT_NO_WARNING=TRUE
+	GFXDEFS += GFX_OS_INIT_NO_WARNING=GFXON
 endif
diff --git a/boards/base/eCos-Synthetic-Framebuffer/board.mk b/boards/base/eCos-Synthetic-Framebuffer/board.mk
index d4e9ebe1..6980456c 100644
--- a/boards/base/eCos-Synthetic-Framebuffer/board.mk
+++ b/boards/base/eCos-Synthetic-Framebuffer/board.mk
@@ -1,5 +1,5 @@
 GFXINC  += $(GFXLIB)/boards/base/eCos-Synthetic-Framebuffer
 GFXSRC  +=
-GFXDEFS += -DGFX_USE_OS_ECOS=TRUE
+GFXDEFS += -DGFX_USE_OS_ECOS=GFXON
 
 include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk
diff --git a/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
index e8e46131..8712cfe1 100644
--- a/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
+++ b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
@@ -20,7 +20,7 @@
 #endif
 
 // Uncomment this if your frame buffer device requires flushing ("Synch" in eCos speak)
-#define GDISP_HARDWARE_FLUSH		TRUE
+#define GDISP_HARDWARE_FLUSH		GFXON
 
 #ifdef GDISP_DRIVER_VMT