Browse Source

First set of V3 macro changes

inmarket 2 years ago
parent
commit
f265924396
100 changed files with 1119 additions and 1116 deletions
  1. 1 1
      boards/addons/gdisp/board_SPFD54124B_stm32f3.h
  2. 2 2
      boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
  3. 8 8
      boards/base/ArduinoTinyScreen/gfx/gfxconf.h
  4. 1 1
      boards/base/Embest-STM32-DMSTF4BB/board.mk
  5. 7 7
      boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
  6. 1 1
      boards/base/FireBull-STM32F103-FB/board.mk
  7. 1 1
      boards/base/HY-MiniSTM32V/board.mk
  8. 1 1
      boards/base/Linux-Framebuffer-Touch/board.mk
  9. 3 3
      boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
  10. 1 1
      boards/base/Linux-Framebuffer/board.mk
  11. 1 1
      boards/base/Linux-SDL/board.mk
  12. 1 1
      boards/base/Linux-X/board.mk
  13. 1 1
      boards/base/Marlin/board.mk
  14. 2 2
      boards/base/Marlin/gmouse_lld_FT5x06_board.h
  15. 1 1
      boards/base/Mikromedia-Plus-STM32-M4/board.mk
  16. 7 7
      boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
  17. 1 1
      boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
  18. 1 1
      boards/base/OSX/board.mk
  19. 1 1
      boards/base/Olimex-SAM7EX256-GE12/board.mk
  20. 1 1
      boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
  21. 1 1
      boards/base/Olimex-SAM7EX256-GE8/board.mk
  22. 1 1
      boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
  23. 1 1
      boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
  24. 1 1
      boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
  25. 1 1
      boards/base/Olimex-STM32-LCD/board.mk
  26. 1 1
      boards/base/STM32F429i-Discovery/chibios/board.mk
  27. 1 1
      boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
  28. 7 7
      boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
  29. 1 1
      boards/base/STM32F439i-Eval/CubeHal/board.mk
  30. 1 1
      boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
  31. 1 1
      boards/base/STM32F469i-Discovery/board.mk
  32. 1 1
      boards/base/STM32F746-Discovery/board.mk
  33. 2 2
      boards/base/STM32F746-Discovery/board_STM32LTDC.h
  34. 1 1
      boards/base/Win32/board.mk
  35. 1 1
      boards/base/eCos-Synthetic-Framebuffer/board.mk
  36. 1 1
      boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
  37. 4 0
      changelog.txt
  38. 22 22
      demos/3rdparty/bubbles/gfxconf.h
  39. 38 38
      demos/3rdparty/notepad-2/gfxconf.h
  40. 2 2
      demos/applications/combo/bounce.c
  41. 57 57
      demos/applications/combo/gfxconf.h
  42. 6 6
      demos/applications/mandelbrot/gfxconf.h
  43. 17 17
      demos/applications/notepad/gfxconf.h
  44. 10 10
      demos/benchmarks/gfxconf.h
  45. 1 1
      demos/games/justget10/demo.mk
  46. 41 41
      demos/games/justget10/gfxconf.h
  47. 1 1
      demos/games/minesweeper/demo.mk
  48. 22 23
      demos/games/minesweeper/gfxconf.h
  49. 1 1
      demos/games/minesweeper/readme.txt
  50. 1 1
      demos/games/tetris/Example_Makefiles/stm32f4/Makefile
  51. 20 20
      demos/games/tetris/gfxconf.h
  52. 14 14
      demos/modules/gadc/gfxconf.h
  53. 12 12
      demos/modules/gaudio/oscilloscope/gfxconf.h
  54. 12 12
      demos/modules/gaudio/play-vs1053/gfxconf.h
  55. 12 12
      demos/modules/gaudio/play-wave/gfxconf.h
  56. 7 7
      demos/modules/gdisp/arcsectors/gfxconf.h
  57. 7 7
      demos/modules/gdisp/basics/gfxconf.h
  58. 13 13
      demos/modules/gdisp/circles/gfxconf.h
  59. 29 29
      demos/modules/gdisp/fonts/gfxconf.h
  60. 14 14
      demos/modules/gdisp/fonts_cyrillic/gfxconf.h
  61. 17 17
      demos/modules/gdisp/images/gfxconf.h
  62. 16 16
      demos/modules/gdisp/images_animated/gfxconf.h
  63. 1 1
      demos/modules/gdisp/images_animated/main.c
  64. 17 17
      demos/modules/gdisp/images_palettes/gfxconf.h
  65. 1 1
      demos/modules/gdisp/images_palettes/main.c
  66. 18 18
      demos/modules/gdisp/multiple_displays/gfxconf.h
  67. 1 1
      demos/modules/gdisp/multiple_displays/main.c
  68. 8 8
      demos/modules/gdisp/pixmap/gfxconf.h
  69. 13 13
      demos/modules/gdisp/polygons/gfxconf.h
  70. 12 12
      demos/modules/gdisp/streaming/gfxconf.h
  71. 2 2
      demos/modules/gdisp/streaming/main.c
  72. 7 7
      demos/modules/gdisp/thickarcs/gfxconf.h
  73. 4 4
      demos/modules/gfile/fatfs/gfxconf.h
  74. 15 15
      demos/modules/ginput/keyboard/gfxconf.h
  75. 9 9
      demos/modules/gos/threads/gfxconf.h
  76. 10 10
      demos/modules/gos/threads_advanced/gfxconf.h
  77. 5 5
      demos/modules/gtimer/gfxconf.h
  78. 13 13
      demos/modules/gtrans/basic/gfxconf.h
  79. 9 9
      demos/modules/gwin/basic/gfxconf.h
  80. 19 19
      demos/modules/gwin/button/gfxconf.h
  81. 18 18
      demos/modules/gwin/checkbox/gfxconf.h
  82. 17 17
      demos/modules/gwin/console/gfxconf.h
  83. 34 34
      demos/modules/gwin/container/gfxconf.h
  84. 35 35
      demos/modules/gwin/container_nested/gfxconf.h
  85. 26 26
      demos/modules/gwin/frame/gfxconf.h
  86. 9 9
      demos/modules/gwin/gl3d-gears/gfxconf.h
  87. 9 9
      demos/modules/gwin/gl3d-spin/gfxconf.h
  88. 16 16
      demos/modules/gwin/graph/gfxconf.h
  89. 29 29
      demos/modules/gwin/imagebox/gfxconf.h
  90. 24 24
      demos/modules/gwin/keyboard/gfxconf.h
  91. 24 24
      demos/modules/gwin/label/gfxconf.h
  92. 27 27
      demos/modules/gwin/list/gfxconf.h
  93. 47 47
      demos/modules/gwin/progressbar/gfxconf.h
  94. 18 18
      demos/modules/gwin/radio/gfxconf.h
  95. 22 22
      demos/modules/gwin/slider/gfxconf.h
  96. 28 28
      demos/modules/gwin/tabset/gfxconf.h
  97. 26 26
      demos/modules/gwin/textedit/gfxconf.h
  98. 26 26
      demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h
  99. 58 58
      demos/modules/gwin/widgets/gfxconf.h
  100. 0 0
      demos/tools/touch_calibration_grabber/gfxconf.h

+ 1 - 1
boards/addons/gdisp/board_SPFD54124B_stm32f3.h

@@ -31,7 +31,7 @@
31 31
 #define SET_RST				palSetPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
32 32
 #define CLR_RST				palClearPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
33 33
 
34
-#define USE_SOFT_SPI            TRUE
34
+#define USE_SOFT_SPI            GFXON
35 35
 #define USE_HARD_SPI            !(USE_SOFT_SPI)
36 36
 
37 37
 #if USE_HARD_SPI

+ 2 - 2
boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h

@@ -25,11 +25,11 @@
25 25
 // How much extra data to allocate at the end of the GMouse structure for the board's use
26 26
 #define GMOUSE_FT5316_BOARD_DATA_SIZE			0
27 27
 
28
-// Set this to TRUE if you want self-calibration.
28
+// Set this to GFXON if you want self-calibration.
29 29
 //	NOTE:	This is not as accurate as real calibration.
30 30
 //			It requires the orientation of the touch panel to match the display.
31 31
 //			It requires the active area of the touch panel to exactly match the display size.
32
-#define GMOUSE_FT5316_SELF_CALIBRATE			TRUE
32
+#define GMOUSE_FT5316_SELF_CALIBRATE			GFXON
33 33
 
34 34
 static unsigned int device_write(unsigned char device_address, unsigned char sub_address, unsigned char wdata)
35 35
 {

+ 8 - 8
boards/base/ArduinoTinyScreen/gfx/gfxconf.h

@@ -31,18 +31,18 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
38
-#define GFX_USE_OS_ARDUINO      TRUE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38
+#define GFX_USE_OS_ARDUINO      GFXON
39 39
 
40 40
 /* GFX sub-systems to turn on */
41
-#define GFX_USE_GDISP			TRUE
41
+#define GFX_USE_GDISP			GFXON
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_VALIDATION	TRUE
45
-#define GDISP_NEED_CLIP			TRUE
44
+#define GDISP_NEED_VALIDATION	GFXON
45
+#define GDISP_NEED_CLIP			GFXON
46 46
 
47 47
 #endif /* _GFXCONF_H */
48 48
 

+ 1 - 1
boards/base/Embest-STM32-DMSTF4BB/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC	+= $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB
2 2
 GFXSRC	+=
3
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/drivers/gdisp/SSD2119/driver.mk
6 6
 include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

+ 7 - 7
boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h

@@ -20,16 +20,16 @@
20 20
 #define GMOUSE_STMPE811_BOARD_DATA_SIZE			0
21 21
 
22 22
 // Options - Leave these commented to make it user configurable in the gfxconf.h
23
-//#define GMOUSE_STMPE811_READ_PRESSURE		FALSE
24
-//#define GMOUSE_STMPE811_SELF_CALIBRATE	FALSE
25
-//#define GMOUSE_STMPE811_TEST_MODE			FALSE
23
+//#define GMOUSE_STMPE811_READ_PRESSURE		GFXOFF
24
+//#define GMOUSE_STMPE811_SELF_CALIBRATE	GFXOFF
25
+//#define GMOUSE_STMPE811_TEST_MODE			GFXOFF
26 26
 
27
-// If TRUE this board has the STMPE811 IRQ pin connected to a GPIO.
27
+// If GFXON this board has the STMPE811 IRQ pin connected to a GPIO.
28 28
 // Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
29
-#define GMOUSE_STMPE811_GPIO_IRQPIN				FALSE
29
+#define GMOUSE_STMPE811_GPIO_IRQPIN				GFXOFF
30 30
 
31
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
32
-#define GMOUSE_STMPE811_SLOW_CPU				FALSE
31
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
32
+#define GMOUSE_STMPE811_SLOW_CPU				GFXOFF
33 33
 
34 34
 // Slave address
35 35
 #define STMPE811_ADDR				(0x82 >> 1)

+ 1 - 1
boards/base/FireBull-STM32F103-FB/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC	+= $(GFXLIB)/boards/base/FireBull-STM32F103-FB
2 2
 GFXSRC	+=
3
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board/board.mk
6 6
 include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk

+ 1 - 1
boards/base/HY-MiniSTM32V/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC	+= $(GFXLIB)/boards/base/HY-MiniSTM32V
2 2
 GFXSRC	+=
3
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/boards/base/HY-MiniSTM32V/chibios_board/board.mk
6 6
 include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk

+ 1 - 1
boards/base/Linux-Framebuffer-Touch/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Linux-Framebuffer-Touch
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
3
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
4 4
 GFXLIBS += rt
5 5
 
6 6
 include $(GFXLIB)/boards/base/Linux-Framebuffer/board.mk

+ 3 - 3
boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h

@@ -21,12 +21,12 @@
21 21
 // The linux device input used for touchscreen
22 22
 #define GMOUSE_LINUX_EVENT_DEVICE					"/dev/input/event0"
23 23
 
24
-// Set this to TRUE if you want self-calibration.
24
+// Set this to GFXON if you want self-calibration.
25 25
 //	NOTE:	This is not as accurate as real calibration.
26 26
 //			It requires the orientation of the touch panel to match the display.
27 27
 //			It requires the active area of the touch panel to exactly match the display size.
28
-#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE			FALSE
28
+#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE			GFXOFF
29 29
 
30
-#define GMOUSE_LINUX_EVENT_FINGERMODE				TRUE
30
+#define GMOUSE_LINUX_EVENT_FINGERMODE				GFXON
31 31
 
32 32
 #endif /* _GINPUT_LLD_MOUSE_BOARD_H */

+ 1 - 1
boards/base/Linux-Framebuffer/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Linux-Framebuffer
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
3
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
4 4
 GFXLIBS += rt
5 5
 
6 6
 include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk

+ 1 - 1
boards/base/Linux-SDL/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Linux
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
3
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
4 4
 GFXLIBS += rt
5 5
 
6 6
 include $(GFXLIB)/drivers/multiple/SDL/driver.mk

+ 1 - 1
boards/base/Linux-X/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Linux
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
3
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
4 4
 GFXLIBS += rt
5 5
 
6 6
 include $(GFXLIB)/drivers/multiple/X/driver.mk

+ 1 - 1
boards/base/Marlin/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC	+= $(GFXLIB)/boards/base/Marlin
2 2
 GFXSRC	+=
3
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/boards/base/Marlin/chibios_board/board.mk
6 6
 include $(GFXLIB)/drivers/gdisp/RA8875/driver.mk

+ 2 - 2
boards/base/Marlin/gmouse_lld_FT5x06_board.h

@@ -19,11 +19,11 @@
19 19
 // How much extra data to allocate at the end of the GMouse structure for the board's use
20 20
 #define GMOUSE_FT5x06_BOARD_DATA_SIZE			0
21 21
 
22
-// Set this to TRUE if you want self-calibration.
22
+// Set this to GFXON if you want self-calibration.
23 23
 //	NOTE:	This is not as accurate as real calibration.
24 24
 //			It requires the orientation of the touch panel to match the display.
25 25
 //			It requires the active area of the touch panel to exactly match the display size.
26
-#define GMOUSE_FT5x06_SELF_CALIBRATE			FALSE
26
+#define GMOUSE_FT5x06_SELF_CALIBRATE			GFXOFF
27 27
 
28 28
 /* I2C interface #2 - Touchscreen controller */
29 29
 static const I2CConfig i2ccfg2 = {

+ 1 - 1
boards/base/Mikromedia-Plus-STM32-M4/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-Plus-STM32-M4
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
4 4
 include $(GFXLIB)/drivers/gdisp/SSD1963/driver.mk
5 5
 include $(GFXLIB)/drivers/ginput/touch/STMPE610/driver.mk
6 6
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk

+ 7 - 7
boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h

@@ -20,16 +20,16 @@
20 20
 #define GMOUSE_STMPE610_BOARD_DATA_SIZE			0
21 21
 
22 22
 // Options - Leave these commented to make it user configurable in the gfxconf.h
23
-//#define GMOUSE_STMPE610_READ_PRESSURE		FALSE
24
-//#define GMOUSE_STMPE610_SELF_CALIBRATE	FALSE
25
-//#define GMOUSE_STMPE610_TEST_MODE			FALSE
23
+//#define GMOUSE_STMPE610_READ_PRESSURE		GFXOFF
24
+//#define GMOUSE_STMPE610_SELF_CALIBRATE	GFXOFF
25
+//#define GMOUSE_STMPE610_TEST_MODE			GFXOFF
26 26
 
27
-// If TRUE this board has the STMPE610 IRQ pin connected to a GPIO.
27
+// If GFXON this board has the STMPE610 IRQ pin connected to a GPIO.
28 28
 // Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
29
-#define GMOUSE_STMPE610_GPIO_IRQPIN				FALSE
29
+#define GMOUSE_STMPE610_GPIO_IRQPIN				GFXOFF
30 30
 
31
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
32
-#define GMOUSE_STMPE610_SLOW_CPU				FALSE
31
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
32
+#define GMOUSE_STMPE610_SLOW_CPU				GFXOFF
33 33
 
34 34
 // Slave address
35 35
 #define STMPE610_ADDR				(0x88 >> 1)

+ 1 - 1
boards/base/Mikromedia-STM32-M4-ILI9341/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
4 4
 include $(GFXLIB)/drivers/gdisp/ILI9341/driver.mk
5 5
 include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
6 6
 include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk

+ 1 - 1
boards/base/OSX/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/OSX
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_OSX=TRUE
3
+GFXDEFS += -DGFX_USE_OS_OSX=GFXON
4 4
 GFXLIBS +=
5 5
 
6 6
 include $(GFXLIB)/drivers/multiple/SDL/driver.mk

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE12/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE12 $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
4 4
 include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/driver.mk
5 5
 include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
6 6
 include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h

@@ -17,7 +17,7 @@
17 17
  * Set various display properties. These properties mostly depend on the exact controller chip you get.
18 18
  * The defaults should work for most controllers.
19 19
  */
20
-//#define GDISP_GE8_BROKEN_CONTROLLER		FALSE	// Uncomment this out if you have a controller thats not window wrap broken.
20
+//#define GDISP_GE8_BROKEN_CONTROLLER		GFXOFF	// Uncomment this out if you have a controller thats not window wrap broken.
21 21
 //#define GDISP_SCREEN_HEIGHT				130		// The visible display height
22 22
 //#define GDISP_SCREEN_WIDTH				130		// The visible display width
23 23
 //#define GDISP_RAM_X_OFFSET				0		// The x offset of the visible area

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE8/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
4 4
 include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/driver.mk
5 5
 include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
6 6
 include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h

@@ -17,7 +17,7 @@
17 17
  * Set various display properties. These properties mostly depend on the exact controller chip you get.
18 18
  * The defaults should work for most controllers.
19 19
  */
20
-//#define GDISP_GE8_BROKEN_CONTROLLER		FALSE	// Uncomment this out if you have a controller thats not window wrap broken.
20
+//#define GDISP_GE8_BROKEN_CONTROLLER		GFXOFF	// Uncomment this out if you have a controller thats not window wrap broken.
21 21
 //#define GDISP_SCREEN_HEIGHT				130		// The visible display height
22 22
 //#define GDISP_SCREEN_WIDTH				130		// The visible display width
23 23
 //#define GDISP_RAM_X_OFFSET				0		// The x offset of the visible area

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h

@@ -22,7 +22,7 @@
22 22
 /**
23 23
  * @brief	Whether each channel is mono or stereo
24 24
  */
25
-#define GAUDIO_RECORD_CHANNEL0_IS_STEREO			FALSE
25
+#define GAUDIO_RECORD_CHANNEL0_IS_STEREO			GFXOFF
26 26
 
27 27
 /**
28 28
  * The list of audio channels and their uses

+ 1 - 1
boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h

@@ -22,7 +22,7 @@
22 22
 #define GINPUT_DIAL_NUM_PORTS			1
23 23
 #define GINPUT_DIAL_DEVICE0				GADC_PHYSDEV_DIAL
24 24
 #define GINPUT_DIAL_POLL_PERIOD			200
25
-#define GINPUT_DIAL_CYCLE_POLL			FALSE
25
+#define GINPUT_DIAL_CYCLE_POLL			GFXOFF
26 26
 
27 27
 #endif	/* GFX_USE_GINPUT && GINPUT_NEED_DIAL */
28 28
 

+ 1 - 1
boards/base/Olimex-STM32-LCD/board.mk

@@ -1,6 +1,6 @@
1 1
 GFXINC	+= $(GFXLIB)/boards/base/Olimex-STM32-LCD
2 2
 GFXSRC	+=
3
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
3
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board/board.mk
6 6
 include $(GFXLIB)/drivers/gdisp/ILI9320/driver.mk

+ 1 - 1
boards/base/STM32F429i-Discovery/chibios/board.mk

@@ -2,6 +2,6 @@ GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
2 2
 GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \
3 3
 			$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c
4 4
 
5
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
5
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
6 6
 include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
7 7
 include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

+ 1 - 1
boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h

@@ -23,7 +23,7 @@ static const SPIConfig spi_cfg = {
23 23
 	((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR
24 24
 };
25 25
 
26
-#define ALLOW_2ND_LAYER		TRUE
26
+#define ALLOW_2ND_LAYER		GFXON
27 27
 
28 28
 static const ltdcConfig driverCfg = {
29 29
 	240, 320,

+ 7 - 7
boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h

@@ -20,15 +20,15 @@
20 20
 #define GMOUSE_STMPE811_BOARD_DATA_SIZE			0
21 21
 
22 22
 // Options - Leave these commented to make it user configurable in the gfxconf.h
23
-//#define GMOUSE_STMPE811_READ_PRESSURE		FALSE
24
-//#define GMOUSE_STMPE811_SELF_CALIBRATE	FALSE
25
-//#define GMOUSE_STMPE811_TEST_MODE			FALSE
23
+//#define GMOUSE_STMPE811_READ_PRESSURE		GFXOFF
24
+//#define GMOUSE_STMPE811_SELF_CALIBRATE	GFXOFF
25
+//#define GMOUSE_STMPE811_TEST_MODE			GFXOFF
26 26
 
27
-// Set to FALSE because it does not work properly on this board even though the pin exists.
28
-#define GMOUSE_STMPE811_GPIO_IRQPIN				FALSE
27
+// Set to GFXOFF because it does not work properly on this board even though the pin exists.
28
+#define GMOUSE_STMPE811_GPIO_IRQPIN				GFXOFF
29 29
 
30
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
31
-#define GMOUSE_STMPE811_SLOW_CPU				FALSE
30
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
31
+#define GMOUSE_STMPE811_SLOW_CPU				GFXOFF
32 32
 
33 33
 // Slave address
34 34
 #define STMPE811_ADDR				0x41

+ 1 - 1
boards/base/STM32F439i-Eval/CubeHal/board.mk

@@ -19,7 +19,7 @@ ifeq ($(OPT_OS),raw32)
19 19
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_ugfx.c \
20 20
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_system.c \
21 21
 				$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_interrupts.c
22
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
22
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
23 23
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F4xx/Include \
24 24
 				$(CMSIS)/Include \
25 25
 				$(STMHAL)/Inc

+ 1 - 1
boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h

@@ -17,7 +17,7 @@
17 17
 #include "stm32f4xx_hal.h"
18 18
 #include "stm324x9i_eval_sdram.h"
19 19
 
20
-#define ALLOW_2ND_LAYER		TRUE
20
+#define ALLOW_2ND_LAYER		GFXON
21 21
 
22 22
 // Panel parameters
23 23
 // This panel is a AMPIRE640480 panel.

+ 1 - 1
boards/base/STM32F469i-Discovery/board.mk

@@ -23,7 +23,7 @@ ifeq ($(OPT_OS),raw32)
23 23
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c \
24 24
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_system.c \
25 25
 			$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_it.c
26
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
26
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
27 27
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F4xx/Include \
28 28
 			$(CMSIS)/Include
29 29
 	LDSCRIPT = 	$(GFXLIB)/boards/base/STM32F469i-Discovery/STM32_FLASH.ld

+ 1 - 1
boards/base/STM32F746-Discovery/board.mk

@@ -17,7 +17,7 @@ ifeq ($(OPT_OS),raw32)
17 17
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c \
18 18
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c \
19 19
 				$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c
20
-	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
20
+	GFXDEFS	+=	GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
21 21
 	GFXINC	+=	$(CMSIS)/Device/ST/STM32F7xx/Include \
22 22
 				$(CMSIS)/Include
23 23
 	LDSCRIPT = $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746nghx_flash.ld

+ 2 - 2
boards/base/STM32F746-Discovery/board_STM32LTDC.h

@@ -11,7 +11,7 @@
11 11
 #include "stm32f746g_discovery_sdram.h"
12 12
 
13 13
 #ifndef GFX_LTDC_USE_DIRECTIO
14
-	#define GFX_LTDC_USE_DIRECTIO	TRUE
14
+	#define GFX_LTDC_USE_DIRECTIO	GFXON
15 15
 #endif
16 16
 #ifndef GFX_LTDC_TIMING_SET
17 17
 	/* Options are:
@@ -36,7 +36,7 @@
36 36
 	#define AFRH	AFR[1]
37 37
 #endif
38 38
 
39
-#define ALLOW_2ND_LAYER		TRUE
39
+#define ALLOW_2ND_LAYER		GFXON
40 40
 
41 41
 static const ltdcConfig driverCfg = {
42 42
 	480, 272,								// Width, Height (pixels)

+ 1 - 1
boards/base/Win32/board.mk

@@ -5,5 +5,5 @@ include $(GFXLIB)/drivers/multiple/Win32/driver.mk
5 5
 include $(GFXLIB)/drivers/gaudio/Win32/driver.mk
6 6
 
7 7
 ifeq ($(OPT_OS),win32.raw32)
8
-	GFXDEFS += GFX_OS_INIT_NO_WARNING=TRUE
8
+	GFXDEFS += GFX_OS_INIT_NO_WARNING=GFXON
9 9
 endif

+ 1 - 1
boards/base/eCos-Synthetic-Framebuffer/board.mk

@@ -1,5 +1,5 @@
1 1
 GFXINC  += $(GFXLIB)/boards/base/eCos-Synthetic-Framebuffer
2 2
 GFXSRC  +=
3
-GFXDEFS += -DGFX_USE_OS_ECOS=TRUE
3
+GFXDEFS += -DGFX_USE_OS_ECOS=GFXON
4 4
 
5 5
 include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk

+ 1 - 1
boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h

@@ -20,7 +20,7 @@
20 20
 #endif
21 21
 
22 22
 // Uncomment this if your frame buffer device requires flushing ("Synch" in eCos speak)
23
-#define GDISP_HARDWARE_FLUSH		TRUE
23
+#define GDISP_HARDWARE_FLUSH		GFXON
24 24
 
25 25
 #ifdef GDISP_DRIVER_VMT
26 26
 

+ 4 - 0
changelog.txt

@@ -11,6 +11,10 @@ FIX:		Added support for negative baseline_x in fonts
11 11
 FIX:		Fixed some word wrapping issues
12 12
 FIX:		Fixed drawing of 3x3 pixel boxes
13 13
 FIX:		Fixed issue in RTX5/CMSIS2 port which resulted in hanging delays/threads
14
+FEATURE:	Added GFX_COMPAT_V2 to maintain source compatibility with V2.x programs. It is turned on by default.
15
+FEATURE:	Added GFX_COMPAT_OLDCOLORS to allow V2.x Red, Green, Blue color names. It is turned on by default.
16
+CHANGE:		Added GFXRED, GFXBLUE, GFXGREEN etc to replace V2.x Red, Gree, Blue color names
17
+CHANGE:		Added GFXON/GFXOFF to replace V2.x TRUE/FALSE for configuration options.
14 18
 
15 19
 
16 20
 *** Release 2.8 ***

+ 22 - 22
demos/3rdparty/bubbles/gfxconf.h

@@ -10,33 +10,33 @@
10 10
 #define _GFXCONF_H
11 11
 
12 12
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
13
-//#define GFX_USE_OS_CHIBIOS            FALSE
14
-//#define GFX_USE_OS_WIN32              FALSE
15
-//#define GFX_USE_OS_LINUX              FALSE
16
-//#define GFX_USE_OS_OSX                FALSE
13
+//#define GFX_USE_OS_CHIBIOS            GFXOFF
14
+//#define GFX_USE_OS_WIN32              GFXOFF
15
+//#define GFX_USE_OS_LINUX              GFXOFF
16
+//#define GFX_USE_OS_OSX                GFXOFF
17 17
 
18 18
 /* GFX sub-systems to turn on */
19
-#define GFX_USE_GDISP                   TRUE
19
+#define GFX_USE_GDISP                   GFXON
20 20
 
21 21
 /* Features for the GDISP sub-system. */
22
-#define GDISP_NEED_VALIDATION           FALSE
23
-#define GDISP_NEED_CLIP                 FALSE
24
-#define GDISP_NEED_TEXT                 FALSE
25
-#define GDISP_NEED_CIRCLE               TRUE
26
-#define GDISP_NEED_ELLIPSE              FALSE
27
-#define GDISP_NEED_ARC                  FALSE
28
-#define GDISP_NEED_SCROLL               FALSE
29
-#define GDISP_NEED_PIXELREAD            FALSE
30
-#define GDISP_NEED_CONTROL              FALSE
31
-#define GDISP_NEED_MULTITHREAD          FALSE
32
-#define GDISP_NEED_ASYNC                FALSE
33
-#define GDISP_NEED_MSGAPI               FALSE
22
+#define GDISP_NEED_VALIDATION           GFXOFF
23
+#define GDISP_NEED_CLIP                 GFXOFF
24
+#define GDISP_NEED_TEXT                 GFXOFF
25
+#define GDISP_NEED_CIRCLE               GFXON
26
+#define GDISP_NEED_ELLIPSE              GFXOFF
27
+#define GDISP_NEED_ARC                  GFXOFF
28
+#define GDISP_NEED_SCROLL               GFXOFF
29
+#define GDISP_NEED_PIXELREAD            GFXOFF
30
+#define GDISP_NEED_CONTROL              GFXOFF
31
+#define GDISP_NEED_MULTITHREAD          GFXOFF
32
+#define GDISP_NEED_ASYNC                GFXOFF
33
+#define GDISP_NEED_MSGAPI               GFXOFF
34 34
 
35 35
 /* Builtin Fonts */
36
-#define GDISP_INCLUDE_FONT_SMALL        FALSE
37
-#define GDISP_INCLUDE_FONT_LARGER       FALSE
38
-#define GDISP_INCLUDE_FONT_UI1          FALSE
39
-#define GDISP_INCLUDE_FONT_UI2          FALSE
40
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
36
+#define GDISP_INCLUDE_FONT_SMALL        GFXOFF
37
+#define GDISP_INCLUDE_FONT_LARGER       GFXOFF
38
+#define GDISP_INCLUDE_FONT_UI1          GFXOFF
39
+#define GDISP_INCLUDE_FONT_UI2          GFXOFF
40
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
41 41
 
42 42
 #endif /* _GFXCONF_H */

+ 38 - 38
demos/3rdparty/notepad-2/gfxconf.h

@@ -10,55 +10,55 @@
10 10
 #define _GFXCONF_H
11 11
 
12 12
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
13
-//#define GFX_USE_OS_CHIBIOS	FALSE
14
-//#define GFX_USE_OS_WIN32		FALSE
15
-//#define GFX_USE_OS_LINUX		FALSE
16
-//#define GFX_USE_OS_OSX		FALSE
13
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
14
+//#define GFX_USE_OS_WIN32		GFXOFF
15
+//#define GFX_USE_OS_LINUX		GFXOFF
16
+//#define GFX_USE_OS_OSX		GFXOFF
17 17
 
18 18
 /* GFX sub-systems to turn on */
19
-#define GFX_USE_GDISP			TRUE
20
-#define GFX_USE_GWIN			TRUE
21
-#define GFX_USE_GEVENT			TRUE
22
-#define GFX_USE_GTIMER			TRUE
23
-#define GFX_USE_GINPUT			TRUE
19
+#define GFX_USE_GDISP			GFXON
20
+#define GFX_USE_GWIN			GFXON
21
+#define GFX_USE_GEVENT			GFXON
22
+#define GFX_USE_GTIMER			GFXON
23
+#define GFX_USE_GINPUT			GFXON
24 24
 
25 25
 /* Features for the GDISP sub-system. */
26
-#define GDISP_NEED_VALIDATION		TRUE
27
-#define GDISP_NEED_CLIP				TRUE
28
-#define GDISP_NEED_TEXT				TRUE
29
-#define GDISP_NEED_CIRCLE			TRUE
30
-#define GDISP_NEED_ELLIPSE			FALSE
31
-#define GDISP_NEED_ARC				FALSE
32
-#define GDISP_NEED_CONVEX_POLYGON	FALSE
33
-#define GDISP_NEED_SCROLL			FALSE
34
-#define GDISP_NEED_PIXELREAD		FALSE
35
-#define GDISP_NEED_CONTROL			TRUE
36
-#define GDISP_NEED_IMAGE			TRUE
37
-#define GDISP_NEED_MULTITHREAD		TRUE
38
-#define GDISP_NEED_ASYNC			FALSE
39
-#define GDISP_NEED_MSGAPI			FALSE
26
+#define GDISP_NEED_VALIDATION		GFXON
27
+#define GDISP_NEED_CLIP				GFXON
28
+#define GDISP_NEED_TEXT				GFXON
29
+#define GDISP_NEED_CIRCLE			GFXON
30
+#define GDISP_NEED_ELLIPSE			GFXOFF
31
+#define GDISP_NEED_ARC				GFXOFF
32
+#define GDISP_NEED_CONVEX_POLYGON	GFXOFF
33
+#define GDISP_NEED_SCROLL			GFXOFF
34
+#define GDISP_NEED_PIXELREAD		GFXOFF
35
+#define GDISP_NEED_CONTROL			GFXON
36
+#define GDISP_NEED_IMAGE			GFXON
37
+#define GDISP_NEED_MULTITHREAD		GFXON
38
+#define GDISP_NEED_ASYNC			GFXOFF
39
+#define GDISP_NEED_MSGAPI			GFXOFF
40 40
 
41 41
 /* Builtin Fonts */
42
-#define GDISP_INCLUDE_FONT_SMALL		FALSE
43
-#define GDISP_INCLUDE_FONT_LARGER		FALSE
44
-#define GDISP_INCLUDE_FONT_UI1			FALSE
45
-#define GDISP_INCLUDE_FONT_UI2			TRUE
46
-#define GDISP_INCLUDE_FONT_LARGENUMBERS	FALSE
42
+#define GDISP_INCLUDE_FONT_SMALL		GFXOFF
43
+#define GDISP_INCLUDE_FONT_LARGER		GFXOFF
44
+#define GDISP_INCLUDE_FONT_UI1			GFXOFF
45
+#define GDISP_INCLUDE_FONT_UI2			GFXON
46
+#define GDISP_INCLUDE_FONT_LARGENUMBERS	GFXOFF
47 47
 
48 48
 /* GDISP image decoders */
49
-#define GDISP_NEED_IMAGE_NATIVE		FALSE
50
-#define GDISP_NEED_IMAGE_GIF		TRUE
51
-#define GDISP_NEED_IMAGE_BMP		FALSE
52
-#define GDISP_NEED_IMAGE_JPG		FALSE
53
-#define GDISP_NEED_IMAGE_PNG		FALSE
49
+#define GDISP_NEED_IMAGE_NATIVE		GFXOFF
50
+#define GDISP_NEED_IMAGE_GIF		GFXON
51
+#define GDISP_NEED_IMAGE_BMP		GFXOFF
52
+#define GDISP_NEED_IMAGE_JPG		GFXOFF
53
+#define GDISP_NEED_IMAGE_PNG		GFXOFF
54 54
 
55 55
 /* Features for the GWIN sub-system. */
56
-#define GWIN_NEED_BUTTON		TRUE
57
-#define GWIN_NEED_CONSOLE		TRUE
58
-#define GWIN_NEED_SLIDER		TRUE
56
+#define GWIN_NEED_BUTTON		GFXON
57
+#define GWIN_NEED_CONSOLE		GFXON
58
+#define GWIN_NEED_SLIDER		GFXON
59 59
 
60 60
 /* Features for the GINPUT sub-system. */
61
-#define GINPUT_NEED_MOUSE		TRUE
62
-#define GINPUT_NEED_DIAL		FALSE
61
+#define GINPUT_NEED_MOUSE		GFXON
62
+#define GINPUT_NEED_DIAL		GFXOFF
63 63
 
64 64
 #endif /* _GFXCONF_H */

+ 2 - 2
demos/applications/combo/bounce.c

@@ -48,11 +48,11 @@ static gfxThreadHandle	thread;
48 48
  * your processor.
49 49
  *
50 50
  * You can modify the implementation of invsqrt() by firstly defining
51
- * 		#define GMISC_INVSQRT_MIXED_ENDIAN	TRUE
51
+ * 		#define GMISC_INVSQRT_MIXED_ENDIAN	GFXON
52 52
  * in your gfxconf.h file.
53 53
  *
54 54
  * If it still doesn't work then instead define
55
- * 		#define GMISC_INVSQRT_REAL_SLOW		TRUE
55
+ * 		#define GMISC_INVSQRT_REAL_SLOW		GFXON
56 56
  * in your gfxconf.h file. This should always work although it will probably be slow.
57 57
  */
58 58
 #define BALLCOLOR1		Red

+ 57 - 57
demos/applications/combo/gfxconf.h

@@ -19,109 +19,109 @@
19 19
 #define _GFXCONF_H
20 20
 
21 21
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
22
-//#define GFX_USE_OS_CHIBIOS                         TRUE
23
-//#define GFX_USE_OS_WIN32                           TRUE
24
-//#define GFX_USE_OS_LINUX                           TRUE
25
-//#define GFX_USE_OS_OSX                             TRUE
22
+//#define GFX_USE_OS_CHIBIOS                         GFXON
23
+//#define GFX_USE_OS_WIN32                           GFXON
24
+//#define GFX_USE_OS_LINUX                           GFXON
25
+//#define GFX_USE_OS_OSX                             GFXON
26 26
 
27 27
 
28 28
 ///////////////////////////////////////////////////////////////////////////
29 29
 // GDISP                                                                 //
30 30
 ///////////////////////////////////////////////////////////////////////////
31
-#define GFX_USE_GDISP                                TRUE
31
+#define GFX_USE_GDISP                                GFXON
32 32
 
33
-#define GDISP_NEED_VALIDATION                        TRUE
34
-#define GDISP_NEED_CLIP                              TRUE
35
-#define GDISP_NEED_CIRCLE                            TRUE
36
-#define GDISP_NEED_CONVEX_POLYGON                    TRUE
37
-//#define GDISP_NEED_SCROLL                            TRUE
38
-#define GDISP_NEED_CONTROL                           TRUE
39
-#define GDISP_NEED_TEXT                              TRUE
40
-    #define GDISP_INCLUDE_FONT_UI2                   TRUE
41
-#define GDISP_NEED_STREAMING	TRUE
33
+#define GDISP_NEED_VALIDATION                        GFXON
34
+#define GDISP_NEED_CLIP                              GFXON
35
+#define GDISP_NEED_CIRCLE                            GFXON
36
+#define GDISP_NEED_CONVEX_POLYGON                    GFXON
37
+//#define GDISP_NEED_SCROLL                            GFXON
38
+#define GDISP_NEED_CONTROL                           GFXON
39
+#define GDISP_NEED_TEXT                              GFXON
40
+    #define GDISP_INCLUDE_FONT_UI2                   GFXON
41
+#define GDISP_NEED_STREAMING	                     GFXON
42 42
 
43
-#define GDISP_NEED_IMAGE                             TRUE
44
-    #define GDISP_NEED_IMAGE_BMP                     TRUE
45
-    #define GDISP_NEED_IMAGE_GIF                     TRUE
43
+#define GDISP_NEED_IMAGE                             GFXON
44
+    #define GDISP_NEED_IMAGE_BMP                     GFXON
45
+    #define GDISP_NEED_IMAGE_GIF                     GFXON
46 46
 
47 47
 #define GDISP_DEFAULT_ORIENTATION                    GDISP_ROTATE_LANDSCAPE
48
-#define GDISP_NEED_MULTITHREAD                       TRUE
48
+#define GDISP_NEED_MULTITHREAD                       GFXON
49 49
 
50 50
 ///////////////////////////////////////////////////////////////////////////
51 51
 // GWIN                                                                  //
52 52
 ///////////////////////////////////////////////////////////////////////////
53
-#define GFX_USE_GWIN                                 TRUE
53
+#define GFX_USE_GWIN                                 GFXON
54 54
 
55
-#define GWIN_NEED_WINDOWMANAGER                      TRUE
56
-	#define GWIN_NEED_FLASHING						 TRUE
55
+#define GWIN_NEED_WINDOWMANAGER                      GFXON
56
+	#define GWIN_NEED_FLASHING						 GFXON
57 57
 
58
-#define GWIN_NEED_CONSOLE                            TRUE
59
-    #define GWIN_CONSOLE_USE_HISTORY                 TRUE
60
-        #define GWIN_CONSOLE_HISTORY_AVERAGING       TRUE
61
-        #define GWIN_CONSOLE_HISTORY_ATCREATE        TRUE
62
-#define GWIN_NEED_GRAPH                              TRUE
58
+#define GWIN_NEED_CONSOLE                            GFXON
59
+    #define GWIN_CONSOLE_USE_HISTORY                 GFXON
60
+        #define GWIN_CONSOLE_HISTORY_AVERAGING       GFXON
61
+        #define GWIN_CONSOLE_HISTORY_ATCREATE        GFXON
62
+#define GWIN_NEED_GRAPH                              GFXON
63 63
 
64
-#define GWIN_NEED_WIDGET                             TRUE
65
-    #define GWIN_NEED_LABEL                          TRUE
66
-        #define GWIN_LABEL_ATTRIBUTE                 TRUE
67
-    #define GWIN_NEED_BUTTON                         TRUE
68
-//        #define GWIN_BUTTON_LAZY_RELEASE             TRUE
69
-    #define GWIN_NEED_SLIDER                         TRUE
70
-    #define GWIN_NEED_CHECKBOX                       TRUE
71
-    #define GWIN_NEED_IMAGE                          TRUE
72
-    #define GWIN_NEED_RADIO                          TRUE
73
-    #define GWIN_NEED_LIST                           TRUE
74
-        #define GWIN_NEED_LIST_IMAGES                TRUE
75
-    #define GWIN_NEED_PROGRESSBAR                    TRUE
76
-        #define GWIN_PROGRESSBAR_AUTO                TRUE
64
+#define GWIN_NEED_WIDGET                             GFXON
65
+    #define GWIN_NEED_LABEL                          GFXON
66
+        #define GWIN_LABEL_ATTRIBUTE                 GFXON
67
+    #define GWIN_NEED_BUTTON                         GFXON
68
+//        #define GWIN_BUTTON_LAZY_RELEASE             GFXON
69
+    #define GWIN_NEED_SLIDER                         GFXON
70
+    #define GWIN_NEED_CHECKBOX                       GFXON
71
+    #define GWIN_NEED_IMAGE                          GFXON
72
+    #define GWIN_NEED_RADIO                          GFXON
73
+    #define GWIN_NEED_LIST                           GFXON
74
+        #define GWIN_NEED_LIST_IMAGES                GFXON
75
+    #define GWIN_NEED_PROGRESSBAR                    GFXON
76
+        #define GWIN_PROGRESSBAR_AUTO                GFXON
77 77
 
78
-#define GWIN_NEED_CONTAINERS                         TRUE
79
-    #define GWIN_NEED_CONTAINER                      TRUE
78
+#define GWIN_NEED_CONTAINERS                         GFXON
79
+    #define GWIN_NEED_CONTAINER                      GFXON
80 80
 
81
-#define GWIN_NEED_TABSET                             TRUE
81
+#define GWIN_NEED_TABSET                             GFXON
82 82
 
83 83
 ///////////////////////////////////////////////////////////////////////////
84 84
 // GEVENT                                                                //
85 85
 ///////////////////////////////////////////////////////////////////////////
86
-#define GFX_USE_GEVENT                               TRUE
86
+#define GFX_USE_GEVENT                               GFXON
87 87
 
88 88
 ///////////////////////////////////////////////////////////////////////////
89 89
 // GTIMER                                                                //
90 90
 ///////////////////////////////////////////////////////////////////////////
91
-#define GFX_USE_GTIMER                               TRUE
91
+#define GFX_USE_GTIMER                               GFXON
92 92
 
93 93
 ///////////////////////////////////////////////////////////////////////////
94 94
 // GQUEUE                                                                //
95 95
 ///////////////////////////////////////////////////////////////////////////
96
-#define GFX_USE_GQUEUE                               TRUE
96
+#define GFX_USE_GQUEUE                               GFXON
97 97
 
98
-#define GQUEUE_NEED_ASYNC                            TRUE
98
+#define GQUEUE_NEED_ASYNC                            GFXON
99 99
 
100 100
 ///////////////////////////////////////////////////////////////////////////
101 101
 // GINPUT                                                                //
102 102
 ///////////////////////////////////////////////////////////////////////////
103
-#define GFX_USE_GINPUT                               TRUE
103
+#define GFX_USE_GINPUT                               GFXON
104 104
 
105
-#define GINPUT_NEED_MOUSE                            TRUE
106
-//#define GINPUT_NEED_TOGGLE                           TRUE
107
-//#define GINPUT_NEED_DIAL                             TRUE
105
+#define GINPUT_NEED_MOUSE                            GFXON
106
+//#define GINPUT_NEED_TOGGLE                           GFXON
107
+//#define GINPUT_NEED_DIAL                             GFXON
108 108
 
109 109
 ///////////////////////////////////////////////////////////////////////////
110 110
 // GFILE                                                                 //
111 111
 ///////////////////////////////////////////////////////////////////////////
112
-#define GFX_USE_GFILE                                TRUE
112
+#define GFX_USE_GFILE                                GFXON
113 113
 
114
-#define GFILE_NEED_PRINTG                            TRUE
115
-#define GFILE_NEED_STRINGS                           TRUE
114
+#define GFILE_NEED_PRINTG                            GFXON
115
+#define GFILE_NEED_STRINGS                           GFXON
116 116
 
117
-#define GFILE_NEED_ROMFS                             TRUE
118
-//#define GFILE_NEED_NATIVEFS                          TRUE
117
+#define GFILE_NEED_ROMFS                             GFXON
118
+//#define GFILE_NEED_NATIVEFS                          GFXON
119 119
 
120 120
 ///////////////////////////////////////////////////////////////////////////
121 121
 // GMISC                                                                 //
122 122
 ///////////////////////////////////////////////////////////////////////////
123
-#define GFX_USE_GMISC				TRUE
124
-#define GMISC_NEED_INVSQRT			TRUE
123
+#define GFX_USE_GMISC				                 GFXON
124
+#define GMISC_NEED_INVSQRT			                 GFXON
125 125
 
126 126
 
127 127
 #endif /* _GFXCONF_H */

+ 6 - 6
demos/applications/mandelbrot/gfxconf.h

@@ -31,15 +31,15 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION	TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44 44
 
45 45
 #endif /* _GFXCONF_H */

+ 17 - 17
demos/applications/notepad/gfxconf.h

@@ -31,30 +31,30 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GEVENT			TRUE
42
-#define GFX_USE_GTIMER			TRUE
43
-#define GFX_USE_GINPUT			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GEVENT			GFXON
42
+#define GFX_USE_GTIMER			GFXON
43
+#define GFX_USE_GINPUT			GFXON
44 44
 
45 45
 /* Features for the GDISP sub-system. */
46
-#define GDISP_NEED_VALIDATION	TRUE
47
-#define GDISP_NEED_CLIP			TRUE
48
-#define GDISP_NEED_TEXT			TRUE
49
-#define GDISP_NEED_CIRCLE		TRUE
50
-#define GDISP_NEED_MULTITHREAD	TRUE
46
+#define GDISP_NEED_VALIDATION	GFXON
47
+#define GDISP_NEED_CLIP			GFXON
48
+#define GDISP_NEED_TEXT			GFXON
49
+#define GDISP_NEED_CIRCLE		GFXON
50
+#define GDISP_NEED_MULTITHREAD	GFXON
51 51
 
52 52
 /* Builtin Fonts */
53
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		TRUE
54
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		TRUE
55
-#define GDISP_NEED_ANTIALIAS				TRUE
53
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		GFXON
54
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		GFXON
55
+#define GDISP_NEED_ANTIALIAS				GFXON
56 56
 
57 57
 /* Features for the GINPUT sub-system. */
58
-#define GINPUT_NEED_MOUSE		TRUE
58
+#define GINPUT_NEED_MOUSE		GFXON
59 59
 
60 60
 #endif /* _GFXCONF_H */

+ 10 - 10
demos/benchmarks/gfxconf.h

@@ -31,22 +31,22 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP                   TRUE
40
+#define GFX_USE_GDISP                   GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION           FALSE
44
-#define GDISP_NEED_CLIP                 FALSE
45
-#define GDISP_NEED_TEXT                 TRUE
46
-#define GDISP_NEED_CONTROL              TRUE
43
+#define GDISP_NEED_VALIDATION           GFXOFF
44
+#define GDISP_NEED_CLIP                 GFXOFF
45
+#define GDISP_NEED_TEXT                 GFXON
46
+#define GDISP_NEED_CONTROL              GFXON
47 47
 
48 48
 /* Builtin Fonts */
49
-#define GDISP_INCLUDE_FONT_UI2          TRUE
49
+#define GDISP_INCLUDE_FONT_UI2          GFXON
50 50
 
51 51
 #endif /* _GFXCONF_H */
52 52
 

+ 1 - 1
demos/games/justget10/demo.mk

@@ -6,4 +6,4 @@ GFXINC +=   $(DEMODIR) \
6 6
 GFXSRC +=	$(DEMODIR)/main.c \
7 7
 			$(DEMODIR)/jg10.c
8 8
 			
9
-DEFS += -DJG10_SHOW_SPLASH=TRUE
9
+DEFS += -DJG10_SHOW_SPLASH=GFXON

+ 41 - 41
demos/games/justget10/gfxconf.h

@@ -31,65 +31,65 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* GFX sub-systems to turn on */
34
-#define GFX_USE_GDISP			                TRUE
35
-#define GFX_USE_GEVENT			                TRUE
36
-#define GFX_USE_GTIMER			                TRUE
37
-#define GFX_USE_GINPUT			                TRUE
34
+#define GFX_USE_GDISP			                GFXON
35
+#define GFX_USE_GEVENT			                GFXON
36
+#define GFX_USE_GTIMER			                GFXON
37
+#define GFX_USE_GINPUT			                GFXON
38 38
 
39
-#define GFX_USE_GFILE                           TRUE
40
-#define GFILE_NEED_ROMFS                        TRUE
39
+#define GFX_USE_GFILE                           GFXON
40
+#define GFILE_NEED_ROMFS                        GFXON
41 41
 #define GFILE_MAX_GFILES                         24
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_CONTROL		                TRUE
45
-#define GDISP_NEED_VALIDATION		            TRUE
46
-#define GDISP_NEED_CLIP			                TRUE
47
-#define GDISP_NEED_TEXT			                TRUE
48
-#define GDISP_NEED_MULTITHREAD		            TRUE
49
-#define GDISP_NEED_IMAGE		                TRUE
50
-#define GDISP_NEED_IMAGE_BMP		            TRUE
51
-#define GDISP_NEED_CIRCLE		                TRUE
52
-#define GDISP_NEED_ELLIPSE		                TRUE
53
-#define GDISP_NEED_ARC			                TRUE
54
-#define GDISP_NEED_STARTUP_LOGO                 FALSE
44
+#define GDISP_NEED_CONTROL		                GFXON
45
+#define GDISP_NEED_VALIDATION		            GFXON
46
+#define GDISP_NEED_CLIP			                GFXON
47
+#define GDISP_NEED_TEXT			                GFXON
48
+#define GDISP_NEED_MULTITHREAD		            GFXON
49
+#define GDISP_NEED_IMAGE		                GFXON
50
+#define GDISP_NEED_IMAGE_BMP		            GFXON
51
+#define GDISP_NEED_CIRCLE		                GFXON
52
+#define GDISP_NEED_ELLIPSE		                GFXON
53
+#define GDISP_NEED_ARC			                GFXON
54
+#define GDISP_NEED_STARTUP_LOGO                 GFXOFF
55 55
 
56 56
 
57 57
 //////////////////
58
-#define GFX_USE_GWIN                            TRUE
58
+#define GFX_USE_GWIN                            GFXON
59 59
 
60
-#define GWIN_NEED_WINDOWMANAGER                 TRUE
61
-#define GQUEUE_NEED_ASYNC                       TRUE
62
-#define GFX_USE_GQUEUE                          TRUE
63
-#define GWIN_REDRAW_IMMEDIATE                   TRUE
64
-#define GWIN_REDRAW_SINGLEOP                    TRUE
60
+#define GWIN_NEED_WINDOWMANAGER                 GFXON
61
+#define GQUEUE_NEED_ASYNC                       GFXON
62
+#define GFX_USE_GQUEUE                          GFXON
63
+#define GWIN_REDRAW_IMMEDIATE                   GFXON
64
+#define GWIN_REDRAW_SINGLEOP                    GFXON
65 65
 
66
-#define GWIN_NEED_WIDGET                        TRUE
67
-#define GWIN_NEED_BUTTON                        TRUE
68
-#define GWIN_BUTTON_LAZY_RELEASE                FALSE
69
-#define GWIN_NEED_SLIDER                        TRUE
70
-#define GWIN_FLAT_STYLING                       FALSE
66
+#define GWIN_NEED_WIDGET                        GFXON
67
+#define GWIN_NEED_BUTTON                        GFXON
68
+#define GWIN_BUTTON_LAZY_RELEASE                GFXOFF
69
+#define GWIN_NEED_SLIDER                        GFXON
70
+#define GWIN_FLAT_STYLING                       GFXOFF
71 71
 
72
-#define GWIN_NEED_CONTAINERS                    TRUE
73
-#define GWIN_NEED_CONTAINER                     TRUE
74
-#define GWIN_NEED_FRAME                         FALSE
75
-#define GWIN_NEED_TABSET                        FALSE
72
+#define GWIN_NEED_CONTAINERS                    GFXON
73
+#define GWIN_NEED_CONTAINER                     GFXON
74
+#define GWIN_NEED_FRAME                         GFXOFF
75
+#define GWIN_NEED_TABSET                        GFXOFF
76 76
 
77 77
 
78
-#define GWIN_NEED_CONSOLE                            TRUE
79
-    #define GWIN_CONSOLE_USE_HISTORY                 TRUE
80
-        #define GWIN_CONSOLE_HISTORY_AVERAGING       TRUE
81
-        #define GWIN_CONSOLE_HISTORY_ATCREATE        TRUE
82
-    #define GWIN_CONSOLE_ESCSEQ                      TRUE
83
-    #define GWIN_CONSOLE_USE_BASESTREAM              TRUE
84
-#define GWIN_NEED_GRAPH                              TRUE
78
+#define GWIN_NEED_CONSOLE                            GFXON
79
+    #define GWIN_CONSOLE_USE_HISTORY                 GFXON
80
+        #define GWIN_CONSOLE_HISTORY_AVERAGING       GFXON
81
+        #define GWIN_CONSOLE_HISTORY_ATCREATE        GFXON
82
+    #define GWIN_CONSOLE_ESCSEQ                      GFXON
83
+    #define GWIN_CONSOLE_USE_BASESTREAM              GFXON
84
+#define GWIN_NEED_GRAPH                              GFXON
85 85
 
86 86
 
87 87
 
88 88
 /* Builtin Fonts */
89
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16      TRUE
89
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16      GFXON
90 90
 
91 91
 
92 92
 /* Features for the GINPUT sub-system. */
93
-#define GINPUT_NEED_MOUSE                       TRUE
93
+#define GINPUT_NEED_MOUSE                       GFXON
94 94
 
95 95
 #endif /* _GFXCONF_H */

+ 1 - 1
demos/games/minesweeper/demo.mk

@@ -6,4 +6,4 @@ GFXINC +=   $(DEMODIR) \
6 6
 GFXSRC +=	$(DEMODIR)/main.c \
7 7
 			$(DEMODIR)/mines.c
8 8
 			
9
-DEFS += -DMINES_SHOW_SPLASH=TRUE
9
+DEFS += -DMINES_SHOW_SPLASH=GFXON

+ 22 - 23
demos/games/minesweeper/gfxconf.h

@@ -31,35 +31,34 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* GFX sub-systems to turn on */
34
-#define GFX_USE_GDISP			                TRUE
35
-#define GFX_USE_GWIN			                TRUE
36
-#define GFX_USE_GEVENT			                TRUE
37
-#define GFX_USE_GTIMER			                TRUE
38
-#define GFX_USE_GINPUT			                TRUE
34
+#define GFX_USE_GDISP			                GFXON
35
+#define GFX_USE_GWIN			                GFXON
36
+#define GFX_USE_GEVENT			                GFXON
37
+#define GFX_USE_GTIMER			                GFXON
38
+#define GFX_USE_GINPUT			                GFXON
39 39
 
40
-#define GFX_USE_GFILE                           TRUE
41
-#define GFILE_NEED_ROMFS                        TRUE
40
+#define GFX_USE_GFILE                           GFXON
41
+#define GFILE_NEED_ROMFS                        GFXON
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_CONTROL		                TRUE
45
-#define GDISP_NEED_VALIDATION		            TRUE
46
-#define GDISP_NEED_CLIP			                TRUE
47
-#define GDISP_NEED_TEXT			                TRUE
48
-#define GDISP_NEED_MULTITHREAD		            TRUE
49
-#define GDISP_NEED_IMAGE		                TRUE
50
-#define GDISP_NEED_IMAGE_BMP		            TRUE
51
-#define GDISP_NEED_CIRCLE		                TRUE
52
-#define GDISP_NEED_ELLIPSE		                TRUE
53
-#define GDISP_NEED_ARC			                TRUE
54
-#define GDISP_NEED_STARTUP_LOGO					FALSE
44
+#define GDISP_NEED_CONTROL		                GFXON
45
+#define GDISP_NEED_VALIDATION		            GFXON
46
+#define GDISP_NEED_CLIP			                GFXON
47
+#define GDISP_NEED_TEXT			                GFXON
48
+#define GDISP_NEED_MULTITHREAD		            GFXON
49
+#define GDISP_NEED_IMAGE		                GFXON
50
+#define GDISP_NEED_IMAGE_BMP		            GFXON
51
+#define GDISP_NEED_CIRCLE		                GFXON
52
+#define GDISP_NEED_ELLIPSE		                GFXON
53
+#define GDISP_NEED_ARC			                GFXON
55 54
 
56 55
 /* Builtin Fonts */
57
-#define GDISP_INCLUDE_USER_FONTS                TRUE
58
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16	        TRUE
59
-#define GDISP_INCLUDE_FONT_FIXED_10X20          TRUE
60
-#define GDISP_INCLUDE_FONT_FIXED_5X8            TRUE
56
+#define GDISP_INCLUDE_USER_FONTS                GFXON
57
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16	        GFXON
58
+#define GDISP_INCLUDE_FONT_FIXED_10X20          GFXON
59
+#define GDISP_INCLUDE_FONT_FIXED_5X8            GFXON
61 60
 
62 61
 /* Features for the GINPUT sub-system. */
63
-#define GINPUT_NEED_MOUSE                       TRUE
62
+#define GINPUT_NEED_MOUSE                       GFXON
64 63
 
65 64
 #endif /* _GFXCONF_H */

+ 1 - 1
demos/games/minesweeper/readme.txt

@@ -1,6 +1,6 @@
1 1
 A demo Minesweeper game using. Various configuration options can be found in mines.h
2 2
 
3
-NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to FALSE.
3
+NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to GFXOFF.
4 4
 
5 5
 Credits:
6 6
 	Code:	Fleck

+ 1 - 1
demos/games/tetris/Example_Makefiles/stm32f4/Makefile

@@ -176,7 +176,7 @@ CPPWARN = -Wall -Wextra
176 176
 #
177 177
 
178 178
 # List all default C defines here, like -D_DEBUG=1
179
-DDEFS = -DGFX_USE_OS_CHIBIOS=TRUE
179
+DDEFS = -DGFX_USE_OS_CHIBIOS=GFXON
180 180
 
181 181
 # List all default ASM defines here, like -D_DEBUG=1
182 182
 DADEFS =

+ 20 - 20
demos/games/tetris/gfxconf.h

@@ -31,38 +31,38 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS		FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS		GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GEVENT			TRUE
42
-#define GFX_USE_GTIMER			TRUE
43
-#define GFX_USE_GINPUT			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GEVENT			GFXON
42
+#define GFX_USE_GTIMER			GFXON
43
+#define GFX_USE_GINPUT			GFXON
44 44
 
45 45
 /* Features for the GDISP sub-system. */
46
-#define GDISP_USE_DMA			TRUE
47
-#define GDISP_NEED_CONTROL		TRUE
48
-#define GDISP_NEED_VALIDATION	TRUE
49
-#define GDISP_NEED_CLIP			TRUE
50
-#define GDISP_NEED_TEXT			TRUE
51
-#define GDISP_NEED_CIRCLE		TRUE
52
-#define GDISP_NEED_MULTITHREAD	TRUE
46
+#define GDISP_USE_DMA			GFXON
47
+#define GDISP_NEED_CONTROL		GFXON
48
+#define GDISP_NEED_VALIDATION	GFXON
49
+#define GDISP_NEED_CLIP			GFXON
50
+#define GDISP_NEED_TEXT			GFXON
51
+#define GDISP_NEED_CIRCLE		GFXON
52
+#define GDISP_NEED_MULTITHREAD	GFXON
53 53
 
54 54
 /* Comment these out if it conflicts with your hardware */
55
-#define GDISP_NEED_CONTROL		TRUE
55
+#define GDISP_NEED_CONTROL		GFXON
56 56
 #define GDISP_DEFAULT_ORIENTATION    GDISP_ROTATE_PORTRAIT
57 57
 #define GDISP_SCREEN_WIDTH      240
58 58
 #define GDISP_SCREEN_HEIGHT     320
59 59
 
60 60
 /* Builtin Fonts */
61
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12		TRUE
62
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16		TRUE
63
-#define GDISP_NEED_ANTIALIAS				FALSE
61
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12		GFXON
62
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16		GFXON
63
+#define GDISP_NEED_ANTIALIAS				GFXOFF
64 64
 
65 65
 /* Features for the GINPUT sub-system. */
66
-#define GINPUT_NEED_MOUSE		TRUE
66
+#define GINPUT_NEED_MOUSE		GFXON
67 67
 
68 68
 #endif /* _GFXCONF_H */

+ 14 - 14
demos/modules/gadc/gfxconf.h

@@ -36,27 +36,27 @@
36 36
 #define _GFXCONF_H
37 37
 
38 38
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
39
-//#define GFX_USE_OS_CHIBIOS	FALSE
40
-//#define GFX_USE_OS_WIN32		FALSE
41
-//#define GFX_USE_OS_LINUX		FALSE
42
-//#define GFX_USE_OS_OSX		FALSE
39
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
40
+//#define GFX_USE_OS_WIN32		GFXOFF
41
+//#define GFX_USE_OS_LINUX		GFXOFF
42
+//#define GFX_USE_OS_OSX		GFXOFF
43 43
 
44 44
 /* GFX sub-systems to turn on */
45
-#define GFX_USE_GDISP			TRUE
46
-#define GFX_USE_GWIN			TRUE
47
-#define GFX_USE_GTIMER			TRUE
48
-#define GFX_USE_GADC			TRUE
45
+#define GFX_USE_GDISP			GFXON
46
+#define GFX_USE_GWIN			GFXON
47
+#define GFX_USE_GTIMER			GFXON
48
+#define GFX_USE_GADC			GFXON
49 49
 
50 50
 /* Features for the GDISP sub-system. */
51
-#define GDISP_NEED_VALIDATION	TRUE
52
-#define GDISP_NEED_CLIP			TRUE
53
-#define GDISP_NEED_TEXT			TRUE
54
-#define GDISP_NEED_MULTITHREAD	TRUE
51
+#define GDISP_NEED_VALIDATION	GFXON
52
+#define GDISP_NEED_CLIP			GFXON
53
+#define GDISP_NEED_TEXT			GFXON
54
+#define GDISP_NEED_MULTITHREAD	GFXON
55 55
 
56 56
 /* GDISP - builtin fonts */
57
-#define GDISP_INCLUDE_FONT_UI2			TRUE
57
+#define GDISP_INCLUDE_FONT_UI2			GFXON
58 58
 
59 59
 /* Features for the GWIN sub-system. */
60
-#define GWIN_NEED_CONSOLE		TRUE
60
+#define GWIN_NEED_CONSOLE		GFXON
61 61
 
62 62
 #endif /* _GFXCONF_H */

+ 12 - 12
demos/modules/gaudio/oscilloscope/gfxconf.h

@@ -36,23 +36,23 @@
36 36
 #define _GFXCONF_H
37 37
 
38 38
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
39
-//#define GFX_USE_OS_CHIBIOS	FALSE
40
-//#define GFX_USE_OS_WIN32		FALSE
41
-//#define GFX_USE_OS_LINUX		FALSE
42
-//#define GFX_USE_OS_OSX		FALSE
39
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
40
+//#define GFX_USE_OS_WIN32		GFXOFF
41
+//#define GFX_USE_OS_LINUX		GFXOFF
42
+//#define GFX_USE_OS_OSX		GFXOFF
43 43
 
44 44
 /* GFX sub-systems to turn on */
45
-#define GFX_USE_GDISP			TRUE
46
-#define GFX_USE_GWIN			TRUE
47
-#define GFX_USE_GTIMER			TRUE
48
-#define GFX_USE_GAUDIO			TRUE
45
+#define GFX_USE_GDISP			GFXON
46
+#define GFX_USE_GWIN			GFXON
47
+#define GFX_USE_GTIMER			GFXON
48
+#define GFX_USE_GAUDIO			GFXON
49 49
 
50 50
 /* Features for the GDISP sub-system. */
51
-#define GDISP_NEED_VALIDATION	TRUE
52
-#define GDISP_NEED_CLIP			TRUE
53
-#define GDISP_NEED_MULTITHREAD	TRUE
51
+#define GDISP_NEED_VALIDATION	GFXON
52
+#define GDISP_NEED_CLIP			GFXON
53
+#define GDISP_NEED_MULTITHREAD	GFXON
54 54
 
55 55
 /* Features for the GAUDIO sub-system */
56
-#define GAUDIO_NEED_RECORD		TRUE
56
+#define GAUDIO_NEED_RECORD		GFXON
57 57
 
58 58
 #endif /* _GFXCONF_H */

+ 12 - 12
demos/modules/gaudio/play-vs1053/gfxconf.h

@@ -36,27 +36,27 @@
36 36
 #define _GFXCONF_H
37 37
 
38 38
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
39
-//#define GFX_USE_OS_CHIBIOS	FALSE
40
-//#define GFX_USE_OS_WIN32		FALSE
41
-//#define GFX_USE_OS_LINUX		FALSE
42
-//#define GFX_USE_OS_OSX		FALSE
39
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
40
+//#define GFX_USE_OS_WIN32		GFXOFF
41
+//#define GFX_USE_OS_LINUX		GFXOFF
42
+//#define GFX_USE_OS_OSX		GFXOFF
43 43
 
44 44
 /* GFX sub-systems to turn on */
45
-#define GFX_USE_GDISP			TRUE
46
-#define GFX_USE_GAUDIO			TRUE
47
-#define GFX_USE_GFILE			TRUE
45
+#define GFX_USE_GDISP			GFXON
46
+#define GFX_USE_GAUDIO			GFXON
47
+#define GFX_USE_GFILE			GFXON
48 48
 
49 49
 /* Features for the GDISP sub-system. */
50
-#define GDISP_NEED_VALIDATION	TRUE
51
-#define GDISP_NEED_TEXT			TRUE
50
+#define GDISP_NEED_VALIDATION	GFXON
51
+#define GDISP_NEED_TEXT			GFXON
52 52
 
53 53
 /* GDISP fonts to include */
54
-#define GDISP_INCLUDE_FONT_UI2	TRUE
54
+#define GDISP_INCLUDE_FONT_UI2	GFXON
55 55
 
56 56
 /* Features for the GAUDIO sub-system */
57
-#define GAUDIO_NEED_PLAY		TRUE
57
+#define GAUDIO_NEED_PLAY		GFXON
58 58
 
59 59
 /* Features for the GFILE sub-system */
60
-#define GFILE_NEED_ROMFS		TRUE
60
+#define GFILE_NEED_ROMFS		GFXON
61 61
 
62 62
 #endif /* _GFXCONF_H */

+ 12 - 12
demos/modules/gaudio/play-wave/gfxconf.h

@@ -36,27 +36,27 @@
36 36
 #define _GFXCONF_H
37 37
 
38 38
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
39
-//#define GFX_USE_OS_CHIBIOS	FALSE
40
-//#define GFX_USE_OS_WIN32		FALSE
41
-//#define GFX_USE_OS_LINUX		FALSE
42
-//#define GFX_USE_OS_OSX		FALSE
39
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
40
+//#define GFX_USE_OS_WIN32		GFXOFF
41
+//#define GFX_USE_OS_LINUX		GFXOFF
42
+//#define GFX_USE_OS_OSX		GFXOFF
43 43
 
44 44
 /* GFX sub-systems to turn on */
45
-#define GFX_USE_GDISP			TRUE
46
-#define GFX_USE_GAUDIO			TRUE
47
-#define GFX_USE_GFILE			TRUE
45
+#define GFX_USE_GDISP			GFXON
46
+#define GFX_USE_GAUDIO			GFXON
47
+#define GFX_USE_GFILE			GFXON
48 48
 
49 49
 /* Features for the GDISP sub-system. */
50
-#define GDISP_NEED_VALIDATION	TRUE
51
-#define GDISP_NEED_TEXT			TRUE
50
+#define GDISP_NEED_VALIDATION	GFXON
51
+#define GDISP_NEED_TEXT			GFXON
52 52
 
53 53
 /* GDISP fonts to include */
54
-#define GDISP_INCLUDE_FONT_UI2	TRUE
54
+#define GDISP_INCLUDE_FONT_UI2	GFXON
55 55
 
56 56
 /* Features for the GAUDIO sub-system */
57
-#define GAUDIO_NEED_PLAY		TRUE
57
+#define GAUDIO_NEED_PLAY		GFXON
58 58
 
59 59
 /* Features for the GFILE sub-system */
60
-#define GFILE_NEED_ROMFS		TRUE
60
+#define GFILE_NEED_ROMFS		GFXON
61 61
 
62 62
 #endif /* _GFXCONF_H */

+ 7 - 7
demos/modules/gdisp/arcsectors/gfxconf.h

@@ -31,17 +31,17 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP subsystem. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_ARCSECTORS	TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_ARCSECTORS	GFXON
45 45
 
46 46
 
47 47
 #endif /* _GFXCONF_H */

+ 7 - 7
demos/modules/gdisp/basics/gfxconf.h

@@ -31,17 +31,17 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_CLIP			TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_CLIP			GFXON
45 45
 
46 46
 #endif /* _GFXCONF_H */
47 47
 

+ 13 - 13
demos/modules/gdisp/circles/gfxconf.h

@@ -31,25 +31,25 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GMISC			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GMISC			GFXON
42 42
 
43 43
 /* Features for the GDISP subsystem. */
44
-#define GDISP_NEED_VALIDATION	TRUE
45
-#define GDISP_NEED_CLIP			TRUE
46
-#define GDISP_NEED_CIRCLE		TRUE
47
-#define GDISP_NEED_ELLIPSE		TRUE
48
-#define GDISP_NEED_ARC			TRUE
44
+#define GDISP_NEED_VALIDATION	GFXON
45
+#define GDISP_NEED_CLIP			GFXON
46
+#define GDISP_NEED_CIRCLE		GFXON
47
+#define GDISP_NEED_ELLIPSE		GFXON
48
+#define GDISP_NEED_ARC			GFXON
49 49
 
50 50
 /* Features for the GMISC subsystem */
51
-#define GMISC_NEED_FIXEDTRIG	TRUE
52
-#define GMISC_NEED_FASTTRIG		TRUE
51
+#define GMISC_NEED_FIXEDTRIG	GFXON
52
+#define GMISC_NEED_FASTTRIG		GFXON
53 53
 
54 54
 #endif /* _GFXCONF_H */
55 55
 

+ 29 - 29
demos/modules/gdisp/fonts/gfxconf.h

@@ -31,41 +31,41 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_CLIP			TRUE
45
-#define GDISP_NEED_TEXT			TRUE
46
-#define GDISP_NEED_ANTIALIAS	TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_CLIP			GFXON
45
+#define GDISP_NEED_TEXT			GFXON
46
+#define GDISP_NEED_ANTIALIAS	GFXON
47 47
 
48 48
 /* GDISP - fonts to include */
49
-#define GDISP_INCLUDE_USER_FONTS				TRUE
50
-#define GDISP_INCLUDE_FONT_UI1					FALSE
51
-#define GDISP_INCLUDE_FONT_UI2					TRUE
52
-#define GDISP_INCLUDE_FONT_LARGENUMBERS			FALSE
53
-#define GDISP_INCLUDE_FONT_DEJAVUSANS10			FALSE
54
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12			FALSE
55
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16			FALSE
56
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20			FALSE
57
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24			FALSE
58
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32			FALSE
59
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12		FALSE
60
-#define GDISP_INCLUDE_FONT_FIXED_10x20			FALSE
61
-#define GDISP_INCLUDE_FONT_FIXED_7x14			FALSE
62
-#define GDISP_INCLUDE_FONT_FIXED_5x8			FALSE
63
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		FALSE
64
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA		FALSE
65
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA      TRUE
66
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		FALSE
67
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA		FALSE
68
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA	FALSE
49
+#define GDISP_INCLUDE_USER_FONTS				GFXON
50
+#define GDISP_INCLUDE_FONT_UI1					GFXOFF
51
+#define GDISP_INCLUDE_FONT_UI2					GFXON
52
+#define GDISP_INCLUDE_FONT_LARGENUMBERS			GFXOFF
53
+#define GDISP_INCLUDE_FONT_DEJAVUSANS10			GFXOFF
54
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12			GFXOFF
55
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16			GFXOFF
56
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20			GFXOFF
57
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24			GFXOFF
58
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32			GFXOFF
59
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12		GFXOFF
60
+#define GDISP_INCLUDE_FONT_FIXED_10x20			GFXOFF
61
+#define GDISP_INCLUDE_FONT_FIXED_7x14			GFXOFF
62
+#define GDISP_INCLUDE_FONT_FIXED_5x8			GFXOFF
63
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA		GFXOFF
64
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA		GFXOFF
65
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA      GFXON
66
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA		GFXOFF
67
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA		GFXOFF
68
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA	GFXOFF
69 69
 
70 70
 
71 71
 #endif /* _GFXCONF_H */

+ 14 - 14
demos/modules/gdisp/fonts_cyrillic/gfxconf.h

@@ -31,26 +31,26 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX subsystems to turn on */
40
-#define GFX_USE_GDISP				TRUE
40
+#define GFX_USE_GDISP				GFXON
41 41
 
42 42
 /* Features for the GDISP subsystem */
43
-#define GDISP_NEED_VALIDATION		TRUE
44
-#define GDISP_NEED_CLIP				TRUE
45
-#define GDISP_NEED_TEXT				TRUE
46
-#define GDISP_NEED_CIRCLE			TRUE
47
-#define GDISP_NEED_ELLIPSE			TRUE
48
-#define GDISP_NEED_ANTIALIAS		TRUE
49
-#define GDISP_NEED_UTF8				TRUE
50
-#define GDISP_NEED_TEXT_KERNING		TRUE
43
+#define GDISP_NEED_VALIDATION		GFXON
44
+#define GDISP_NEED_CLIP				GFXON
45
+#define GDISP_NEED_TEXT				GFXON
46
+#define GDISP_NEED_CIRCLE			GFXON
47
+#define GDISP_NEED_ELLIPSE			GFXON
48
+#define GDISP_NEED_ANTIALIAS		GFXON
49
+#define GDISP_NEED_UTF8				GFXON
50
+#define GDISP_NEED_TEXT_KERNING		GFXON
51 51
 
52 52
 /* GDISP - fonts to include */
53
-#define GDISP_INCLUDE_USER_FONTS	TRUE
53
+#define GDISP_INCLUDE_USER_FONTS	GFXON
54 54
 
55 55
 #endif /* _GFXCONF_H */
56 56
 

+ 17 - 17
demos/modules/gdisp/images/gfxconf.h

@@ -31,30 +31,30 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION		TRUE
44
-#define GDISP_NEED_CLIP				TRUE
45
-#define GDISP_NEED_IMAGE			TRUE
43
+#define GDISP_NEED_VALIDATION		GFXON
44
+#define GDISP_NEED_CLIP				GFXON
45
+#define GDISP_NEED_IMAGE			GFXON
46 46
 #define GDISP_STARTUP_COLOR			HTML2COLOR(0xC0C0C0)
47 47
 
48 48
 /* GDISP image decoders */
49
-//#define GDISP_NEED_IMAGE_NATIVE		TRUE
50
-//#define GDISP_NEED_IMAGE_GIF		TRUE
51
-#define GDISP_NEED_IMAGE_BMP		TRUE
52
-//#define GDISP_NEED_IMAGE_JPG		TRUE
53
-//#define GDISP_NEED_IMAGE_PNG		TRUE
54
-
55
-#define GFX_USE_GFILE				TRUE
56
-#define GFILE_NEED_ROMFS			TRUE
57
-//#define GFILE_NEED_NATIVEFS			TRUE
49
+//#define GDISP_NEED_IMAGE_NATIVE		GFXON
50
+//#define GDISP_NEED_IMAGE_GIF		GFXON
51
+#define GDISP_NEED_IMAGE_BMP		GFXON
52
+//#define GDISP_NEED_IMAGE_JPG		GFXON
53
+//#define GDISP_NEED_IMAGE_PNG		GFXON
54
+
55
+#define GFX_USE_GFILE				GFXON
56
+#define GFILE_NEED_ROMFS			GFXON
57
+//#define GFILE_NEED_NATIVEFS			GFXON
58 58
 
59 59
 #endif /* _GFXCONF_H */
60 60
 

+ 16 - 16
demos/modules/gdisp/images_animated/gfxconf.h

@@ -31,28 +31,28 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION		TRUE
44
-#define GDISP_NEED_CLIP				TRUE
45
-#define GDISP_NEED_IMAGE			TRUE
43
+#define GDISP_NEED_VALIDATION		GFXON
44
+#define GDISP_NEED_CLIP				GFXON
45
+#define GDISP_NEED_IMAGE			GFXON
46 46
 
47 47
 /* GDISP image decoders */
48
-#define GDISP_NEED_IMAGE_NATIVE		FALSE
49
-#define GDISP_NEED_IMAGE_GIF		TRUE
50
-#define GDISP_NEED_IMAGE_BMP		FALSE
51
-#define GDISP_NEED_IMAGE_JPG		FALSE
52
-#define GDISP_NEED_IMAGE_PNG		FALSE
53
-
54
-#define GFX_USE_GFILE				TRUE
55
-#define GFILE_NEED_ROMFS			TRUE
48
+#define GDISP_NEED_IMAGE_NATIVE		GFXOFF
49
+#define GDISP_NEED_IMAGE_GIF		GFXON
50
+#define GDISP_NEED_IMAGE_BMP		GFXOFF
51
+#define GDISP_NEED_IMAGE_JPG		GFXOFF
52
+#define GDISP_NEED_IMAGE_PNG		GFXOFF
53
+
54
+#define GFX_USE_GFILE				GFXON
55
+#define GFILE_NEED_ROMFS			GFXON
56 56
 
57 57
 #endif /* _GFXCONF_H */
58 58
 

+ 1 - 1
demos/modules/gdisp/images_animated/main.c

@@ -36,7 +36,7 @@
36 36
  * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS.
37 37
  */
38 38
 
39
-#define USE_IMAGE_CACHE			FALSE						// Only if you want to get performance at the expense of RAM
39
+#define USE_IMAGE_CACHE			GFXOFF						// Only if you want to get performance at the expense of RAM
40 40
 #define MY_BG_COLOR				RGB2COLOR(220, 220, 255)	// Pale blue so we can see the transparent parts
41 41
 
42 42
 static gdispImage myImage;

+ 17 - 17
demos/modules/gdisp/images_palettes/gfxconf.h

@@ -31,30 +31,30 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION		TRUE
44
-#define GDISP_NEED_CLIP				TRUE
45
-#define GDISP_NEED_IMAGE			TRUE
43
+#define GDISP_NEED_VALIDATION		GFXON
44
+#define GDISP_NEED_CLIP				GFXON
45
+#define GDISP_NEED_IMAGE			GFXON
46 46
 #define GDISP_STARTUP_COLOR			HTML2COLOR(0xC0C0C0)
47 47
 
48 48
 /* GDISP image decoders */
49
-//#define GDISP_NEED_IMAGE_NATIVE	TRUE
50
-//#define GDISP_NEED_IMAGE_GIF		TRUE
51
-#define GDISP_NEED_IMAGE_BMP		TRUE
52
-//#define GDISP_NEED_IMAGE_JPG		TRUE
53
-//#define GDISP_NEED_IMAGE_PNG		TRUE
54
-
55
-#define GFX_USE_GFILE				TRUE
56
-#define GFILE_NEED_ROMFS			TRUE
57
-//#define GFILE_NEED_NATIVEFS			TRUE
49
+//#define GDISP_NEED_IMAGE_NATIVE	GFXON
50
+//#define GDISP_NEED_IMAGE_GIF		GFXON
51
+#define GDISP_NEED_IMAGE_BMP		GFXON
52
+//#define GDISP_NEED_IMAGE_JPG		GFXON
53
+//#define GDISP_NEED_IMAGE_PNG		GFXON
54
+
55
+#define GFX_USE_GFILE				GFXON
56
+#define GFILE_NEED_ROMFS			GFXON
57
+//#define GFILE_NEED_NATIVEFS			GFXON
58 58
 
59 59
 #endif /* _GFXCONF_H */
60 60
 

+ 1 - 1
demos/modules/gdisp/images_palettes/main.c

@@ -36,7 +36,7 @@
36 36
  * the same time there's still just one copy of the image in memory at all times.
37 37
  */
38 38
 
39
-#define USE_PRINTF TRUE
39
+#define USE_PRINTF GFXON
40 40
 
41 41
 #include "gfx.h"
42 42
 

+ 18 - 18
demos/modules/gdisp/multiple_displays/gfxconf.h

@@ -31,20 +31,20 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 //* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_CLIP			TRUE
45
-#define GDISP_NEED_TEXT			TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_CLIP			GFXON
45
+#define GDISP_NEED_TEXT			GFXON
46 46
 
47
-#define GDISP_INCLUDE_FONT_UI2	TRUE
47
+#define GDISP_INCLUDE_FONT_UI2	GFXON
48 48
 
49 49
 /* You must either define GDISP_TOTAL_DISPLAYS or GDISP_DRIVER_LIST for multiple displays.
50 50
  * You cannot define both!
@@ -66,15 +66,15 @@
66 66
  * as the program doesn't have to detect the hardware method to use on each call.
67 67
  *
68 68
  * Hardware definitions can be set to:
69
- * 		- TRUE		- all controllers support this routine
70
- * 		- FALSE		- no controllers support this routine
69
+ * 		- GFXON		- all controllers support this routine
70
+ * 		- GFXOFF	- no controllers support this routine
71 71
  * 		- if not specified then the code auto-detects the hardware.
72 72
  *
73 73
  * e.g
74
- * 		#define GDISP_HARDWARE_STREAM_WRITE	FALSE
75
- * 		#define GDISP_HARDWARE_STREAM_READ	FALSE
76
- * 		#define GDISP_HARDWARE_DRAWPIXEL	TRUE
77
- * 		#define GDISP_HARDWARE_FILLS		TRUE
74
+ * 		#define GDISP_HARDWARE_STREAM_WRITE	GFXOFF
75
+ * 		#define GDISP_HARDWARE_STREAM_READ	GFXOFF
76
+ * 		#define GDISP_HARDWARE_DRAWPIXEL	GFXON
77
+ * 		#define GDISP_HARDWARE_FILLS		GFXON
78 78
  */
79 79
 #if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX
80 80
 	// Emulator
@@ -90,8 +90,8 @@
90 90
 /*
91 91
  * The following are needed only for the sprintg() call
92 92
  */
93
-#define GFX_USE_GFILE						TRUE
94
-#define GFILE_NEED_PRINTG					TRUE
95
-#define GFILE_NEED_STRINGS					TRUE
93
+#define GFX_USE_GFILE						GFXON
94
+#define GFILE_NEED_PRINTG					GFXON
95
+#define GFILE_NEED_STRINGS					GFXON
96 96
 
97 97
 #endif /* _GFXCONF_H */

+ 1 - 1
demos/modules/gdisp/multiple_displays/main.c

@@ -41,7 +41,7 @@
41 41
  * and method 1 for any extra displays.
42 42
  */
43 43
 
44
-#define USE_METHOD_1		FALSE
44
+#define USE_METHOD_1		GFXOFF
45 45
 
46 46
 #if USE_METHOD_1
47 47
 	int main(void) {

+ 8 - 8
demos/modules/gdisp/pixmap/gfxconf.h

@@ -31,18 +31,18 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP sub-system. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_CLIP			TRUE
45
-#define GDISP_NEED_PIXMAP		TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_CLIP			GFXON
45
+#define GDISP_NEED_PIXMAP		GFXON
46 46
 
47 47
 #endif /* _GFXCONF_H */
48 48
 

+ 13 - 13
demos/modules/gdisp/polygons/gfxconf.h

@@ -31,19 +31,19 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GMISC           TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GMISC           GFXON
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_VALIDATION	TRUE
45
-#define GDISP_NEED_CLIP			TRUE
46
-#define GDISP_NEED_CONVEX_POLYGON TRUE
44
+#define GDISP_NEED_VALIDATION	GFXON
45
+#define GDISP_NEED_CLIP			GFXON
46
+#define GDISP_NEED_CONVEX_POLYGON GFXON
47 47
 
48 48
 /* For this demo define either:
49 49
  * 		GMISC_NEED_MATRIXFLOAT2D		to use floating point math operations
@@ -56,11 +56,11 @@
56 56
  * If you choose fixed point you MUST define GMISC_NEED_FIXEDTRIG for this demo.
57 57
  */
58 58
 
59
-//#define GMISC_NEED_FASTTRIG                          TRUE
60
-//#define GMISC_NEED_MATRIXFLOAT2D                     TRUE
59
+//#define GMISC_NEED_FASTTRIG                          GFXON
60
+//#define GMISC_NEED_MATRIXFLOAT2D                     GFXON
61 61
 
62
-#define GMISC_NEED_FIXEDTRIG                         TRUE
63
-#define GMISC_NEED_MATRIXFIXED2D                     TRUE
62
+#define GMISC_NEED_FIXEDTRIG                         GFXON
63
+#define GMISC_NEED_MATRIXFIXED2D                     GFXON
64 64
 
65 65
 #endif /* _GFXCONF_H */
66 66
 

+ 12 - 12
demos/modules/gdisp/streaming/gfxconf.h

@@ -10,22 +10,22 @@
10 10
 #define _GFXCONF_H
11 11
 
12 12
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
13
-//#define GFX_USE_OS_CHIBIOS	FALSE
14
-//#define GFX_USE_OS_WIN32		FALSE
15
-//#define GFX_USE_OS_LINUX		FALSE
16
-//#define GFX_USE_OS_OSX		FALSE
13
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
14
+//#define GFX_USE_OS_WIN32		GFXOFF
15
+//#define GFX_USE_OS_LINUX		GFXOFF
16
+//#define GFX_USE_OS_OSX		GFXOFF
17 17
 
18 18
 /* GFX sub-systems to turn on */
19
-#define GFX_USE_GDISP			TRUE
20
-#define GFX_USE_GMISC			TRUE
19
+#define GFX_USE_GDISP			GFXON
20
+#define GFX_USE_GMISC			GFXON
21 21
 
22 22
 /* Features for the GDISP sub-system. */
23
-#define GDISP_NEED_VALIDATION	TRUE
24
-#define GDISP_NEED_STREAMING	TRUE
23
+#define GDISP_NEED_VALIDATION	GFXON
24
+#define GDISP_NEED_STREAMING	GFXON
25 25
 
26
-#define GFX_USE_GMISC				TRUE
27
-#define GMISC_NEED_INVSQRT			TRUE
28
-//#define GMISC_INVSQRT_MIXED_ENDIAN	TRUE
29
-//#define GMISC_INVSQRT_REAL_SLOW		TRUE
26
+#define GFX_USE_GMISC				GFXON
27
+#define GMISC_NEED_INVSQRT			GFXON
28
+//#define GMISC_INVSQRT_MIXED_ENDIAN	GFXON
29
+//#define GMISC_INVSQRT_REAL_SLOW		GFXON
30 30
 
31 31
 #endif /* _GFXCONF_H */

+ 2 - 2
demos/modules/gdisp/streaming/main.c

@@ -42,11 +42,11 @@
42 42
  * your processor.
43 43
  *
44 44
  * You can modify the implementation of invsqrt() by firstly defining
45
- * 		#define GMISC_INVSQRT_MIXED_ENDIAN	TRUE
45
+ * 		#define GMISC_INVSQRT_MIXED_ENDIAN	GFXON
46 46
  * in your gfxconf.h file.
47 47
  *
48 48
  * If it still doesn't work then instead define
49
- * 		#define GMISC_INVSQRT_REAL_SLOW		TRUE
49
+ * 		#define GMISC_INVSQRT_REAL_SLOW		GFXON
50 50
  * in your gfxconf.h file. This should always work although it will probably be slow.
51 51
  */
52 52
 #define BALLCOLOR1		Red

+ 7 - 7
demos/modules/gdisp/thickarcs/gfxconf.h

@@ -31,17 +31,17 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
40
+#define GFX_USE_GDISP			GFXON
41 41
 
42 42
 /* Features for the GDISP subsystem. */
43
-#define GDISP_NEED_VALIDATION	TRUE
44
-#define GDISP_NEED_ARC			TRUE
43
+#define GDISP_NEED_VALIDATION	GFXON
44
+#define GDISP_NEED_ARC			GFXON
45 45
 
46 46
 
47 47
 #endif /* _GFXCONF_H */

+ 4 - 4
demos/modules/gfile/fatfs/gfxconf.h

@@ -1,10 +1,10 @@
1 1
 #ifndef _GFXCONF_H
2 2
 #define _GFXCONF_H
3 3
 
4
-#define GFX_USE_GFILE				TRUE
4
+#define GFX_USE_GFILE				GFXON
5 5
 
6
-#define GFILE_NEED_FATFS			TRUE
7
-#define GFILE_NEED_NOAUTOMOUNT		TRUE
8
-#define GFILE_NEED_PRINTG			TRUE
6
+#define GFILE_NEED_FATFS			GFXON
7
+#define GFILE_NEED_NOAUTOMOUNT		GFXON
8
+#define GFILE_NEED_PRINTG			GFXON
9 9
 
10 10
 #endif /* _GFXCONF_H */

+ 15 - 15
demos/modules/ginput/keyboard/gfxconf.h

@@ -31,31 +31,31 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GWIN			TRUE
42
-#define GFX_USE_GINPUT			TRUE
43
-#define GFX_USE_GEVENT			TRUE
44
-#define GFX_USE_GTIMER			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GWIN			GFXON
42
+#define GFX_USE_GINPUT			GFXON
43
+#define GFX_USE_GEVENT			GFXON
44
+#define GFX_USE_GTIMER			GFXON
45 45
 
46 46
 /* Features for the GDISP sub-system. */
47
-#define GDISP_NEED_VALIDATION	TRUE
48
-#define GDISP_NEED_CLIP			TRUE
49
-#define GDISP_NEED_TEXT			TRUE
47
+#define GDISP_NEED_VALIDATION	GFXON
48
+#define GDISP_NEED_CLIP			GFXON
49
+#define GDISP_NEED_TEXT			GFXON
50 50
 
51 51
 /* GDISP fonts to include */
52
-#define GDISP_INCLUDE_FONT_UI2	TRUE
52
+#define GDISP_INCLUDE_FONT_UI2	GFXON
53 53
 
54 54
 /* Features for the GWIN subsystem. */
55
-#define GWIN_NEED_CONSOLE		TRUE
55
+#define GWIN_NEED_CONSOLE		GFXON
56 56
 
57 57
 /* Features for the GINPUT subsystem. */
58
-#define GINPUT_NEED_KEYBOARD	TRUE
58
+#define GINPUT_NEED_KEYBOARD	GFXON
59 59
 
60 60
 #endif /* _GFXCONF_H */
61 61
 

+ 9 - 9
demos/modules/gos/threads/gfxconf.h

@@ -26,15 +26,15 @@
26 26
 ///////////////////////////////////////////////////////////////////////////
27 27
 // GOS - One of these must be defined, preferably in your Makefile       //
28 28
 ///////////////////////////////////////////////////////////////////////////
29
-//#define GFX_USE_OS_CHIBIOS                           FALSE
30
-//#define GFX_USE_OS_FREERTOS                          FALSE
31
-//    #define GFX_FREERTOS_USE_TRACE                   FALSE
32
-//#define GFX_USE_OS_WIN32                             FALSE
33
-//#define GFX_USE_OS_LINUX                             FALSE
34
-//#define GFX_USE_OS_OSX                               FALSE
35
-//#define GFX_USE_OS_ECOS                              FALSE
36
-//#define GFX_USE_OS_RAWRTOS                           FALSE
37
-//#define GFX_USE_OS_RAW32                             FALSE
29
+//#define GFX_USE_OS_CHIBIOS                           GFXOFF
30
+//#define GFX_USE_OS_FREERTOS                          GFXOFF
31
+//    #define GFX_FREERTOS_USE_TRACE                   GFXOFF
32
+//#define GFX_USE_OS_WIN32                             GFXOFF
33
+//#define GFX_USE_OS_LINUX                             GFXOFF
34
+//#define GFX_USE_OS_OSX                               GFXOFF
35
+//#define GFX_USE_OS_ECOS                              GFXOFF
36
+//#define GFX_USE_OS_RAWRTOS                           GFXOFF
37
+//#define GFX_USE_OS_RAW32                             GFXOFF
38 38
 
39 39
 // We define this here in case you are using raw32 or arduino with this demo
40 40
 // and have a non-thread-safe C library.

+ 10 - 10
demos/modules/gos/threads_advanced/gfxconf.h

@@ -33,21 +33,21 @@
33 33
 ///////////////////////////////////////////////////////////////////////////
34 34
 // GOS - One of these must be defined, preferably in your Makefile       //
35 35
 ///////////////////////////////////////////////////////////////////////////
36
-//#define GFX_USE_OS_CHIBIOS                           FALSE
37
-//#define GFX_USE_OS_FREERTOS                          FALSE
38
-//    #define GFX_FREERTOS_USE_TRACE                   FALSE
39
-//#define GFX_USE_OS_WIN32                             FALSE
40
-//#define GFX_USE_OS_LINUX                             FALSE
41
-//#define GFX_USE_OS_OSX                               FALSE
42
-//#define GFX_USE_OS_ECOS                              FALSE
43
-//#define GFX_USE_OS_RAWRTOS                           FALSE
44
-//#define GFX_USE_OS_RAW32                             FALSE
36
+//#define GFX_USE_OS_CHIBIOS                           GFXOFF
37
+//#define GFX_USE_OS_FREERTOS                          GFXOFF
38
+//    #define GFX_FREERTOS_USE_TRACE                   GFXOFF
39
+//#define GFX_USE_OS_WIN32                             GFXOFF
40
+//#define GFX_USE_OS_LINUX                             GFXOFF
41
+//#define GFX_USE_OS_OSX                               GFXOFF
42
+//#define GFX_USE_OS_ECOS                              GFXOFF
43
+//#define GFX_USE_OS_RAWRTOS                           GFXOFF
44
+//#define GFX_USE_OS_RAW32                             GFXOFF
45 45
 
46 46
 // We define this here in case you are using raw32 or arduino with this demo
47 47
 // and have a non-thread-safe C library.
48 48
 #define GOS_RAW_HEAP_SIZE                        10240
49 49
 
50
-#define GFX_USE_GTIMER        TRUE
50
+#define GFX_USE_GTIMER        GFXON
51 51
 
52 52
 #endif /* _GFXCONF_H */
53 53
 

+ 5 - 5
demos/modules/gtimer/gfxconf.h

@@ -31,12 +31,12 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GTIMER			TRUE
40
+#define GFX_USE_GTIMER			GFXON
41 41
 
42 42
 #endif /* _GFXCONF_H */

+ 13 - 13
demos/modules/gtrans/basic/gfxconf.h

@@ -31,21 +31,21 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39
-#define GFX_USE_GTRANS                          TRUE
40
-#define GFX_USE_GDISP			                TRUE
39
+#define GFX_USE_GTRANS                          GFXON
40
+#define GFX_USE_GDISP			                GFXON
41 41
 
42
-#define GDISP_NEED_VALIDATION	                TRUE
43
-#define GDISP_NEED_CLIP			                TRUE
44
-#define GDISP_NEED_TEXT			                TRUE
45
-#define GDISP_NEED_ANTIALIAS                    TRUE
46
-#define GDISP_NEED_UTF8                         TRUE
47
-#define GDISP_NEED_TEXT_KERNING                 TRUE
42
+#define GDISP_NEED_VALIDATION	                GFXON
43
+#define GDISP_NEED_CLIP			                GFXON
44
+#define GDISP_NEED_TEXT			                GFXON
45
+#define GDISP_NEED_ANTIALIAS                    GFXON
46
+#define GDISP_NEED_UTF8                         GFXON
47
+#define GDISP_NEED_TEXT_KERNING                 GFXON
48 48
 
49
-#define GDISP_INCLUDE_USER_FONTS				TRUE
49
+#define GDISP_INCLUDE_USER_FONTS				GFXON
50 50
 
51 51
 #endif /* _GFXCONF_H */

+ 9 - 9
demos/modules/gwin/basic/gfxconf.h

@@ -31,19 +31,19 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GWIN			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GWIN			GFXON
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_VALIDATION	TRUE
45
-#define GDISP_NEED_CLIP			TRUE
46
-#define GDISP_NEED_CIRCLE		TRUE
44
+#define GDISP_NEED_VALIDATION	GFXON
45
+#define GDISP_NEED_CLIP			GFXON
46
+#define GDISP_NEED_CIRCLE		GFXON
47 47
 
48 48
 /* Features for the GWIN subsystem. */
49 49
 

+ 19 - 19
demos/modules/gwin/button/gfxconf.h

@@ -31,35 +31,35 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GWIN			TRUE
42
-#define GFX_USE_GINPUT			TRUE
43
-#define GFX_USE_GEVENT			TRUE
44
-#define GFX_USE_GTIMER			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GWIN			GFXON
42
+#define GFX_USE_GINPUT			GFXON
43
+#define GFX_USE_GEVENT			GFXON
44
+#define GFX_USE_GTIMER			GFXON
45 45
 
46 46
 /* Features for the GDISP sub-system. */
47
-#define GDISP_NEED_VALIDATION	TRUE
48
-#define GDISP_NEED_CLIP			TRUE
49
-#define GDISP_NEED_CIRCLE		TRUE
50
-#define GDISP_NEED_TEXT			TRUE
51
-#define GDISP_NEED_CONTROL		TRUE
47
+#define GDISP_NEED_VALIDATION	GFXON
48
+#define GDISP_NEED_CLIP			GFXON
49
+#define GDISP_NEED_CIRCLE		GFXON
50
+#define GDISP_NEED_TEXT			GFXON
51
+#define GDISP_NEED_CONTROL		GFXON
52 52
 
53 53
 /* GDISP fonts to include */
54
-#define GDISP_INCLUDE_FONT_UI2	TRUE
54
+#define GDISP_INCLUDE_FONT_UI2	GFXON
55 55
 
56 56
 /* Features for the GWIN subsystem. */
57
-#define GWIN_NEED_WINDOWMANAGER	TRUE
58
-#define GWIN_NEED_WIDGET		TRUE
59
-#define GWIN_NEED_BUTTON		TRUE
57
+#define GWIN_NEED_WINDOWMANAGER	GFXON
58
+#define GWIN_NEED_WIDGET		GFXON
59
+#define GWIN_NEED_BUTTON		GFXON
60 60
 
61 61
 /* Features for the GINPUT subsystem. */
62
-#define GINPUT_NEED_MOUSE		TRUE
62
+#define GINPUT_NEED_MOUSE		GFXON
63 63
 
64 64
 #endif /* _GFXCONF_H */
65 65
 

+ 18 - 18
demos/modules/gwin/checkbox/gfxconf.h

@@ -31,34 +31,34 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GWIN			TRUE
42
-#define GFX_USE_GINPUT			TRUE
43
-#define GFX_USE_GEVENT			TRUE
44
-#define GFX_USE_GTIMER			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GWIN			GFXON
42
+#define GFX_USE_GINPUT			GFXON
43
+#define GFX_USE_GEVENT			GFXON
44
+#define GFX_USE_GTIMER			GFXON
45 45
 
46 46
 /* Features for the GDISP sub-system. */
47
-#define GDISP_NEED_VALIDATION	TRUE
48
-#define GDISP_NEED_CLIP			TRUE
49
-#define GDISP_NEED_CIRCLE		TRUE
50
-#define GDISP_NEED_TEXT			TRUE
47
+#define GDISP_NEED_VALIDATION	GFXON
48
+#define GDISP_NEED_CLIP			GFXON
49
+#define GDISP_NEED_CIRCLE		GFXON
50
+#define GDISP_NEED_TEXT			GFXON
51 51
 
52 52
 /* GDISP fonts to include */
53
-#define GDISP_INCLUDE_FONT_UI2	TRUE
53
+#define GDISP_INCLUDE_FONT_UI2	GFXON
54 54
 
55 55
 /* Features for the GWIN subsystem. */
56
-#define GWIN_NEED_WINDOWMANAGER	TRUE
57
-#define GWIN_NEED_WIDGET		TRUE
58
-#define GWIN_NEED_CHECKBOX		TRUE
56
+#define GWIN_NEED_WINDOWMANAGER	GFXON
57
+#define GWIN_NEED_WIDGET		GFXON
58
+#define GWIN_NEED_CHECKBOX		GFXON
59 59
 
60 60
 /* Features for the GINPUT subsystem. */
61
-#define GINPUT_NEED_MOUSE		TRUE
61
+#define GINPUT_NEED_MOUSE		GFXON
62 62
 
63 63
 #endif /* _GFXCONF_H */
64 64
 

+ 17 - 17
demos/modules/gwin/console/gfxconf.h

@@ -31,31 +31,31 @@
31 31
 #define _GFXCONF_H
32 32
 
33 33
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
34
-//#define GFX_USE_OS_CHIBIOS	FALSE
35
-//#define GFX_USE_OS_WIN32		FALSE
36
-//#define GFX_USE_OS_LINUX		FALSE
37
-//#define GFX_USE_OS_OSX		FALSE
34
+//#define GFX_USE_OS_CHIBIOS	GFXOFF
35
+//#define GFX_USE_OS_WIN32		GFXOFF
36
+//#define GFX_USE_OS_LINUX		GFXOFF
37
+//#define GFX_USE_OS_OSX		GFXOFF
38 38
 
39 39
 /* GFX sub-systems to turn on */
40
-#define GFX_USE_GDISP			TRUE
41
-#define GFX_USE_GWIN			TRUE
40
+#define GFX_USE_GDISP			GFXON
41
+#define GFX_USE_GWIN			GFXON
42 42
 
43 43
 /* Features for the GDISP sub-system. */
44
-#define GDISP_NEED_VALIDATION	TRUE
45
-#define GDISP_NEED_CLIP			TRUE
46
-#define GDISP_NEED_TEXT			TRUE
44
+#define GDISP_NEED_VALIDATION	GFXON
45
+#define GDISP_NEED_CLIP			GFXON
46
+#define GDISP_NEED_TEXT			GFXON
47 47
 
48 48
 /* GDISP fonts to include */
49
-#define GDISP_INCLUDE_FONT_UI2	TRUE
50
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12	TRUE
49
+#define GDISP_INCLUDE_FONT_UI2	GFXON
50
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12	GFXON
51 51
 
52 52
 /* Features for the GWIN subsystem. */
53
-#define GWIN_NEED_WINDOWMANAGER	TRUE
54
-#define GWIN_NEED_CONSOLE		TRUE
55
-#define GWIN_CONSOLE_ESCSEQ		TRUE
56
-#define GWIN_CONSOLE_USE_HISTORY	TRUE
57
-#define GWIN_CONSOLE_HISTORY_AVERAGING	TRUE
58
-#define GWIN_CONSOLE_HISTORY_ATCREATE	TRUE
53
+#define GWIN_NEED_WINDOWMANAGER	GFXON
54
+#define GWIN_NEED_CONSOLE		GFXON
55
+#define GWIN_CONSOLE_ESCSEQ		GFXON
56
+#define GWIN_CONSOLE_USE_HISTORY	GFXON
57
+#define GWIN_CONSOLE_HISTORY_AVERAGING	GFXON
58
+#define GWIN_CONSOLE_HISTORY_ATCREATE	GFXON
59 59
 
60 60
 #endif /* _GFXCONF_H */
61 61
 

+ 34 - 34
demos/modules/gwin/container/gfxconf.h

@@ -19,69 +19,69 @@
19 19
 #define _GFXCONF_H
20 20
 
21 21
 /* The operating system to use. One of these must be defined - preferably in your Makefile */
22
-//#define GFX_USE_OS_CHIBIOS                         TRUE
23
-//#define GFX_USE_OS_WIN32                           TRUE
24
-//#define GFX_USE_OS_LINUX                           TRUE
25
-//#define GFX_USE_OS_OSX                             TRUE
22
+//#define GFX_USE_OS_CHIBIOS                         GFXON
23
+//#define GFX_USE_OS_WIN32                           GFXON
24
+//#define GFX_USE_OS_LINUX                           GFXON
25
+//#define GFX_USE_OS_OSX                             GFXON
26 26
 
27 27
 
28 28
 ///////////////////////////////////////////////////////////////////////////
29 29
 // GDISP                                                                 //
30 30
 ///////////////////////////////////////////////////////////////////////////
31
-#define GFX_USE_GDISP                                TRUE
31
+#define GFX_USE_GDISP                                GFXON
32 32
 
33
-#define GDISP_NEED_VALIDATION                        TRUE
34
-#define GDISP_NEED_CLIP                              TRUE
35
-#define GDISP_NEED_TEXT                              TRUE
36
-    #define GDISP_INCLUDE_FONT_UI2                   TRUE
37
-#define GDISP_NEED_MULTITHREAD                       TRUE
33
+#define GDISP_NEED_VALIDATION                        GFXON
34
+#define GDISP_NEED_CLIP                              GFXON
35
+#define GDISP_NEED_TEXT                              GFXON
36
+    #define GDISP_INCLUDE_FONT_UI2                   GFXON
37
+#define GDISP_NEED_MULTITHREAD                       GFXON
38 38
 
39 39
 
40 40
 ///////////////////////////////////////////////////////////////////////////
41 41
 // GWIN                                                                  //
42 42
 ///////////////////////////////////////////////////////////////////////////
43
-#define GFX_USE_GWIN                                 TRUE
44
-
45
-#define GWIN_NEED_WINDOWMANAGER                      TRUE
46
-
47
-#define GWIN_NEED_CONSOLE                            TRUE
48