aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Sterren <thomas.sterren@simulton.com>2018-03-06 09:38:37 +0100
committerThomas Sterren <thomas.sterren@simulton.com>2018-03-06 09:38:37 +0100
commit65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch)
tree30920f0457522be32ce2b332afe0d2916d93cf66
parent992850bcb1992ff052d5ac2379e4675a34861723 (diff)
parentf265924396167729e8d9fb36a0383263f36c1270 (diff)
downloaduGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz
uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2
uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
-rw-r--r--boards/addons/gdisp/board_SPFD54124B_stm32f3.h2
-rw-r--r--boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h4
-rw-r--r--boards/base/ArduinoTinyScreen/gfx/gfxconf.h16
-rw-r--r--boards/base/Embest-STM32-DMSTF4BB/board.mk2
-rw-r--r--boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h14
-rw-r--r--boards/base/FireBull-STM32F103-FB/board.mk2
-rw-r--r--boards/base/HY-MiniSTM32V/board.mk2
-rw-r--r--boards/base/Linux-Framebuffer-Touch/board.mk2
-rw-r--r--boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h6
-rw-r--r--boards/base/Linux-Framebuffer/board.mk2
-rw-r--r--boards/base/Linux-SDL/board.mk2
-rw-r--r--boards/base/Linux-X/board.mk2
-rw-r--r--boards/base/Marlin/board.mk2
-rw-r--r--boards/base/Marlin/gmouse_lld_FT5x06_board.h4
-rw-r--r--boards/base/Mikromedia-Plus-STM32-M4/board.mk2
-rw-r--r--boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h14
-rw-r--r--boards/base/Mikromedia-STM32-M4-ILI9341/board.mk2
-rw-r--r--boards/base/OSX/board.mk2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE12/board.mk2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE8/board.mk2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h2
-rw-r--r--boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h2
-rw-r--r--boards/base/Olimex-STM32-LCD/board.mk2
-rw-r--r--boards/base/STM32F429i-Discovery/chibios/board.mk2
-rw-r--r--boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h3
-rw-r--r--boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h14
-rw-r--r--boards/base/STM32F439i-Eval/CubeHal/board.mk2
-rw-r--r--boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h3
-rw-r--r--boards/base/STM32F469i-Discovery/CubeHAL/board_STM32LTDC.h25
-rw-r--r--boards/base/STM32F469i-Discovery/board.mk2
-rw-r--r--boards/base/STM32F746-Discovery/board.mk2
-rw-r--r--boards/base/STM32F746-Discovery/board_STM32LTDC.h5
-rw-r--r--boards/base/Win32/board.mk2
-rw-r--r--boards/base/eCos-Synthetic-Framebuffer/board.mk2
-rw-r--r--boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h2
-rw-r--r--changelog.txt15
-rw-r--r--demos/3rdparty/bubbles/gfxconf.h44
-rw-r--r--demos/3rdparty/notepad-2/gfxconf.h76
-rw-r--r--demos/applications/combo/bounce.c4
-rw-r--r--demos/applications/combo/gfxconf.h114
-rw-r--r--demos/applications/mandelbrot/gfxconf.h12
-rw-r--r--demos/applications/notepad/gfxconf.h34
-rw-r--r--demos/benchmarks/gfxconf.h20
-rw-r--r--demos/games/justget10/demo.mk2
-rw-r--r--demos/games/justget10/gfxconf.h82
-rw-r--r--demos/games/minesweeper/demo.mk2
-rw-r--r--demos/games/minesweeper/gfxconf.h45
-rw-r--r--demos/games/minesweeper/readme.txt2
-rw-r--r--demos/games/tetris/Example_Makefiles/stm32f4/Makefile2
-rw-r--r--demos/games/tetris/gfxconf.h40
-rw-r--r--demos/modules/gadc/gfxconf.h28
-rw-r--r--demos/modules/gaudio/oscilloscope/gfxconf.h24
-rw-r--r--demos/modules/gaudio/play-vs1053/gfxconf.h24
-rw-r--r--demos/modules/gaudio/play-wave/gfxconf.h24
-rw-r--r--demos/modules/gdisp/arcsectors/gfxconf.h14
-rw-r--r--demos/modules/gdisp/basics/gfxconf.h14
-rw-r--r--demos/modules/gdisp/circles/gfxconf.h26
-rw-r--r--demos/modules/gdisp/fonts/gfxconf.h58
-rw-r--r--demos/modules/gdisp/fonts_cyrillic/gfxconf.h28
-rw-r--r--demos/modules/gdisp/images/gfxconf.h34
-rw-r--r--demos/modules/gdisp/images_animated/gfxconf.h32
-rw-r--r--demos/modules/gdisp/images_animated/main.c2
-rw-r--r--demos/modules/gdisp/images_palettes/gfxconf.h34
-rw-r--r--demos/modules/gdisp/images_palettes/main.c2
-rw-r--r--demos/modules/gdisp/multiple_displays/gfxconf.h36
-rw-r--r--demos/modules/gdisp/multiple_displays/main.c2
-rw-r--r--demos/modules/gdisp/pixmap/gfxconf.h16
-rw-r--r--demos/modules/gdisp/polygons/gfxconf.h26
-rw-r--r--demos/modules/gdisp/streaming/gfxconf.h24
-rw-r--r--demos/modules/gdisp/streaming/main.c4
-rw-r--r--demos/modules/gdisp/thickarcs/gfxconf.h14
-rw-r--r--demos/modules/gfile/fatfs/gfxconf.h8
-rw-r--r--demos/modules/ginput/keyboard/gfxconf.h30
-rw-r--r--demos/modules/gos/threads/gfxconf.h18
-rw-r--r--demos/modules/gos/threads_advanced/gfxconf.h20
-rw-r--r--demos/modules/gtimer/gfxconf.h10
-rw-r--r--demos/modules/gtrans/basic/gfxconf.h26
-rw-r--r--demos/modules/gwin/basic/gfxconf.h18
-rw-r--r--demos/modules/gwin/button/gfxconf.h38
-rw-r--r--demos/modules/gwin/checkbox/gfxconf.h36
-rw-r--r--demos/modules/gwin/console/gfxconf.h34
-rw-r--r--demos/modules/gwin/container/gfxconf.h68
-rw-r--r--demos/modules/gwin/container_nested/gfxconf.h70
-rw-r--r--demos/modules/gwin/frame/gfxconf.h52
-rw-r--r--demos/modules/gwin/gl3d-gears/gfxconf.h18
-rw-r--r--demos/modules/gwin/gl3d-spin/gfxconf.h18
-rw-r--r--demos/modules/gwin/graph/gfxconf.h32
-rw-r--r--demos/modules/gwin/imagebox/gfxconf.h58
-rw-r--r--demos/modules/gwin/keyboard/gfxconf.h48
-rw-r--r--demos/modules/gwin/label/gfxconf.h48
-rw-r--r--demos/modules/gwin/list/gfxconf.h54
-rw-r--r--demos/modules/gwin/progressbar/gfxconf.h94
-rw-r--r--demos/modules/gwin/radio/gfxconf.h36
-rw-r--r--demos/modules/gwin/slider/gfxconf.h44
-rw-r--r--demos/modules/gwin/tabset/gfxconf.h56
-rw-r--r--demos/modules/gwin/textedit/gfxconf.h52
-rw-r--r--demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h52
-rw-r--r--demos/modules/gwin/widgets/gfxconf.h116
-rw-r--r--demos/tools/touch_calibration_grabber/gfxconf.h34
-rw-r--r--demos/tools/touch_driver_test/gfxconf.h34
-rw-r--r--demos/tools/touch_raw_readings/gfxconf.h34
-rw-r--r--demos/tools/uGFXnetDisplay/gfxconf.h32
-rw-r--r--demos/tools/uGFXnetDisplay/main.c8
-rw-r--r--docs/src/containers.dox2
-rw-r--r--docs/src/widgets.dox2
-rw-r--r--docs/src/windows.dox2
-rw-r--r--drivers/gadc/AT91SAM7/gadc_lld_config.h4
-rw-r--r--drivers/gaudio/Win32/gaudio_play_config.h4
-rw-r--r--drivers/gaudio/Win32/gaudio_record_config.h4
-rw-r--r--drivers/gaudio/gadc/gaudio_record_board_template.h2
-rw-r--r--drivers/gaudio/gadc/gaudio_record_gadc.c2
-rw-r--r--drivers/gaudio/pwm/gaudio_play_config.h2
-rw-r--r--drivers/gaudio/vs1053/gaudio_play_config.h6
-rw-r--r--drivers/gaudio/vs1053/gaudio_play_vs1053.c2
-rw-r--r--drivers/gaudio/vs1053/readme.txt2
-rw-r--r--drivers/gdisp/AlteraFramereader/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/AlteraFramereader/readme.txt2
-rw-r--r--drivers/gdisp/ED060SC4/board_ED060SC4_template.h2
-rw-r--r--drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c2
-rw-r--r--drivers/gdisp/ED060SC4/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ED060SC4/readme.txt2
-rw-r--r--drivers/gdisp/Fb24bpp/board_fb24bpp_template.h2
-rw-r--r--drivers/gdisp/Fb24bpp/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/Fb24bpp/readme.txt2
-rw-r--r--drivers/gdisp/HX8347D/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/ILI9225/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ILI9320/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ILI9325/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ILI9341/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/ILI9342/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/ILI93xx/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ILI9481/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/ILI9488/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/KS0108/board_KS0108_example.h10
-rw-r--r--drivers/gdisp/KS0108/gdisp_lld_config.h2
-rw-r--r--drivers/gdisp/LGDP4532/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c4
-rw-r--r--drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h14
-rw-r--r--drivers/gdisp/PCD8544/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/PCF8812/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/R61505U/gdisp_lld_config.h8
-rwxr-xr-xdrivers/gdisp/RA6963/board_RA6963.h10
-rwxr-xr-xdrivers/gdisp/RA6963/gdisp_lld_RA6963.c26
-rwxr-xr-xdrivers/gdisp/RA6963/gdisp_lld_config.h10
-rw-r--r--drivers/gdisp/RA8875/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/S6D1121/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/SPFD54124B/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/SSD1289/board_SSD1289_template.h6
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c4
-rw-r--r--drivers/gdisp/SSD1289/gdisp_lld_config.h12
-rw-r--r--drivers/gdisp/SSD1306/gdisp_lld_config.h10
-rw-r--r--drivers/gdisp/SSD1306/readme.txt2
-rw-r--r--drivers/gdisp/SSD1322/board_SSD1322_template.h2
-rw-r--r--drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c2
-rw-r--r--drivers/gdisp/SSD1322/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/SSD1322/readme.txt2
-rw-r--r--drivers/gdisp/SSD1331/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/SSD1351/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/SSD1848/gdisp_lld_config.h12
-rw-r--r--drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c4
-rw-r--r--drivers/gdisp/SSD1963/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/SSD1963/readme.txt2
-rw-r--r--drivers/gdisp/SSD2119/board_SSD2119_template.h6
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c4
-rw-r--r--drivers/gdisp/SSD2119/gdisp_lld_config.h12
-rw-r--r--drivers/gdisp/ST7565/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/ST7735/gdisp_lld_ST7735.c16
-rw-r--r--drivers/gdisp/ST7735/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h2
-rw-r--r--drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c8
-rw-r--r--drivers/gdisp/STM32LTDC/gdisp_lld_config.h12
-rw-r--r--drivers/gdisp/STM32LTDC/readme.txt2
-rw-r--r--drivers/gdisp/TLS8204/gdisp_lld_config.h8
-rw-r--r--drivers/gdisp/TestStub/gdisp_lld_config.h4
-rw-r--r--drivers/gdisp/UC1601s/gdisp_lld_config.h10
-rw-r--r--drivers/gdisp/UC1610/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/UC8173/board_UC8173_template.h8
-rw-r--r--drivers/gdisp/UC8173/gdisp_lld_UC8173.c14
-rw-r--r--drivers/gdisp/UC8173/gdisp_lld_config.h10
-rw-r--r--drivers/gdisp/framebuffer/board_framebuffer_template.h2
-rw-r--r--drivers/gdisp/framebuffer/gdisp_lld_config.h6
-rw-r--r--drivers/gdisp/framebuffer/readme.txt2
-rw-r--r--drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h2
-rw-r--r--drivers/ginput/dial/GADC/readme.txt6
-rw-r--r--drivers/ginput/toggle/Pal/readme.txt4
-rw-r--r--drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h4
-rw-r--r--drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h4
-rw-r--r--drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h4
-rw-r--r--drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event_board_template.h6
-rw-r--r--drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c6
-rw-r--r--drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h16
-rw-r--r--drivers/ginput/touch/STMPE610/readme.txt6
-rw-r--r--drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c6
-rw-r--r--drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h16
-rw-r--r--drivers/ginput/touch/STMPE811/readme.txt6
-rw-r--r--drivers/multiple/SDL/gdisp_lld_SDL.c2
-rw-r--r--drivers/multiple/SDL/gdisp_lld_config.h12
-rw-r--r--drivers/multiple/SDL/readme.txt6
-rw-r--r--drivers/multiple/Win32/gdisp_lld_Win32.c24
-rw-r--r--drivers/multiple/Win32/gdisp_lld_config.h22
-rw-r--r--drivers/multiple/Win32/readme.txt8
-rw-r--r--drivers/multiple/X/gdisp_lld_X.c16
-rw-r--r--drivers/multiple/X/gdisp_lld_config.h12
-rw-r--r--drivers/multiple/X/readme.txt6
-rw-r--r--drivers/multiple/uGFXnet/gdisp_lld_config.h14
-rw-r--r--drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c8
-rw-r--r--drivers/multiple/uGFXnet/ginput_lld_mouse_config.h10
-rw-r--r--drivers/multiple/uGFXnet/readme.txt14
-rw-r--r--drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h14
-rw-r--r--drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp2
-rw-r--r--drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h10
-rw-r--r--drivers/multiple/uGFXnetESP8266/readme.txt8
-rw-r--r--gfx.h205
-rw-r--r--gfx.mk22
-rw-r--r--gfxconf.example.h437
-rw-r--r--src/gadc/gadc_rules.h16
-rw-r--r--src/gaudio/gaudio_options.h4
-rw-r--r--src/gaudio/gaudio_rules.h28
-rw-r--r--src/gdisp/gdisp.c66
-rw-r--r--src/gdisp/gdisp.h88
-rw-r--r--src/gdisp/gdisp_colors.h79
-rw-r--r--src/gdisp/gdisp_driver.h120
-rw-r--r--src/gdisp/gdisp_image.h4
-rw-r--r--src/gdisp/gdisp_options.h252
-rw-r--r--src/gdisp/gdisp_pixmap.c10
-rw-r--r--src/gdisp/gdisp_pixmap.h4
-rw-r--r--src/gdisp/gdisp_rules.h20
-rw-r--r--src/gdriver/gdriver.h2
-rw-r--r--src/gevent/gevent.h2
-rw-r--r--src/gevent/gevent_options.h6
-rw-r--r--src/gfile/gfile_options.h68
-rw-r--r--src/gfx.c2
-rw-r--r--src/gfx_compilers.h36
-rw-r--r--src/ginput/ginput.h2
-rw-r--r--src/ginput/ginput_dial.h4
-rw-r--r--src/ginput/ginput_keyboard.c2
-rw-r--r--src/ginput/ginput_mouse.c28
-rw-r--r--src/ginput/ginput_mouse.h8
-rw-r--r--src/ginput/ginput_options.h50
-rw-r--r--src/ginput/ginput_rules.h16
-rw-r--r--src/ginput/ginput_toggle.h4
-rw-r--r--src/gmisc/gmisc_options.h24
-rw-r--r--src/gos/gos.h4
-rw-r--r--src/gos/gos_arduino.h4
-rw-r--r--src/gos/gos_chibios.h17
-rw-r--r--src/gos/gos_cmsis.h2
-rw-r--r--src/gos/gos_cmsis2.h4
-rw-r--r--src/gos/gos_ecos.c2
-rw-r--r--src/gos/gos_ecos.h2
-rw-r--r--src/gos/gos_freertos.h1
-rw-r--r--src/gos/gos_keil.h6
-rw-r--r--src/gos/gos_linux.c2
-rw-r--r--src/gos/gos_linux.h2
-rw-r--r--src/gos/gos_nios.h4
-rw-r--r--src/gos/gos_options.h84
-rw-r--r--src/gos/gos_raw32.h4
-rw-r--r--src/gos/gos_rawrtos.c2
-rw-r--r--src/gos/gos_rtx5.h6
-rw-r--r--src/gos/gos_rules.h6
-rw-r--r--src/gos/gos_x_threads.c12
-rw-r--r--src/gos/gos_x_threads_cortexm01.h4
-rw-r--r--src/gos/gos_x_threads_cortexm347.h4
-rw-r--r--src/gos/gos_zephyr.h2
-rw-r--r--src/gqueue/gqueue_options.h14
-rw-r--r--src/gqueue/gqueue_rules.h6
-rw-r--r--src/gtimer/gtimer.h2
-rw-r--r--src/gwin/gwin.h12
-rw-r--r--src/gwin/gwin_button.h18
-rw-r--r--src/gwin/gwin_checkbox.h4
-rw-r--r--src/gwin/gwin_console.c6
-rw-r--r--src/gwin/gwin_console.h6
-rw-r--r--src/gwin/gwin_container.h4
-rw-r--r--src/gwin/gwin_frame.h6
-rw-r--r--src/gwin/gwin_gl3d.h4
-rw-r--r--src/gwin/gwin_graph.h4
-rw-r--r--src/gwin/gwin_image.h12
-rw-r--r--src/gwin/gwin_keyboard.h4
-rw-r--r--src/gwin/gwin_label.h8
-rw-r--r--src/gwin/gwin_list.h8
-rw-r--r--src/gwin/gwin_options.h162
-rw-r--r--src/gwin/gwin_progressbar.h6
-rw-r--r--src/gwin/gwin_radio.h4
-rw-r--r--src/gwin/gwin_rules.h56
-rw-r--r--src/gwin/gwin_slider.h6
-rw-r--r--src/gwin/gwin_tabset.h6
-rw-r--r--src/gwin/gwin_textedit.h8
-rw-r--r--src/gwin/gwin_widget.h8
-rw-r--r--tools/gmake_scripts/cpu_stm32m1.mk2
-rw-r--r--tools/gmake_scripts/cpu_stm32m3.mk2
-rw-r--r--tools/gmake_scripts/cpu_stm32m4.mk4
-rw-r--r--tools/gmake_scripts/cpu_stm32m7.mk2
295 files changed, 2724 insertions, 2625 deletions
diff --git a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
index df11a337..9bc40367 100644
--- a/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
+++ b/boards/addons/gdisp/board_SPFD54124B_stm32f3.h
@@ -31,7 +31,7 @@
#define SET_RST palSetPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
#define CLR_RST palClearPad(SPFD54124B_PIN_PORT, SPFD54124B_PIN_RST);
-#define USE_SOFT_SPI TRUE
+#define USE_SOFT_SPI GFXON
#define USE_HARD_SPI !(USE_SOFT_SPI)
#if USE_HARD_SPI
diff --git a/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h b/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
index 0987f369..c0d9354b 100644
--- a/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
+++ b/boards/base/Altera-MAX10-Neek/gmouse_lld_FT5316_board.h
@@ -25,11 +25,11 @@
// How much extra data to allocate at the end of the GMouse structure for the board's use
#define GMOUSE_FT5316_BOARD_DATA_SIZE 0
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5316_SELF_CALIBRATE TRUE
+#define GMOUSE_FT5316_SELF_CALIBRATE GFXON
static unsigned int device_write(unsigned char device_address, unsigned char sub_address, unsigned char wdata)
{
diff --git a/boards/base/ArduinoTinyScreen/gfx/gfxconf.h b/boards/base/ArduinoTinyScreen/gfx/gfxconf.h
index 1a1f8623..117b734c 100644
--- a/boards/base/ArduinoTinyScreen/gfx/gfxconf.h
+++ b/boards/base/ArduinoTinyScreen/gfx/gfxconf.h
@@ -31,18 +31,18 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
-#define GFX_USE_OS_ARDUINO TRUE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
+#define GFX_USE_OS_ARDUINO GFXON
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
#endif /* _GFXCONF_H */
diff --git a/boards/base/Embest-STM32-DMSTF4BB/board.mk b/boards/base/Embest-STM32-DMSTF4BB/board.mk
index cd17a8ae..fcc10a60 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/board.mk
+++ b/boards/base/Embest-STM32-DMSTF4BB/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Embest-STM32-DMSTF4BB
GFXSRC +=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/SSD2119/driver.mk
include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
diff --git a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
index fc18c0ec..853c13a8 100644
--- a/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
+++ b/boards/base/Embest-STM32-DMSTF4BB/gmouse_lld_STMPE811_board.h
@@ -20,16 +20,16 @@
#define GMOUSE_STMPE811_BOARD_DATA_SIZE 0
// Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE811_READ_PRESSURE FALSE
-//#define GMOUSE_STMPE811_SELF_CALIBRATE FALSE
-//#define GMOUSE_STMPE811_TEST_MODE FALSE
+//#define GMOUSE_STMPE811_READ_PRESSURE GFXOFF
+//#define GMOUSE_STMPE811_SELF_CALIBRATE GFXOFF
+//#define GMOUSE_STMPE811_TEST_MODE GFXOFF
-// If TRUE this board has the STMPE811 IRQ pin connected to a GPIO.
+// If GFXON this board has the STMPE811 IRQ pin connected to a GPIO.
// Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
-#define GMOUSE_STMPE811_GPIO_IRQPIN FALSE
+#define GMOUSE_STMPE811_GPIO_IRQPIN GFXOFF
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE811_SLOW_CPU FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE811_SLOW_CPU GFXOFF
// Slave address
#define STMPE811_ADDR (0x82 >> 1)
diff --git a/boards/base/FireBull-STM32F103-FB/board.mk b/boards/base/FireBull-STM32F103-FB/board.mk
index 11714dc7..02ee0dcb 100644
--- a/boards/base/FireBull-STM32F103-FB/board.mk
+++ b/boards/base/FireBull-STM32F103-FB/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/FireBull-STM32F103-FB
GFXSRC +=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
include $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board/board.mk
include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
diff --git a/boards/base/HY-MiniSTM32V/board.mk b/boards/base/HY-MiniSTM32V/board.mk
index eddf09e3..bb07caa9 100644
--- a/boards/base/HY-MiniSTM32V/board.mk
+++ b/boards/base/HY-MiniSTM32V/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/HY-MiniSTM32V
GFXSRC +=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
include $(GFXLIB)/boards/base/HY-MiniSTM32V/chibios_board/board.mk
include $(GFXLIB)/drivers/gdisp/SSD1289/driver.mk
diff --git a/boards/base/Linux-Framebuffer-Touch/board.mk b/boards/base/Linux-Framebuffer-Touch/board.mk
index 813e6ef0..a12ca67b 100644
--- a/boards/base/Linux-Framebuffer-Touch/board.mk
+++ b/boards/base/Linux-Framebuffer-Touch/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Linux-Framebuffer-Touch
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
GFXLIBS += rt
include $(GFXLIB)/boards/base/Linux-Framebuffer/board.mk
diff --git a/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h b/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
index c6bf5a7b..9f3acdd3 100644
--- a/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
+++ b/boards/base/Linux-Framebuffer-Touch/gmouse_lld_linux_event_board.h
@@ -21,12 +21,12 @@
// The linux device input used for touchscreen
#define GMOUSE_LINUX_EVENT_DEVICE "/dev/input/event0"
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE FALSE
+#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE GFXOFF
-#define GMOUSE_LINUX_EVENT_FINGERMODE TRUE
+#define GMOUSE_LINUX_EVENT_FINGERMODE GFXON
#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
diff --git a/boards/base/Linux-Framebuffer/board.mk b/boards/base/Linux-Framebuffer/board.mk
index a9acce0a..91dcfed4 100644
--- a/boards/base/Linux-Framebuffer/board.mk
+++ b/boards/base/Linux-Framebuffer/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Linux-Framebuffer
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
GFXLIBS += rt
include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk
diff --git a/boards/base/Linux-SDL/board.mk b/boards/base/Linux-SDL/board.mk
index 591d09d0..ae3cc20b 100644
--- a/boards/base/Linux-SDL/board.mk
+++ b/boards/base/Linux-SDL/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Linux
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
GFXLIBS += rt
include $(GFXLIB)/drivers/multiple/SDL/driver.mk
diff --git a/boards/base/Linux-X/board.mk b/boards/base/Linux-X/board.mk
index beb156b8..fd3d3f22 100644
--- a/boards/base/Linux-X/board.mk
+++ b/boards/base/Linux-X/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Linux
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_LINUX=TRUE
+GFXDEFS += -DGFX_USE_OS_LINUX=GFXON
GFXLIBS += rt
include $(GFXLIB)/drivers/multiple/X/driver.mk
diff --git a/boards/base/Marlin/board.mk b/boards/base/Marlin/board.mk
index ac3d55f1..bb3ac9b8 100644
--- a/boards/base/Marlin/board.mk
+++ b/boards/base/Marlin/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Marlin
GFXSRC +=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
include $(GFXLIB)/boards/base/Marlin/chibios_board/board.mk
include $(GFXLIB)/drivers/gdisp/RA8875/driver.mk
diff --git a/boards/base/Marlin/gmouse_lld_FT5x06_board.h b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
index f879ca0c..872dd208 100644
--- a/boards/base/Marlin/gmouse_lld_FT5x06_board.h
+++ b/boards/base/Marlin/gmouse_lld_FT5x06_board.h
@@ -19,11 +19,11 @@
// How much extra data to allocate at the end of the GMouse structure for the board's use
#define GMOUSE_FT5x06_BOARD_DATA_SIZE 0
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5x06_SELF_CALIBRATE FALSE
+#define GMOUSE_FT5x06_SELF_CALIBRATE GFXOFF
/* I2C interface #2 - Touchscreen controller */
static const I2CConfig i2ccfg2 = {
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/board.mk b/boards/base/Mikromedia-Plus-STM32-M4/board.mk
index 61a87888..282649d0 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/board.mk
+++ b/boards/base/Mikromedia-Plus-STM32-M4/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Mikromedia-Plus-STM32-M4
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/SSD1963/driver.mk
include $(GFXLIB)/drivers/ginput/touch/STMPE610/driver.mk
include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
index 75a1194b..c18e7450 100644
--- a/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
+++ b/boards/base/Mikromedia-Plus-STM32-M4/gmouse_lld_STMPE610_board.h
@@ -20,16 +20,16 @@
#define GMOUSE_STMPE610_BOARD_DATA_SIZE 0
// Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE610_READ_PRESSURE FALSE
-//#define GMOUSE_STMPE610_SELF_CALIBRATE FALSE
-//#define GMOUSE_STMPE610_TEST_MODE FALSE
+//#define GMOUSE_STMPE610_READ_PRESSURE GFXOFF
+//#define GMOUSE_STMPE610_SELF_CALIBRATE GFXOFF
+//#define GMOUSE_STMPE610_TEST_MODE GFXOFF
-// If TRUE this board has the STMPE610 IRQ pin connected to a GPIO.
+// If GFXON this board has the STMPE610 IRQ pin connected to a GPIO.
// Note: Although this board has such a pin its reliability has not been tested on this board!!!!!
-#define GMOUSE_STMPE610_GPIO_IRQPIN FALSE
+#define GMOUSE_STMPE610_GPIO_IRQPIN GFXOFF
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE610_SLOW_CPU FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE610_SLOW_CPU GFXOFF
// Slave address
#define STMPE610_ADDR (0x88 >> 1)
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
index 0f472bcc..60b2a91e 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/ILI9341/driver.mk
include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
include $(GFXLIB)/drivers/gaudio/vs1053/driver.mk
diff --git a/boards/base/OSX/board.mk b/boards/base/OSX/board.mk
index b2f46341..5b806fc2 100644
--- a/boards/base/OSX/board.mk
+++ b/boards/base/OSX/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/OSX
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_OSX=TRUE
+GFXDEFS += -DGFX_USE_OS_OSX=GFXON
GFXLIBS +=
include $(GFXLIB)/drivers/multiple/SDL/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board.mk b/boards/base/Olimex-SAM7EX256-GE12/board.mk
index ec712c18..c5cc9418 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE12/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE12 $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/Nokia6610GE12/driver.mk
include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
index 67e81f4c..6da500be 100644
--- a/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
+++ b/boards/base/Olimex-SAM7EX256-GE12/board_Nokia6610GE12.h
@@ -17,7 +17,7 @@
* Set various display properties. These properties mostly depend on the exact controller chip you get.
* The defaults should work for most controllers.
*/
-//#define GDISP_GE8_BROKEN_CONTROLLER FALSE // Uncomment this out if you have a controller thats not window wrap broken.
+//#define GDISP_GE8_BROKEN_CONTROLLER GFXOFF // Uncomment this out if you have a controller thats not window wrap broken.
//#define GDISP_SCREEN_HEIGHT 130 // The visible display height
//#define GDISP_SCREEN_WIDTH 130 // The visible display width
//#define GDISP_RAM_X_OFFSET 0 // The x offset of the visible area
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board.mk b/boards/base/Olimex-SAM7EX256-GE8/board.mk
index 031bbe61..6642f57f 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board.mk
+++ b/boards/base/Olimex-SAM7EX256-GE8/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Olimex-SAM7EX256-GE8
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/Nokia6610GE8/driver.mk
include $(GFXLIB)/drivers/gadc/AT91SAM7/driver.mk
include $(GFXLIB)/drivers/ginput/dial/GADC/driver.mk
diff --git a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
index 8f0eb357..a11766e4 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/board_Nokia6610GE8.h
@@ -17,7 +17,7 @@
* Set various display properties. These properties mostly depend on the exact controller chip you get.
* The defaults should work for most controllers.
*/
-//#define GDISP_GE8_BROKEN_CONTROLLER FALSE // Uncomment this out if you have a controller thats not window wrap broken.
+//#define GDISP_GE8_BROKEN_CONTROLLER GFXOFF // Uncomment this out if you have a controller thats not window wrap broken.
//#define GDISP_SCREEN_HEIGHT 130 // The visible display height
//#define GDISP_SCREEN_WIDTH 130 // The visible display width
//#define GDISP_RAM_X_OFFSET 0 // The x offset of the visible area
diff --git a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
index 68063881..1b3c547a 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/gaudio_record_board.h
@@ -22,7 +22,7 @@
/**
* @brief Whether each channel is mono or stereo
*/
-#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE
+#define GAUDIO_RECORD_CHANNEL0_IS_STEREO GFXOFF
/**
* The list of audio channels and their uses
diff --git a/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h b/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
index c0d3ab3f..ef84da66 100644
--- a/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
+++ b/boards/base/Olimex-SAM7EX256-GE8/ginput_lld_dial_board.h
@@ -22,7 +22,7 @@
#define GINPUT_DIAL_NUM_PORTS 1
#define GINPUT_DIAL_DEVICE0 GADC_PHYSDEV_DIAL
#define GINPUT_DIAL_POLL_PERIOD 200
-#define GINPUT_DIAL_CYCLE_POLL FALSE
+#define GINPUT_DIAL_CYCLE_POLL GFXOFF
#endif /* GFX_USE_GINPUT && GINPUT_NEED_DIAL */
diff --git a/boards/base/Olimex-STM32-LCD/board.mk b/boards/base/Olimex-STM32-LCD/board.mk
index 2dd9d97a..2dbf3385 100644
--- a/boards/base/Olimex-STM32-LCD/board.mk
+++ b/boards/base/Olimex-STM32-LCD/board.mk
@@ -1,6 +1,6 @@
GFXINC += $(GFXLIB)/boards/base/Olimex-STM32-LCD
GFXSRC +=
-GFXDEFS += -DGFX_USE_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_CHIBIOS=GFXON
include $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board/board.mk
include $(GFXLIB)/drivers/gdisp/ILI9320/driver.mk
diff --git a/boards/base/STM32F429i-Discovery/chibios/board.mk b/boards/base/STM32F429i-Discovery/chibios/board.mk
index 292cd42e..730bb083 100644
--- a/boards/base/STM32F429i-Discovery/chibios/board.mk
+++ b/boards/base/STM32F429i-Discovery/chibios/board.mk
@@ -2,6 +2,6 @@ GFXINC += $(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
GFXSRC += $(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \
$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
diff --git a/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h b/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
index 274f4890..3b8234f5 100644
--- a/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
+++ b/boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h
@@ -23,7 +23,7 @@ static const SPIConfig spi_cfg = {
((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR
};
-#define ALLOW_2ND_LAYER TRUE
+#define ALLOW_2ND_LAYER GFXON
static const ltdcConfig driverCfg = {
240, 320,
@@ -189,6 +189,7 @@ static void init_board(GDisplay *g) {
RCC->PLLSAICFGR = (STM32_PLLSAIN_VALUE << 6) | (STM32_PLLSAIR_VALUE << 28) | (STM32_PLLSAIQ_VALUE << 24);
RCC->DCKCFGR = (RCC->DCKCFGR & ~RCC_DCKCFGR_PLLSAIDIVR) | STM32_PLLSAIR_POST;
RCC->CR |= RCC_CR_PLLSAION;
+ while(!(RCC->CR & RCC_CR_PLLSAIRDY)); // wait for PLLSAI to lock
// Initialise the SDRAM
SDRAM_Init();
diff --git a/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h b/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
index ef3a628f..02abc43d 100644
--- a/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
+++ b/boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h
@@ -20,15 +20,15 @@
#define GMOUSE_STMPE811_BOARD_DATA_SIZE 0
// Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE811_READ_PRESSURE FALSE
-//#define GMOUSE_STMPE811_SELF_CALIBRATE FALSE
-//#define GMOUSE_STMPE811_TEST_MODE FALSE
+//#define GMOUSE_STMPE811_READ_PRESSURE GFXOFF
+//#define GMOUSE_STMPE811_SELF_CALIBRATE GFXOFF
+//#define GMOUSE_STMPE811_TEST_MODE GFXOFF
-// Set to FALSE because it does not work properly on this board even though the pin exists.
-#define GMOUSE_STMPE811_GPIO_IRQPIN FALSE
+// Set to GFXOFF because it does not work properly on this board even though the pin exists.
+#define GMOUSE_STMPE811_GPIO_IRQPIN GFXOFF
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE811_SLOW_CPU FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE811_SLOW_CPU GFXOFF
// Slave address
#define STMPE811_ADDR 0x41
diff --git a/boards/base/STM32F439i-Eval/CubeHal/board.mk b/boards/base/STM32F439i-Eval/CubeHal/board.mk
index a3bb8ad2..cdeba6d7 100644
--- a/boards/base/STM32F439i-Eval/CubeHal/board.mk
+++ b/boards/base/STM32F439i-Eval/CubeHal/board.mk
@@ -19,7 +19,7 @@ ifeq ($(OPT_OS),raw32)
$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_ugfx.c \
$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_system.c \
$(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_interrupts.c
- GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+ GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
GFXINC += $(CMSIS)/Device/ST/STM32F4xx/Include \
$(CMSIS)/Include \
$(STMHAL)/Inc
diff --git a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
index fd9a32ca..7ddd554f 100644
--- a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
+++ b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h
@@ -17,7 +17,7 @@
#include "stm32f4xx_hal.h"
#include "stm324x9i_eval_sdram.h"
-#define ALLOW_2ND_LAYER TRUE
+#define ALLOW_2ND_LAYER GFXON
// Panel parameters
// This panel is a AMPIRE640480 panel.
@@ -89,6 +89,7 @@ static void configureLcdClock(void)
RCC->PLLSAICFGR = (LCD_PLLSAIN_VALUE << 6) | (LCD_PLLSAIR_VALUE << 28) | (LCD_PLLSAIQ_VALUE << 24);
RCC->DCKCFGR = (RCC->DCKCFGR & ~RCC_DCKCFGR_PLLSAIDIVR) | LCD_PLLSAIDIVR_VALUE;
RCC->CR |= RCC_CR_PLLSAION;
+ while(!(RCC->CR & RCC_CR_PLLSAIRDY)); // wait for PLLSAI to lock
#endif
}
diff --git a/boards/base/STM32F469i-Discovery/CubeHAL/board_STM32LTDC.h b/boards/base/STM32F469i-Discovery/CubeHAL/board_STM32LTDC.h
index 00a66c21..87f70603 100644
--- a/boards/base/STM32F469i-Discovery/CubeHAL/board_STM32LTDC.h
+++ b/boards/base/STM32F469i-Discovery/CubeHAL/board_STM32LTDC.h
@@ -104,8 +104,9 @@ static GFXINLINE void init_board(GDisplay *g) {
RCC->PLLSAICFGR = (STM32_PLLSAIN_VALUE << 6) | (STM32_PLLSAIR_VALUE << 28) | (STM32_PLLSAIQ_VALUE << 24);
RCC->DCKCFGR = (RCC->DCKCFGR & ~RCC_DCKCFGR_PLLSAIDIVR) | STM32_PLLSAIR_POST;
RCC->CR |= RCC_CR_PLLSAION;
+ while(!(RCC->CR & RCC_CR_PLLSAIRDY)); // wait for PLLSAI to lock
#endif
-
+
__HAL_RCC_DSI_CLK_ENABLE();
DSI_PLLInitTypeDef dsiPllInit;
@@ -119,7 +120,7 @@ static GFXINLINE void init_board(GDisplay *g) {
/* TXEscapeCkdiv = f(LaneByteClk)/15.62 = 4 -> 500MHz/4 = 25MHz datasheet says around 20MHz */
dsiHandle.Init.TXEscapeCkdiv = laneByteClk_kHz/15620; // Low power clock relative to the laneByteClock
dsiHandle.Init.NumberOfLanes = DSI_TWO_DATA_LANES; // Two data lines for the fastest transfer speed
-
+
/* Fill in the command mode struct. */
dsiCmdMode.VirtualChannelID = 0; // The first virtual channel
@@ -139,7 +140,7 @@ static GFXINLINE void init_board(GDisplay *g) {
dsiCmdMode.VSyncPol = DSI_VSYNC_FALLING;
dsiCmdMode.AutomaticRefresh = DSI_AR_ENABLE; // Use the automatic refresh mode
dsiCmdMode.TEAcknowledgeRequest = DSI_TE_ACKNOWLEDGE_DISABLE; // Not needed when using TE through GPIO
-
+
/* GPIO configuration. */
GPIO_InitTypeDef gpioInit;
/* PH7 LCD_RESET */
@@ -149,14 +150,14 @@ static GFXINLINE void init_board(GDisplay *g) {
gpioInit.Pull = GPIO_NOPULL;
gpioInit.Speed = GPIO_SPEED_HIGH;
HAL_GPIO_Init(GPIOH, &gpioInit);
-
+
/* PJ2 DSIHOST_TE */
__HAL_RCC_GPIOJ_CLK_ENABLE();
gpioInit.Pin = GPIO_PIN_2;
gpioInit.Mode = GPIO_MODE_AF_PP;
gpioInit.Alternate = GPIO_AF13_DSI;
HAL_GPIO_Init(GPIOJ, &gpioInit);
-
+
/* PA3 LCD_BL_CTRL This pin is not physically connected. */
__HAL_RCC_GPIOA_CLK_ENABLE();
gpioInit.Pin = GPIO_PIN_3;
@@ -177,7 +178,7 @@ static GFXINLINE void init_board(GDisplay *g) {
/* Initialize the DSI peripheral. */
HAL_DSI_Init(&dsiHandle, &dsiPllInit);
-
+
DSI_PHY_TimerTypeDef PhyTimings;
/* Configure DSI PHY HS2LP and LP2HS timings. Datasheet says 95ns max */
PhyTimings.ClockLaneHS2LPTime = 35;
@@ -189,8 +190,8 @@ static GFXINLINE void init_board(GDisplay *g) {
HAL_DSI_ConfigPhyTimer(&dsiHandle, &PhyTimings);
/* Configure adapted command mode. */
- HAL_DSI_ConfigAdaptedCommandMode(&dsiHandle, &dsiCmdMode);
-
+ HAL_DSI_ConfigAdaptedCommandMode(&dsiHandle, &dsiCmdMode);
+
/* Hardware reset LCD */
reset_lcd(g);
@@ -230,7 +231,7 @@ static GFXINLINE void post_init_board(GDisplay* g)
{
(void)g;
DSI_LPCmdTypeDef dsiAPBCmd;
-
+
/* Enable the DSI host and wrapper after the LTDC initialization
To avoid any synchronization issue, the DSI shall be started after enabling the LTDC */
HAL_DSI_Start(&dsiHandle);
@@ -249,7 +250,7 @@ static GFXINLINE void post_init_board(GDisplay* g)
dsiAPBCmd.LPDcsShortReadNoP = DSI_LP_DSR0P_ENABLE;
dsiAPBCmd.LPDcsLongWrite = DSI_LP_DLW_ENABLE;
HAL_DSI_ConfigCommand(&dsiHandle, &dsiAPBCmd);
-
+
/* Configure the LCD. */
#ifdef GDISP_PIXELFORMAT_RGB565
OTM8009A_Init(OTM8009A_FORMAT_RBG565, 1);
@@ -259,7 +260,7 @@ static GFXINLINE void post_init_board(GDisplay* g)
/* Enable the tearing effect line. */
HAL_DSI_ShortWrite(&dsiHandle, 0, DSI_DCS_SHORT_PKT_WRITE_P1, DSI_SET_TEAR_ON, 0); // Only V-Blanking info
-
+
/* Disable the APB command mode again to go into adapted command mode. (going into high speed mode) */
dsiAPBCmd.LPGenShortWriteNoP = DSI_LP_GSW0P_DISABLE;
dsiAPBCmd.LPGenShortWriteOneP = DSI_LP_GSW1P_DISABLE;
@@ -273,7 +274,7 @@ static GFXINLINE void post_init_board(GDisplay* g)
dsiAPBCmd.LPDcsShortReadNoP = DSI_LP_DSR0P_DISABLE;
dsiAPBCmd.LPDcsLongWrite = DSI_LP_DLW_DISABLE;
HAL_DSI_ConfigCommand(&dsiHandle, &dsiAPBCmd);
-
+
HAL_DSI_Refresh(&dsiHandle);
}
diff --git a/boards/base/STM32F469i-Discovery/board.mk b/boards/base/STM32F469i-Discovery/board.mk
index ab704c17..26cde4a5 100644
--- a/boards/base/STM32F469i-Discovery/board.mk
+++ b/boards/base/STM32F469i-Discovery/board.mk
@@ -23,7 +23,7 @@ ifeq ($(OPT_OS),raw32)
$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_ugfx.c \
$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_system.c \
$(GFXLIB)/boards/base/STM32F469i-Discovery/stm32f469i_raw32_it.c
- GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+ GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
GFXINC += $(CMSIS)/Device/ST/STM32F4xx/Include \
$(CMSIS)/Include
LDSCRIPT = $(GFXLIB)/boards/base/STM32F469i-Discovery/STM32_FLASH.ld
diff --git a/boards/base/STM32F746-Discovery/board.mk b/boards/base/STM32F746-Discovery/board.mk
index eb9bec61..a67d602a 100644
--- a/boards/base/STM32F746-Discovery/board.mk
+++ b/boards/base/STM32F746-Discovery/board.mk
@@ -17,7 +17,7 @@ ifeq ($(OPT_OS),raw32)
$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c \
$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c \
$(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c
- GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE
+ GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON
GFXINC += $(CMSIS)/Device/ST/STM32F7xx/Include \
$(CMSIS)/Include
LDSCRIPT = $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746nghx_flash.ld
diff --git a/boards/base/STM32F746-Discovery/board_STM32LTDC.h b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
index 8ad0dfa4..231d51b3 100644
--- a/boards/base/STM32F746-Discovery/board_STM32LTDC.h
+++ b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
@@ -11,7 +11,7 @@
#include "stm32f746g_discovery_sdram.h"
#ifndef GFX_LTDC_USE_DIRECTIO
- #define GFX_LTDC_USE_DIRECTIO TRUE
+ #define GFX_LTDC_USE_DIRECTIO GFXON
#endif
#ifndef GFX_LTDC_TIMING_SET
/* Options are:
@@ -36,7 +36,7 @@
#define AFRH AFR[1]
#endif
-#define ALLOW_2ND_LAYER TRUE
+#define ALLOW_2ND_LAYER GFXON
static const ltdcConfig driverCfg = {
480, 272, // Width, Height (pixels)
@@ -450,6 +450,7 @@ static GFXINLINE void init_board(GDisplay *g) {
RCC->PLLSAICFGR = ((STM32_PLLSAIP_VALUE/2-1)<<16) | (STM32_PLLSAIN_VALUE << 6) | (STM32_PLLSAIR_VALUE << 28) | (STM32_PLLSAIQ_VALUE << 24);
RCC->DCKCFGR1 = (RCC->DCKCFGR1 & ~RCC_DCKCFGR1_PLLSAIDIVR) | STM32_PLLSAIR_POST;
RCC->CR |= RCC_CR_PLLSAION;
+ while(!(RCC->CR & RCC_CR_PLLSAIRDY)); // wait for PLLSAI to lock
#endif
// Initialise the SDRAM
diff --git a/boards/base/Win32/board.mk b/boards/base/Win32/board.mk
index b4577927..d69cfcc4 100644
--- a/boards/base/Win32/board.mk
+++ b/boards/base/Win32/board.mk
@@ -5,5 +5,5 @@ include $(GFXLIB)/drivers/multiple/Win32/driver.mk
include $(GFXLIB)/drivers/gaudio/Win32/driver.mk
ifeq ($(OPT_OS),win32.raw32)
- GFXDEFS += GFX_OS_INIT_NO_WARNING=TRUE
+ GFXDEFS += GFX_OS_INIT_NO_WARNING=GFXON
endif
diff --git a/boards/base/eCos-Synthetic-Framebuffer/board.mk b/boards/base/eCos-Synthetic-Framebuffer/board.mk
index d4e9ebe1..6980456c 100644
--- a/boards/base/eCos-Synthetic-Framebuffer/board.mk
+++ b/boards/base/eCos-Synthetic-Framebuffer/board.mk
@@ -1,5 +1,5 @@
GFXINC += $(GFXLIB)/boards/base/eCos-Synthetic-Framebuffer
GFXSRC +=
-GFXDEFS += -DGFX_USE_OS_ECOS=TRUE
+GFXDEFS += -DGFX_USE_OS_ECOS=GFXON
include $(GFXLIB)/drivers/gdisp/framebuffer/driver.mk
diff --git a/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
index e8e46131..8712cfe1 100644
--- a/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
+++ b/boards/base/eCos-Synthetic-Framebuffer/board_framebuffer.h
@@ -20,7 +20,7 @@
#endif
// Uncomment this if your frame buffer device requires flushing ("Synch" in eCos speak)
-#define GDISP_HARDWARE_FLUSH TRUE
+#define GDISP_HARDWARE_FLUSH GFXON
#ifdef GDISP_DRIVER_VMT
diff --git a/changelog.txt b/changelog.txt
index 30501b36..2346e65b 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -2,6 +2,21 @@
*** Releases ***
*****************************************************************************
+*** After Release 2.8 ***
+FEATURE: Added config vars GINPUT_TOUCH_CALIBRATION_FONT1 and GINPUT_TOUCH_CALIBRATION_FONT2
+FEATURE: Added config vars GINPUT_TOUCH_CALIBRATION_TITLE and GINPUT_TOUCH_CALIBRATION_ERROR
+FIX: Fixed ensuring the clock is fully started in STM32LTDC based boards
+FIX: Fixed compiler error in ST7735 driver
+FIX: Added support for negative baseline_x in fonts
+FIX: Fixed some word wrapping issues
+FIX: Fixed drawing of 3x3 pixel boxes
+FIX: Fixed issue in RTX5/CMSIS2 port which resulted in hanging delays/threads
+FEATURE: Added GFX_COMPAT_V2 to maintain source compatibility with V2.x programs. It is turned on by default.
+FEATURE: Added GFX_COMPAT_OLDCOLORS to allow V2.x Red, Green, Blue color names. It is turned on by default.
+CHANGE: Added GFXRED, GFXBLUE, GFXGREEN etc to replace V2.x Red, Gree, Blue color names
+CHANGE: Added GFXON/GFXOFF to replace V2.x TRUE/FALSE for configuration options.
+
+
*** Release 2.8 ***
FEATURE: Added support for 128x32 SSD1306 based displays
FIX: Fixed recursion bug in console history
diff --git a/demos/3rdparty/bubbles/gfxconf.h b/demos/3rdparty/bubbles/gfxconf.h
index b4fd0a9c..a6f046d2 100644
--- a/demos/3rdparty/bubbles/gfxconf.h
+++ b/demos/3rdparty/bubbles/gfxconf.h
@@ -10,33 +10,33 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION FALSE
-#define GDISP_NEED_CLIP FALSE
-#define GDISP_NEED_TEXT FALSE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_MULTITHREAD FALSE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
+#define GDISP_NEED_VALIDATION GFXOFF
+#define GDISP_NEED_CLIP GFXOFF
+#define GDISP_NEED_TEXT GFXOFF
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXOFF
+#define GDISP_NEED_ARC GFXOFF
+#define GDISP_NEED_SCROLL GFXOFF
+#define GDISP_NEED_PIXELREAD GFXOFF
+#define GDISP_NEED_CONTROL GFXOFF
+#define GDISP_NEED_MULTITHREAD GFXOFF
+#define GDISP_NEED_ASYNC GFXOFF
+#define GDISP_NEED_MSGAPI GFXOFF
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 FALSE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+#define GDISP_INCLUDE_FONT_SMALL GFXOFF
+#define GDISP_INCLUDE_FONT_LARGER GFXOFF
+#define GDISP_INCLUDE_FONT_UI1 GFXOFF
+#define GDISP_INCLUDE_FONT_UI2 GFXOFF
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/3rdparty/notepad-2/gfxconf.h b/demos/3rdparty/notepad-2/gfxconf.h
index 869b2ab2..7bbace41 100644
--- a/demos/3rdparty/notepad-2/gfxconf.h
+++ b/demos/3rdparty/notepad-2/gfxconf.h
@@ -10,55 +10,55 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_CONVEX_POLYGON FALSE
-#define GDISP_NEED_SCROLL FALSE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXOFF
+#define GDISP_NEED_ARC GFXOFF
+#define GDISP_NEED_CONVEX_POLYGON GFXOFF
+#define GDISP_NEED_SCROLL GFXOFF
+#define GDISP_NEED_PIXELREAD GFXOFF
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_ASYNC GFXOFF
+#define GDISP_NEED_MSGAPI GFXOFF
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_SMALL FALSE
-#define GDISP_INCLUDE_FONT_LARGER FALSE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
+#define GDISP_INCLUDE_FONT_SMALL GFXOFF
+#define GDISP_INCLUDE_FONT_LARGER GFXOFF
+#define GDISP_INCLUDE_FONT_UI1 GFXOFF
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE FALSE
-#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP FALSE
-#define GDISP_NEED_IMAGE_JPG FALSE
-#define GDISP_NEED_IMAGE_PNG FALSE
+#define GDISP_NEED_IMAGE_NATIVE GFXOFF
+#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXOFF
+#define GDISP_NEED_IMAGE_JPG GFXOFF
+#define GDISP_NEED_IMAGE_PNG GFXOFF
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_BUTTON TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_SLIDER TRUE
+#define GWIN_NEED_BUTTON GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_NEED_SLIDER GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_NEED_DIAL FALSE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_NEED_DIAL GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/applications/combo/bounce.c b/demos/applications/combo/bounce.c
index f0b78266..54938414 100644
--- a/demos/applications/combo/bounce.c
+++ b/demos/applications/combo/bounce.c
@@ -48,11 +48,11 @@ static gfxThreadHandle thread;
* your processor.
*
* You can modify the implementation of invsqrt() by firstly defining
- * #define GMISC_INVSQRT_MIXED_ENDIAN TRUE
+ * #define GMISC_INVSQRT_MIXED_ENDIAN GFXON
* in your gfxconf.h file.
*
* If it still doesn't work then instead define
- * #define GMISC_INVSQRT_REAL_SLOW TRUE
+ * #define GMISC_INVSQRT_REAL_SLOW GFXON
* in your gfxconf.h file. This should always work although it will probably be slow.
*/
#define BALLCOLOR1 Red
diff --git a/demos/applications/combo/gfxconf.h b/demos/applications/combo/gfxconf.h
index aec48783..cf218206 100644
--- a/demos/applications/combo/gfxconf.h
+++ b/demos/applications/combo/gfxconf.h
@@ -19,109 +19,109 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-//#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+//#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_STREAMING GFXON
-#define GDISP_NEED_IMAGE TRUE
- #define GDISP_NEED_IMAGE_BMP TRUE
- #define GDISP_NEED_IMAGE_GIF TRUE
+#define GDISP_NEED_IMAGE GFXON
+ #define GDISP_NEED_IMAGE_BMP GFXON
+ #define GDISP_NEED_IMAGE_GIF GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_MULTITHREAD GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
- #define GWIN_NEED_FLASHING TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+ #define GWIN_NEED_FLASHING GFXON
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
-#define GWIN_NEED_GRAPH TRUE
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+#define GWIN_NEED_GRAPH GFXON
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_LABEL_ATTRIBUTE TRUE
- #define GWIN_NEED_BUTTON TRUE
-// #define GWIN_BUTTON_LAZY_RELEASE TRUE
- #define GWIN_NEED_SLIDER TRUE
- #define GWIN_NEED_CHECKBOX TRUE
- #define GWIN_NEED_IMAGE TRUE
- #define GWIN_NEED_RADIO TRUE
- #define GWIN_NEED_LIST TRUE
- #define GWIN_NEED_LIST_IMAGES TRUE
- #define GWIN_NEED_PROGRESSBAR TRUE
- #define GWIN_PROGRESSBAR_AUTO TRUE
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_LABEL_ATTRIBUTE GFXON
+ #define GWIN_NEED_BUTTON GFXON
+// #define GWIN_BUTTON_LAZY_RELEASE GFXON
+ #define GWIN_NEED_SLIDER GFXON
+ #define GWIN_NEED_CHECKBOX GFXON
+ #define GWIN_NEED_IMAGE GFXON
+ #define GWIN_NEED_RADIO GFXON
+ #define GWIN_NEED_LIST GFXON
+ #define GWIN_NEED_LIST_IMAGES GFXON
+ #define GWIN_NEED_PROGRESSBAR GFXON
+ #define GWIN_PROGRESSBAR_AUTO GFXON
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
-#define GWIN_NEED_TABSET TRUE
+#define GWIN_NEED_TABSET GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
-//#define GINPUT_NEED_TOGGLE TRUE
-//#define GINPUT_NEED_DIAL TRUE
+#define GINPUT_NEED_MOUSE GFXON
+//#define GINPUT_NEED_TOGGLE GFXON
+//#define GINPUT_NEED_DIAL GFXON
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GFILE GFXON
-#define GFILE_NEED_PRINTG TRUE
-#define GFILE_NEED_STRINGS TRUE
+#define GFILE_NEED_PRINTG GFXON
+#define GFILE_NEED_STRINGS GFXON
-#define GFILE_NEED_ROMFS TRUE
-//#define GFILE_NEED_NATIVEFS TRUE
+#define GFILE_NEED_ROMFS GFXON
+//#define GFILE_NEED_NATIVEFS GFXON
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GMISC TRUE
-#define GMISC_NEED_INVSQRT TRUE
+#define GFX_USE_GMISC GFXON
+#define GMISC_NEED_INVSQRT GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h
index 99a04b5c..17c45142 100644
--- a/demos/applications/mandelbrot/gfxconf.h
+++ b/demos/applications/mandelbrot/gfxconf.h
@@ -31,15 +31,15 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
+#define GDISP_NEED_VALIDATION GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index b3920119..9110d6e8 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -31,30 +31,30 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA TRUE
-#define GDISP_NEED_ANTIALIAS TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXON
+#define GDISP_NEED_ANTIALIAS GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/benchmarks/gfxconf.h b/demos/benchmarks/gfxconf.h
index aaacd3a2..3133e757 100644
--- a/demos/benchmarks/gfxconf.h
+++ b/demos/benchmarks/gfxconf.h
@@ -31,22 +31,22 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION FALSE
-#define GDISP_NEED_CLIP FALSE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CONTROL TRUE
+#define GDISP_NEED_VALIDATION GFXOFF
+#define GDISP_NEED_CLIP GFXOFF
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CONTROL GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/games/justget10/demo.mk b/demos/games/justget10/demo.mk
index 1487808b..9e58121c 100644
--- a/demos/games/justget10/demo.mk
+++ b/demos/games/justget10/demo.mk
@@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \
GFXSRC += $(DEMODIR)/main.c \
$(DEMODIR)/jg10.c
-DEFS += -DJG10_SHOW_SPLASH=TRUE
+DEFS += -DJG10_SHOW_SPLASH=GFXON
diff --git a/demos/games/justget10/gfxconf.h b/demos/games/justget10/gfxconf.h
index 9cfb3859..834b4a9d 100644
--- a/demos/games/justget10/gfxconf.h
+++ b/demos/games/justget10/gfxconf.h
@@ -31,65 +31,65 @@
#define _GFXCONF_H
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
#define GFILE_MAX_GFILES 24
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_IMAGE_BMP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
-#define GDISP_NEED_STARTUP_LOGO FALSE
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_IMAGE_BMP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
+#define GDISP_NEED_STARTUP_LOGO GFXOFF
//////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GQUEUE_NEED_ASYNC TRUE
-#define GFX_USE_GQUEUE TRUE
-#define GWIN_REDRAW_IMMEDIATE TRUE
-#define GWIN_REDRAW_SINGLEOP TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GQUEUE_NEED_ASYNC GFXON
+#define GFX_USE_GQUEUE GFXON
+#define GWIN_REDRAW_IMMEDIATE GFXON
+#define GWIN_REDRAW_SINGLEOP GFXON
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_BUTTON TRUE
-#define GWIN_BUTTON_LAZY_RELEASE FALSE
-#define GWIN_NEED_SLIDER TRUE
-#define GWIN_FLAT_STYLING FALSE
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_BUTTON GFXON
+#define GWIN_BUTTON_LAZY_RELEASE GFXOFF
+#define GWIN_NEED_SLIDER GFXON
+#define GWIN_FLAT_STYLING GFXOFF
-#define GWIN_NEED_CONTAINERS TRUE
-#define GWIN_NEED_CONTAINER TRUE
-#define GWIN_NEED_FRAME FALSE
-#define GWIN_NEED_TABSET FALSE
+#define GWIN_NEED_CONTAINERS GFXON
+#define GWIN_NEED_CONTAINER GFXON
+#define GWIN_NEED_FRAME GFXOFF
+#define GWIN_NEED_TABSET GFXOFF
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
- #define GWIN_CONSOLE_ESCSEQ TRUE
- #define GWIN_CONSOLE_USE_BASESTREAM TRUE
-#define GWIN_NEED_GRAPH TRUE
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+ #define GWIN_CONSOLE_ESCSEQ GFXON
+ #define GWIN_CONSOLE_USE_BASESTREAM GFXON
+#define GWIN_NEED_GRAPH GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/games/minesweeper/demo.mk b/demos/games/minesweeper/demo.mk
index 43869d7e..41b18106 100644
--- a/demos/games/minesweeper/demo.mk
+++ b/demos/games/minesweeper/demo.mk
@@ -6,4 +6,4 @@ GFXINC += $(DEMODIR) \
GFXSRC += $(DEMODIR)/main.c \
$(DEMODIR)/mines.c
-DEFS += -DMINES_SHOW_SPLASH=TRUE
+DEFS += -DMINES_SHOW_SPLASH=GFXON
diff --git a/demos/games/minesweeper/gfxconf.h b/demos/games/minesweeper/gfxconf.h
index 468b32e2..c0961839 100644
--- a/demos/games/minesweeper/gfxconf.h
+++ b/demos/games/minesweeper/gfxconf.h
@@ -31,35 +31,34 @@
#define _GFXCONF_H
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_IMAGE_BMP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
-#define GDISP_NEED_STARTUP_LOGO FALSE
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_IMAGE_BMP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_USER_FONTS TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
-#define GDISP_INCLUDE_FONT_FIXED_10X20 TRUE
-#define GDISP_INCLUDE_FONT_FIXED_5X8 TRUE
+#define GDISP_INCLUDE_USER_FONTS GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
+#define GDISP_INCLUDE_FONT_FIXED_10X20 GFXON
+#define GDISP_INCLUDE_FONT_FIXED_5X8 GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/games/minesweeper/readme.txt b/demos/games/minesweeper/readme.txt
index e820fe63..f207da09 100644
--- a/demos/games/minesweeper/readme.txt
+++ b/demos/games/minesweeper/readme.txt
@@ -1,6 +1,6 @@
A demo Minesweeper game using. Various configuration options can be found in mines.h
-NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to FALSE.
+NOTE: You can save FLASH space by disabling the splash-screen, to do that set MINES_SHOW_SPLASH to GFXOFF.
Credits:
Code: Fleck
diff --git a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
index b1f8a710..9fa2eca9 100644
--- a/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
+++ b/demos/games/tetris/Example_Makefiles/stm32f4/Makefile
@@ -176,7 +176,7 @@ CPPWARN = -Wall -Wextra
#
# List all default C defines here, like -D_DEBUG=1
-DDEFS = -DGFX_USE_OS_CHIBIOS=TRUE
+DDEFS = -DGFX_USE_OS_CHIBIOS=GFXON
# List all default ASM defines here, like -D_DEBUG=1
DADEFS =
diff --git a/demos/games/tetris/gfxconf.h b/demos/games/tetris/gfxconf.h
index 08997b10..72df36c7 100644
--- a/demos/games/tetris/gfxconf.h
+++ b/demos/games/tetris/gfxconf.h
@@ -31,38 +31,38 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_USE_DMA TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_USE_DMA GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Comment these out if it conflicts with your hardware */
-#define GDISP_NEED_CONTROL TRUE
+#define GDISP_NEED_CONTROL GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_PORTRAIT
#define GDISP_SCREEN_WIDTH 240
#define GDISP_SCREEN_HEIGHT 320
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
-#define GDISP_NEED_ANTIALIAS FALSE
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
+#define GDISP_NEED_ANTIALIAS GFXOFF
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gadc/gfxconf.h b/demos/modules/gadc/gfxconf.h
index d0da3943..84c8b9d4 100644
--- a/demos/modules/gadc/gfxconf.h
+++ b/demos/modules/gadc/gfxconf.h
@@ -36,27 +36,27 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GADC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GADC GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* GDISP - builtin fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gaudio/oscilloscope/gfxconf.h b/demos/modules/gaudio/oscilloscope/gfxconf.h
index 8e20ce0b..76b2d871 100644
--- a/demos/modules/gaudio/oscilloscope/gfxconf.h
+++ b/demos/modules/gaudio/oscilloscope/gfxconf.h
@@ -36,23 +36,23 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GAUDIO TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GAUDIO GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Features for the GAUDIO sub-system */
-#define GAUDIO_NEED_RECORD TRUE
+#define GAUDIO_NEED_RECORD GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gaudio/play-vs1053/gfxconf.h b/demos/modules/gaudio/play-vs1053/gfxconf.h
index a9bb6252..291a292c 100644
--- a/demos/modules/gaudio/play-vs1053/gfxconf.h
+++ b/demos/modules/gaudio/play-vs1053/gfxconf.h
@@ -36,27 +36,27 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GAUDIO TRUE
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GAUDIO GFXON
+#define GFX_USE_GFILE GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GAUDIO sub-system */
-#define GAUDIO_NEED_PLAY TRUE
+#define GAUDIO_NEED_PLAY GFXON
/* Features for the GFILE sub-system */
-#define GFILE_NEED_ROMFS TRUE
+#define GFILE_NEED_ROMFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gaudio/play-wave/gfxconf.h b/demos/modules/gaudio/play-wave/gfxconf.h
index a9bb6252..291a292c 100644
--- a/demos/modules/gaudio/play-wave/gfxconf.h
+++ b/demos/modules/gaudio/play-wave/gfxconf.h
@@ -36,27 +36,27 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GAUDIO TRUE
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GAUDIO GFXON
+#define GFX_USE_GFILE GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GAUDIO sub-system */
-#define GAUDIO_NEED_PLAY TRUE
+#define GAUDIO_NEED_PLAY GFXON
/* Features for the GFILE sub-system */
-#define GFILE_NEED_ROMFS TRUE
+#define GFILE_NEED_ROMFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/arcsectors/gfxconf.h b/demos/modules/gdisp/arcsectors/gfxconf.h
index df6d85c0..b2c64fbd 100644
--- a/demos/modules/gdisp/arcsectors/gfxconf.h
+++ b/demos/modules/gdisp/arcsectors/gfxconf.h
@@ -31,17 +31,17 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_ARCSECTORS TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_ARCSECTORS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/basics/gfxconf.h b/demos/modules/gdisp/basics/gfxconf.h
index a37ef1e7..931f2fe7 100644
--- a/demos/modules/gdisp/basics/gfxconf.h
+++ b/demos/modules/gdisp/basics/gfxconf.h
@@ -31,17 +31,17 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/circles/gfxconf.h b/demos/modules/gdisp/circles/gfxconf.h
index 4bb605ac..a0534700 100644
--- a/demos/modules/gdisp/circles/gfxconf.h
+++ b/demos/modules/gdisp/circles/gfxconf.h
@@ -31,25 +31,25 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GMISC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GMISC GFXON
/* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ARC TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ARC GFXON
/* Features for the GMISC subsystem */
-#define GMISC_NEED_FIXEDTRIG TRUE
-#define GMISC_NEED_FASTTRIG TRUE
+#define GMISC_NEED_FIXEDTRIG GFXON
+#define GMISC_NEED_FASTTRIG GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/fonts/gfxconf.h b/demos/modules/gdisp/fonts/gfxconf.h
index 1ea84e1b..2e24dd64 100644
--- a/demos/modules/gdisp/fonts/gfxconf.h
+++ b/demos/modules/gdisp/fonts/gfxconf.h
@@ -31,41 +31,41 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_ANTIALIAS TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_ANTIALIAS GFXON
/* GDISP - fonts to include */
-#define GDISP_INCLUDE_USER_FONTS TRUE
-#define GDISP_INCLUDE_FONT_UI1 FALSE
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
-#define GDISP_INCLUDE_FONT_FIXED_10x20 FALSE
-#define GDISP_INCLUDE_FONT_FIXED_7x14 FALSE
-#define GDISP_INCLUDE_FONT_FIXED_5x8 FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
-#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
+#define GDISP_INCLUDE_USER_FONTS GFXON
+#define GDISP_INCLUDE_FONT_UI1 GFXOFF
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_10x20 GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_7x14 GFXOFF
+#define GDISP_INCLUDE_FONT_FIXED_5x8 GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF
+#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
index dab77ba1..359061de 100644
--- a/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
+++ b/demos/modules/gdisp/fonts_cyrillic/gfxconf.h
@@ -31,26 +31,26 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX subsystems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP subsystem */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE TRUE
-#define GDISP_NEED_ANTIALIAS TRUE
-#define GDISP_NEED_UTF8 TRUE
-#define GDISP_NEED_TEXT_KERNING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXON
+#define GDISP_NEED_ANTIALIAS GFXON
+#define GDISP_NEED_UTF8 GFXON
+#define GDISP_NEED_TEXT_KERNING GFXON
/* GDISP - fonts to include */
-#define GDISP_INCLUDE_USER_FONTS TRUE
+#define GDISP_INCLUDE_USER_FONTS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h
index 55420275..7a37b48e 100644
--- a/demos/modules/gdisp/images/gfxconf.h
+++ b/demos/modules/gdisp/images/gfxconf.h
@@ -31,30 +31,30 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_IMAGE TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_IMAGE GFXON
#define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0)
/* GDISP image decoders */
-//#define GDISP_NEED_IMAGE_NATIVE TRUE
-//#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP TRUE
-//#define GDISP_NEED_IMAGE_JPG TRUE
-//#define GDISP_NEED_IMAGE_PNG TRUE
-
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
-//#define GFILE_NEED_NATIVEFS TRUE
+//#define GDISP_NEED_IMAGE_NATIVE GFXON
+//#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXON
+//#define GDISP_NEED_IMAGE_JPG GFXON
+//#define GDISP_NEED_IMAGE_PNG GFXON
+
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
+//#define GFILE_NEED_NATIVEFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h
index fddda437..edbe126d 100644
--- a/demos/modules/gdisp/images_animated/gfxconf.h
+++ b/demos/modules/gdisp/images_animated/gfxconf.h
@@ -31,28 +31,28 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_IMAGE TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_IMAGE GFXON
/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE FALSE
-#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP FALSE
-#define GDISP_NEED_IMAGE_JPG FALSE
-#define GDISP_NEED_IMAGE_PNG FALSE
-
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
+#define GDISP_NEED_IMAGE_NATIVE GFXOFF
+#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXOFF
+#define GDISP_NEED_IMAGE_JPG GFXOFF
+#define GDISP_NEED_IMAGE_PNG GFXOFF
+
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c
index 039cf584..5f24c0fc 100644
--- a/demos/modules/gdisp/images_animated/main.c
+++ b/demos/modules/gdisp/images_animated/main.c
@@ -36,7 +36,7 @@
* The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS.
*/
-#define USE_IMAGE_CACHE FALSE // Only if you want to get performance at the expense of RAM
+#define USE_IMAGE_CACHE GFXOFF // Only if you want to get performance at the expense of RAM
#define MY_BG_COLOR RGB2COLOR(220, 220, 255) // Pale blue so we can see the transparent parts
static gdispImage myImage;
diff --git a/demos/modules/gdisp/images_palettes/gfxconf.h b/demos/modules/gdisp/images_palettes/gfxconf.h
index a98776f5..db09cf0b 100644
--- a/demos/modules/gdisp/images_palettes/gfxconf.h
+++ b/demos/modules/gdisp/images_palettes/gfxconf.h
@@ -31,30 +31,30 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_IMAGE TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_IMAGE GFXON
#define GDISP_STARTUP_COLOR HTML2COLOR(0xC0C0C0)
/* GDISP image decoders */
-//#define GDISP_NEED_IMAGE_NATIVE TRUE
-//#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP TRUE
-//#define GDISP_NEED_IMAGE_JPG TRUE
-//#define GDISP_NEED_IMAGE_PNG TRUE
-
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_ROMFS TRUE
-//#define GFILE_NEED_NATIVEFS TRUE
+//#define GDISP_NEED_IMAGE_NATIVE GFXON
+//#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXON
+//#define GDISP_NEED_IMAGE_JPG GFXON
+//#define GDISP_NEED_IMAGE_PNG GFXON
+
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_ROMFS GFXON
+//#define GFILE_NEED_NATIVEFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/images_palettes/main.c b/demos/modules/gdisp/images_palettes/main.c
index 7d63088b..ceb9534f 100644
--- a/demos/modules/gdisp/images_palettes/main.c
+++ b/demos/modules/gdisp/images_palettes/main.c
@@ -36,7 +36,7 @@
* the same time there's still just one copy of the image in memory at all times.
*/
-#define USE_PRINTF TRUE
+#define USE_PRINTF GFXON
#include "gfx.h"
diff --git a/demos/modules/gdisp/multiple_displays/gfxconf.h b/demos/modules/gdisp/multiple_displays/gfxconf.h
index af71500e..a07c2993 100644
--- a/demos/modules/gdisp/multiple_displays/gfxconf.h
+++ b/demos/modules/gdisp/multiple_displays/gfxconf.h
@@ -31,20 +31,20 @@
#define _GFXCONF_H
//* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* You must either define GDISP_TOTAL_DISPLAYS or GDISP_DRIVER_LIST for multiple displays.
* You cannot define both!
@@ -66,15 +66,15 @@
* as the program doesn't have to detect the hardware method to use on each call.
*
* Hardware definitions can be set to:
- * - TRUE - all controllers support this routine
- * - FALSE - no controllers support this routine
+ * - GFXON - all controllers support this routine
+ * - GFXOFF - no controllers support this routine
* - if not specified then the code auto-detects the hardware.
*
* e.g
- * #define GDISP_HARDWARE_STREAM_WRITE FALSE
- * #define GDISP_HARDWARE_STREAM_READ FALSE
- * #define GDISP_HARDWARE_DRAWPIXEL TRUE
- * #define GDISP_HARDWARE_FILLS TRUE
+ * #define GDISP_HARDWARE_STREAM_WRITE GFXOFF
+ * #define GDISP_HARDWARE_STREAM_READ GFXOFF
+ * #define GDISP_HARDWARE_DRAWPIXEL GFXON
+ * #define GDISP_HARDWARE_FILLS GFXON
*/
#if GFX_USE_OS_WIN32 || GFX_USE_OS_LINUX || GFX_USE_OS_OSX
// Emulator
@@ -90,8 +90,8 @@
/*
* The following are needed only for the sprintg() call
*/
-#define GFX_USE_GFILE TRUE
-#define GFILE_NEED_PRINTG TRUE
-#define GFILE_NEED_STRINGS TRUE
+#define GFX_USE_GFILE GFXON
+#define GFILE_NEED_PRINTG GFXON
+#define GFILE_NEED_STRINGS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/multiple_displays/main.c b/demos/modules/gdisp/multiple_displays/main.c
index 0a474d0f..8c590f6d 100644
--- a/demos/modules/gdisp/multiple_displays/main.c
+++ b/demos/modules/gdisp/multiple_displays/main.c
@@ -41,7 +41,7 @@
* and method 1 for any extra displays.
*/
-#define USE_METHOD_1 FALSE
+#define USE_METHOD_1 GFXOFF
#if USE_METHOD_1
int main(void) {
diff --git a/demos/modules/gdisp/pixmap/gfxconf.h b/demos/modules/gdisp/pixmap/gfxconf.h
index ddd7d1ec..122caec2 100644
--- a/demos/modules/gdisp/pixmap/gfxconf.h
+++ b/demos/modules/gdisp/pixmap/gfxconf.h
@@ -31,18 +31,18 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_PIXMAP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_PIXMAP GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/polygons/gfxconf.h b/demos/modules/gdisp/polygons/gfxconf.h
index 51170ecc..d0388c34 100644
--- a/demos/modules/gdisp/polygons/gfxconf.h
+++ b/demos/modules/gdisp/polygons/gfxconf.h
@@ -31,19 +31,19 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GMISC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GMISC GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
/* For this demo define either:
* GMISC_NEED_MATRIXFLOAT2D to use floating point math operations
@@ -56,11 +56,11 @@
* If you choose fixed point you MUST define GMISC_NEED_FIXEDTRIG for this demo.
*/
-//#define GMISC_NEED_FASTTRIG TRUE
-//#define GMISC_NEED_MATRIXFLOAT2D TRUE
+//#define GMISC_NEED_FASTTRIG GFXON
+//#define GMISC_NEED_MATRIXFLOAT2D GFXON
-#define GMISC_NEED_FIXEDTRIG TRUE
-#define GMISC_NEED_MATRIXFIXED2D TRUE
+#define GMISC_NEED_FIXEDTRIG GFXON
+#define GMISC_NEED_MATRIXFIXED2D GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/streaming/gfxconf.h b/demos/modules/gdisp/streaming/gfxconf.h
index 82843184..6d83defe 100644
--- a/demos/modules/gdisp/streaming/gfxconf.h
+++ b/demos/modules/gdisp/streaming/gfxconf.h
@@ -10,22 +10,22 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GMISC TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GMISC GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_STREAMING GFXON
-#define GFX_USE_GMISC TRUE
-#define GMISC_NEED_INVSQRT TRUE
-//#define GMISC_INVSQRT_MIXED_ENDIAN TRUE
-//#define GMISC_INVSQRT_REAL_SLOW TRUE
+#define GFX_USE_GMISC GFXON
+#define GMISC_NEED_INVSQRT GFXON
+//#define GMISC_INVSQRT_MIXED_ENDIAN GFXON
+//#define GMISC_INVSQRT_REAL_SLOW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gdisp/streaming/main.c b/demos/modules/gdisp/streaming/main.c
index 33b69c91..be94608f 100644
--- a/demos/modules/gdisp/streaming/main.c
+++ b/demos/modules/gdisp/streaming/main.c
@@ -42,11 +42,11 @@
* your processor.
*
* You can modify the implementation of invsqrt() by firstly defining
- * #define GMISC_INVSQRT_MIXED_ENDIAN TRUE
+ * #define GMISC_INVSQRT_MIXED_ENDIAN GFXON
* in your gfxconf.h file.
*
* If it still doesn't work then instead define
- * #define GMISC_INVSQRT_REAL_SLOW TRUE
+ * #define GMISC_INVSQRT_REAL_SLOW GFXON
* in your gfxconf.h file. This should always work although it will probably be slow.
*/
#define BALLCOLOR1 Red
diff --git a/demos/modules/gdisp/thickarcs/gfxconf.h b/demos/modules/gdisp/thickarcs/gfxconf.h
index 50e3092e..e81b5e06 100644
--- a/demos/modules/gdisp/thickarcs/gfxconf.h
+++ b/demos/modules/gdisp/thickarcs/gfxconf.h
@@ -31,17 +31,17 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
/* Features for the GDISP subsystem. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_ARC TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_ARC GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gfile/fatfs/gfxconf.h b/demos/modules/gfile/fatfs/gfxconf.h
index 31738ec6..739eda64 100644
--- a/demos/modules/gfile/fatfs/gfxconf.h
+++ b/demos/modules/gfile/fatfs/gfxconf.h
@@ -1,10 +1,10 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GFILE GFXON
-#define GFILE_NEED_FATFS TRUE
-#define GFILE_NEED_NOAUTOMOUNT TRUE
-#define GFILE_NEED_PRINTG TRUE
+#define GFILE_NEED_FATFS GFXON
+#define GFILE_NEED_NOAUTOMOUNT GFXON
+#define GFILE_NEED_PRINTG GFXON
#endif /* _GFXCONF_H */ \ No newline at end of file
diff --git a/demos/modules/ginput/keyboard/gfxconf.h b/demos/modules/ginput/keyboard/gfxconf.h
index 9ee7eac3..09947006 100644
--- a/demos/modules/ginput/keyboard/gfxconf.h
+++ b/demos/modules/ginput/keyboard/gfxconf.h
@@ -31,31 +31,31 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_KEYBOARD TRUE
+#define GINPUT_NEED_KEYBOARD GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gos/threads/gfxconf.h b/demos/modules/gos/threads/gfxconf.h
index dd36bf3d..45f9564a 100644
--- a/demos/modules/gos/threads/gfxconf.h
+++ b/demos/modules/gos/threads/gfxconf.h
@@ -26,15 +26,15 @@
///////////////////////////////////////////////////////////////////////////
// GOS - One of these must be defined, preferably in your Makefile //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_FREERTOS FALSE
-// #define GFX_FREERTOS_USE_TRACE FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
-//#define GFX_USE_OS_ECOS FALSE
-//#define GFX_USE_OS_RAWRTOS FALSE
-//#define GFX_USE_OS_RAW32 FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_FREERTOS GFXOFF
+// #define GFX_FREERTOS_USE_TRACE GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
+//#define GFX_USE_OS_ECOS GFXOFF
+//#define GFX_USE_OS_RAWRTOS GFXOFF
+//#define GFX_USE_OS_RAW32 GFXOFF
// We define this here in case you are using raw32 or arduino with this demo
// and have a non-thread-safe C library.
diff --git a/demos/modules/gos/threads_advanced/gfxconf.h b/demos/modules/gos/threads_advanced/gfxconf.h
index 9a35130a..ead115eb 100644
--- a/demos/modules/gos/threads_advanced/gfxconf.h
+++ b/demos/modules/gos/threads_advanced/gfxconf.h
@@ -33,21 +33,21 @@
///////////////////////////////////////////////////////////////////////////
// GOS - One of these must be defined, preferably in your Makefile //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_FREERTOS FALSE
-// #define GFX_FREERTOS_USE_TRACE FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
-//#define GFX_USE_OS_ECOS FALSE
-//#define GFX_USE_OS_RAWRTOS FALSE
-//#define GFX_USE_OS_RAW32 FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_FREERTOS GFXOFF
+// #define GFX_FREERTOS_USE_TRACE GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
+//#define GFX_USE_OS_ECOS GFXOFF
+//#define GFX_USE_OS_RAWRTOS GFXOFF
+//#define GFX_USE_OS_RAW32 GFXOFF
// We define this here in case you are using raw32 or arduino with this demo
// and have a non-thread-safe C library.
#define GOS_RAW_HEAP_SIZE 10240
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gtimer/gfxconf.h b/demos/modules/gtimer/gfxconf.h
index 8786fafe..4a6807e0 100644
--- a/demos/modules/gtimer/gfxconf.h
+++ b/demos/modules/gtimer/gfxconf.h
@@ -31,12 +31,12 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gtrans/basic/gfxconf.h b/demos/modules/gtrans/basic/gfxconf.h
index c4f75e22..e41aaf03 100644
--- a/demos/modules/gtrans/basic/gfxconf.h
+++ b/demos/modules/gtrans/basic/gfxconf.h
@@ -31,21 +31,21 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
-#define GFX_USE_GTRANS TRUE
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GTRANS GFXON
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_ANTIALIAS TRUE
-#define GDISP_NEED_UTF8 TRUE
-#define GDISP_NEED_TEXT_KERNING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_ANTIALIAS GFXON
+#define GDISP_NEED_UTF8 GFXON
+#define GDISP_NEED_TEXT_KERNING GFXON
-#define GDISP_INCLUDE_USER_FONTS TRUE
+#define GDISP_INCLUDE_USER_FONTS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/basic/gfxconf.h b/demos/modules/gwin/basic/gfxconf.h
index c5050cef..21055ab7 100644
--- a/demos/modules/gwin/basic/gfxconf.h
+++ b/demos/modules/gwin/basic/gfxconf.h
@@ -31,19 +31,19 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
/* Features for the GWIN subsystem. */
diff --git a/demos/modules/gwin/button/gfxconf.h b/demos/modules/gwin/button/gfxconf.h
index eba3f4ef..23a4be7f 100644
--- a/demos/modules/gwin/button/gfxconf.h
+++ b/demos/modules/gwin/button/gfxconf.h
@@ -31,35 +31,35 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CONTROL TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CONTROL GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_BUTTON TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_BUTTON GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/checkbox/gfxconf.h b/demos/modules/gwin/checkbox/gfxconf.h
index f9060599..2f4a78bb 100644
--- a/demos/modules/gwin/checkbox/gfxconf.h
+++ b/demos/modules/gwin/checkbox/gfxconf.h
@@ -31,34 +31,34 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_CHECKBOX TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_CHECKBOX GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/console/gfxconf.h b/demos/modules/gwin/console/gfxconf.h
index 9efba8eb..fc23d44c 100644
--- a/demos/modules/gwin/console/gfxconf.h
+++ b/demos/modules/gwin/console/gfxconf.h
@@ -31,31 +31,31 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_CONSOLE_ESCSEQ TRUE
-#define GWIN_CONSOLE_USE_HISTORY TRUE
-#define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
-#define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_CONSOLE_ESCSEQ GFXON
+#define GWIN_CONSOLE_USE_HISTORY GFXON
+#define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+#define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/container/gfxconf.h b/demos/modules/gwin/container/gfxconf.h
index fdddc3f3..e37c8653 100644
--- a/demos/modules/gwin/container/gfxconf.h
+++ b/demos/modules/gwin/container/gfxconf.h
@@ -19,69 +19,69 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
-
-#define GWIN_NEED_WINDOWMANAGER TRUE
-
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
- #define GWIN_CONSOLE_ESCSEQ TRUE
- #define GWIN_CONSOLE_USE_BASESTREAM TRUE
-#define GWIN_NEED_GRAPH TRUE
-
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_BUTTON TRUE
- #define GWIN_BUTTON_LAZY_RELEASE TRUE
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
+#define GFX_USE_GWIN GFXON
+
+#define GWIN_NEED_WINDOWMANAGER GFXON
+
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+ #define GWIN_CONSOLE_ESCSEQ GFXON
+ #define GWIN_CONSOLE_USE_BASESTREAM GFXON
+#define GWIN_NEED_GRAPH GFXON
+
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_BUTTON GFXON
+ #define GWIN_BUTTON_LAZY_RELEASE GFXON
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
-#define GQUEUE_NEED_GSYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
+#define GQUEUE_NEED_GSYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/container_nested/gfxconf.h b/demos/modules/gwin/container_nested/gfxconf.h
index ef2ff2bc..938d03d5 100644
--- a/demos/modules/gwin/container_nested/gfxconf.h
+++ b/demos/modules/gwin/container_nested/gfxconf.h
@@ -19,70 +19,70 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
-
-#define GWIN_NEED_WINDOWMANAGER TRUE
-
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
- #define GWIN_CONSOLE_ESCSEQ TRUE
- #define GWIN_CONSOLE_USE_BASESTREAM TRUE
-#define GWIN_NEED_GRAPH TRUE
-
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_BUTTON TRUE
- #define GWIN_BUTTON_LAZY_RELEASE TRUE
- #define GWIN_NEED_CHECKBOX TRUE
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
+#define GFX_USE_GWIN GFXON
+
+#define GWIN_NEED_WINDOWMANAGER GFXON
+
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+ #define GWIN_CONSOLE_ESCSEQ GFXON
+ #define GWIN_CONSOLE_USE_BASESTREAM GFXON
+#define GWIN_NEED_GRAPH GFXON
+
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_BUTTON GFXON
+ #define GWIN_BUTTON_LAZY_RELEASE GFXON
+ #define GWIN_NEED_CHECKBOX GFXON
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
-#define GQUEUE_NEED_GSYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
+#define GQUEUE_NEED_GSYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/frame/gfxconf.h b/demos/modules/gwin/frame/gfxconf.h
index 0c14f6b4..853bcd76 100644
--- a/demos/modules/gwin/frame/gfxconf.h
+++ b/demos/modules/gwin/frame/gfxconf.h
@@ -19,62 +19,62 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
// Oops - rand() seems to use malloc()
-#define GFX_EMULATE_MALLOC TRUE
+#define GFX_EMULATE_MALLOC GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_TEXT TRUE
- //#define GDISP_NEED_ANTIALIAS TRUE // Not needed for UI2 font
- //#define GDISP_NEED_TEXT_KERNING TRUE // Not needed for UI2 font
- //#define GDISP_NEED_UTF8 TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_TEXT GFXON
+ //#define GDISP_NEED_ANTIALIAS GFXON // Not needed for UI2 font
+ //#define GDISP_NEED_TEXT_KERNING GFXON // Not needed for UI2 font
+ //#define GDISP_NEED_UTF8 GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_NEED_BUTTON TRUE
- #define GWIN_NEED_SLIDER TRUE
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_FRAME TRUE
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_NEED_BUTTON GFXON
+ #define GWIN_NEED_SLIDER GFXON
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_FRAME GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
- #define GQUEUE_NEED_ASYNC TRUE
+#define GFX_USE_GQUEUE GFXON
+ #define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
- #define GINPUT_NEED_MOUSE TRUE
+#define GFX_USE_GINPUT GFXON
+ #define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/gl3d-gears/gfxconf.h b/demos/modules/gwin/gl3d-gears/gfxconf.h
index d0375a19..b1a48ca5 100644
--- a/demos/modules/gwin/gl3d-gears/gfxconf.h
+++ b/demos/modules/gwin/gl3d-gears/gfxconf.h
@@ -31,21 +31,21 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_GL3D TRUE
+#define GWIN_NEED_GL3D GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/gl3d-spin/gfxconf.h b/demos/modules/gwin/gl3d-spin/gfxconf.h
index d0375a19..b1a48ca5 100644
--- a/demos/modules/gwin/gl3d-spin/gfxconf.h
+++ b/demos/modules/gwin/gl3d-spin/gfxconf.h
@@ -31,21 +31,21 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_GL3D TRUE
+#define GWIN_NEED_GL3D GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/graph/gfxconf.h b/demos/modules/gwin/graph/gfxconf.h
index 3fc8fde1..c2ec7963 100644
--- a/demos/modules/gwin/graph/gfxconf.h
+++ b/demos/modules/gwin/graph/gfxconf.h
@@ -31,32 +31,32 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GMISC TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GMISC GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GQUEUE GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_GRAPH TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_GRAPH GFXON
/* Features for the GQUEUE subsystem. */
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
/* Features for the GMISC subsystem. */
-#define GMISC_NEED_FASTTRIG TRUE
+#define GMISC_NEED_FASTTRIG GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/imagebox/gfxconf.h b/demos/modules/gwin/imagebox/gfxconf.h
index d068141a..e186e140 100644
--- a/demos/modules/gwin/imagebox/gfxconf.h
+++ b/demos/modules/gwin/imagebox/gfxconf.h
@@ -19,72 +19,72 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-//#define GDISP_NEED_AUTOFLUSH FALSE
-//#define GDISP_NEED_TIMERFLUSH FALSE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
+//#define GDISP_NEED_AUTOFLUSH GFXOFF
+//#define GDISP_NEED_TIMERFLUSH GFXOFF
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
-#define GDISP_NEED_IMAGE TRUE
- #define GDISP_NEED_IMAGE_GIF TRUE
- #define GDISP_NEED_IMAGE_BMP TRUE
- #define GDISP_NEED_IMAGE_BMP_24 TRUE
+#define GDISP_NEED_IMAGE GFXON
+ #define GDISP_NEED_IMAGE_GIF GFXON
+ #define GDISP_NEED_IMAGE_BMP GFXON
+ #define GDISP_NEED_IMAGE_BMP_24 GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_IMAGE TRUE
- #define GWIN_NEED_IMAGE_ANIMATION TRUE
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_IMAGE GFXON
+ #define GWIN_NEED_IMAGE_ANIMATION GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
-#define GQUEUE_NEED_ASYNC TRUE
+#define GFX_USE_GQUEUE GFXON
+#define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GFILE GFXON
-#define GFILE_NEED_ROMFS TRUE
+#define GFILE_NEED_ROMFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/keyboard/gfxconf.h b/demos/modules/gwin/keyboard/gfxconf.h
index bfae0e7c..79d443dc 100644
--- a/demos/modules/gwin/keyboard/gfxconf.h
+++ b/demos/modules/gwin/keyboard/gfxconf.h
@@ -19,37 +19,37 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-//#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+//#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
-//#define GDISP_NEED_CONTROL TRUE
+//#define GDISP_NEED_CONTROL GFXON
//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_MULTITHREAD GFXON
-#define GFX_USE_GWIN TRUE
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_KEYBOARD TRUE
+#define GFX_USE_GWIN GFXON
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_KEYBOARD GFXON
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
-#define GFX_USE_GQUEUE TRUE
-#define GQUEUE_NEED_ASYNC TRUE
+#define GFX_USE_GQUEUE GFXON
+#define GQUEUE_NEED_ASYNC GFXON
-#define GFX_USE_GINPUT TRUE
-#define GINPUT_NEED_MOUSE TRUE
-//#define GINPUT_NEED_KEYBOARD TRUE
+#define GFX_USE_GINPUT GFXON
+#define GINPUT_NEED_MOUSE GFXON
+//#define GINPUT_NEED_KEYBOARD GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/label/gfxconf.h b/demos/modules/gwin/label/gfxconf.h
index 568ea4fe..c84992f1 100644
--- a/demos/modules/gwin/label/gfxconf.h
+++ b/demos/modules/gwin/label/gfxconf.h
@@ -19,59 +19,59 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-//#define GDISP_NEED_AUTOFLUSH FALSE
-//#define GDISP_NEED_TIMERFLUSH FALSE
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_NEED_ANTIALIAS TRUE
- #define GDISP_NEED_UTF8 TRUE
- #define GDISP_NEED_TEXT_KERNING TRUE
- #define GDISP_INCLUDE_FONT_DEJAVUSANS12 TRUE
+//#define GDISP_NEED_AUTOFLUSH GFXOFF
+//#define GDISP_NEED_TIMERFLUSH GFXOFF
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_NEED_ANTIALIAS GFXON
+ #define GDISP_NEED_UTF8 GFXON
+ #define GDISP_NEED_TEXT_KERNING GFXON
+ #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_LABEL_ATTRIBUTE TRUE
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_LABEL_ATTRIBUTE GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h
index 0e6d6d11..6ace3daa 100644
--- a/demos/modules/gwin/list/gfxconf.h
+++ b/demos/modules/gwin/list/gfxconf.h
@@ -17,77 +17,77 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_IMAGE TRUE
- #define GDISP_NEED_IMAGE_GIF TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_IMAGE GFXON
+ #define GDISP_NEED_IMAGE_GIF GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_NEED_LIST TRUE
- #define GWIN_NEED_LIST_IMAGES FALSE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_NEED_LIST GFXON
+ #define GWIN_NEED_LIST_IMAGES GFXOFF
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE FALSE
+#define GFX_USE_GQUEUE GFXOFF
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
-#define GINPUT_NEED_MOUSE TRUE
+#define GFX_USE_GINPUT GFXON
+#define GINPUT_NEED_MOUSE GFXON
///////////////////////////////////////////////////////////////////////////
// GADC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GADC FALSE
+#define GFX_USE_GADC GFXOFF
///////////////////////////////////////////////////////////////////////////
// GAUDIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GAUDIN FALSE
+#define GFX_USE_GAUDIN GFXOFF
///////////////////////////////////////////////////////////////////////////
// GAUDOUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GAUDOUT FALSE
+#define GFX_USE_GAUDOUT GFXOFF
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GMISC FALSE
+#define GFX_USE_GMISC GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/progressbar/gfxconf.h b/demos/modules/gwin/progressbar/gfxconf.h
index 6af70faf..04ce034d 100644
--- a/demos/modules/gwin/progressbar/gfxconf.h
+++ b/demos/modules/gwin/progressbar/gfxconf.h
@@ -29,64 +29,64 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_ELLIPSE FALSE
-#define GDISP_NEED_ARC FALSE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_PIXELREAD FALSE
-#define GDISP_NEED_CONTROL FALSE
-#define GDISP_NEED_IMAGE TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_ASYNC FALSE
-#define GDISP_NEED_MSGAPI FALSE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_ELLIPSE GFXOFF
+#define GDISP_NEED_ARC GFXOFF
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_PIXELREAD GFXOFF
+#define GDISP_NEED_CONTROL GFXOFF
+#define GDISP_NEED_IMAGE GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_ASYNC GFXOFF
+#define GDISP_NEED_MSGAPI GFXOFF
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_NEED_ANTIALIAS FALSE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_NEED_ANTIALIAS GFXOFF
/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_NATIVE FALSE
-#define GDISP_NEED_IMAGE_GIF TRUE
-#define GDISP_NEED_IMAGE_BMP FALSE
-#define GDISP_NEED_IMAGE_JPG FALSE
-#define GDISP_NEED_IMAGE_PNG FALSE
+#define GDISP_NEED_IMAGE_NATIVE GFXOFF
+#define GDISP_NEED_IMAGE_GIF GFXON
+#define GDISP_NEED_IMAGE_BMP GFXOFF
+#define GDISP_NEED_IMAGE_JPG GFXOFF
+#define GDISP_NEED_IMAGE_PNG GFXOFF
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_CONSOLE FALSE
-#define GWIN_NEED_GRAPH FALSE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_BUTTON FALSE
-#define GWIN_NEED_SLIDER FALSE
-#define GWIN_NEED_CHECKBOX FALSE
-#define GWIN_NEED_LABEL FALSE
-#define GWIN_NEED_IMAGE FALSE
-#define GWIN_NEED_RADIO FALSE
-#define GWIN_NEED_LIST FALSE
-#define GWIN_NEED_IMAGE_ANIMATION FALSE
-#define GWIN_NEED_LIST_IMAGES FALSE
-#define GWIN_NEED_PROGRESSBAR TRUE
-#define GWIN_PROGRESSBAR_AUTO TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_CONSOLE GFXOFF
+#define GWIN_NEED_GRAPH GFXOFF
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_BUTTON GFXOFF
+#define GWIN_NEED_SLIDER GFXOFF
+#define GWIN_NEED_CHECKBOX GFXOFF
+#define GWIN_NEED_LABEL GFXOFF
+#define GWIN_NEED_IMAGE GFXOFF
+#define GWIN_NEED_RADIO GFXOFF
+#define GWIN_NEED_LIST GFXOFF
+#define GWIN_NEED_IMAGE_ANIMATION GFXOFF
+#define GWIN_NEED_LIST_IMAGES GFXOFF
+#define GWIN_NEED_PROGRESSBAR GFXON
+#define GWIN_PROGRESSBAR_AUTO GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_NEED_TOGGLE FALSE
-#define GINPUT_NEED_DIAL FALSE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_NEED_TOGGLE GFXOFF
+#define GINPUT_NEED_DIAL GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/radio/gfxconf.h b/demos/modules/gwin/radio/gfxconf.h
index 7c3e441e..3c5c64a5 100644
--- a/demos/modules/gwin/radio/gfxconf.h
+++ b/demos/modules/gwin/radio/gfxconf.h
@@ -31,34 +31,34 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_TEXT TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_TEXT GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_RADIO TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_RADIO GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/slider/gfxconf.h b/demos/modules/gwin/slider/gfxconf.h
index 9d55d29f..367a87f5 100644
--- a/demos/modules/gwin/slider/gfxconf.h
+++ b/demos/modules/gwin/slider/gfxconf.h
@@ -31,40 +31,40 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GQUEUE GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_SLIDER TRUE
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_SLIDER GFXON
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* Features for the GQUEUE subsystem. */
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/tabset/gfxconf.h b/demos/modules/gwin/tabset/gfxconf.h
index 72d257f1..916b9ffd 100644
--- a/demos/modules/gwin/tabset/gfxconf.h
+++ b/demos/modules/gwin/tabset/gfxconf.h
@@ -17,80 +17,80 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
+#define GFX_USE_GWIN GFXON
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
- #define GWIN_NEED_TABSET TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
+ #define GWIN_NEED_TABSET GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
-#define GQUEUE_NEED_GSYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
+#define GQUEUE_NEED_GSYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
-#define GINPUT_NEED_MOUSE TRUE
+#define GFX_USE_GINPUT GFXON
+#define GINPUT_NEED_MOUSE GFXON
///////////////////////////////////////////////////////////////////////////
// GADC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GADC FALSE
+#define GFX_USE_GADC GFXOFF
///////////////////////////////////////////////////////////////////////////
// GAUDIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GAUDIN FALSE
+#define GFX_USE_GAUDIN GFXOFF
///////////////////////////////////////////////////////////////////////////
// GAUDOUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GAUDOUT FALSE
+#define GFX_USE_GAUDOUT GFXOFF
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GMISC FALSE
+#define GFX_USE_GMISC GFXOFF
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/textedit/gfxconf.h b/demos/modules/gwin/textedit/gfxconf.h
index 263ae035..482b9e94 100644
--- a/demos/modules/gwin/textedit/gfxconf.h
+++ b/demos/modules/gwin/textedit/gfxconf.h
@@ -31,46 +31,46 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_TEXT_KERNING TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_TEXT_KERNING GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_TEXTEDIT TRUE
-#define GWIN_NEED_BUTTON TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_NEED_TEXTEDIT GFXON
+#define GWIN_NEED_BUTTON GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* One or both of these */
-//#define GINPUT_NEED_KEYBOARD TRUE
-#define GWIN_NEED_KEYBOARD TRUE
+//#define GINPUT_NEED_KEYBOARD GFXON
+#define GWIN_NEED_KEYBOARD GFXON
/* Features for the GQUEUE subsystem. */
-#define GFX_USE_GQUEUE TRUE
-#define GQUEUE_NEED_ASYNC TRUE
+#define GFX_USE_GQUEUE GFXON
+#define GQUEUE_NEED_ASYNC GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h b/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h
index 05790758..37a83c89 100644
--- a/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h
+++ b/demos/modules/gwin/textedit_virtual_keyboard/gfxconf.h
@@ -31,46 +31,46 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GINPUT TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GINPUT GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_TEXT_KERNING TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_TEXT_KERNING GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-#define GDISP_INCLUDE_FONT_DEJAVUSANS16 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
+#define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXON
/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_NEED_TEXTEDIT TRUE
-#define GWIN_NEED_BUTTON TRUE
+#define GWIN_NEED_WINDOWMANAGER GFXON
+#define GWIN_NEED_WIDGET GFXON
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_NEED_TEXTEDIT GFXON
+#define GWIN_NEED_BUTTON GFXON
/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* One or both of these */
-#define GINPUT_NEED_KEYBOARD FALSE
-#define GWIN_NEED_KEYBOARD TRUE
+#define GINPUT_NEED_KEYBOARD GFXOFF
+#define GWIN_NEED_KEYBOARD GFXON
/* Features for the GQUEUE subsystem. */
-#define GFX_USE_GQUEUE TRUE
-#define GQUEUE_NEED_ASYNC TRUE
+#define GFX_USE_GQUEUE GFXON
+#define GQUEUE_NEED_ASYNC GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index 4ba2c21d..79ef8795 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -19,100 +19,100 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS TRUE
-//#define GFX_USE_OS_WIN32 TRUE
-//#define GFX_USE_OS_LINUX TRUE
-//#define GFX_USE_OS_OSX TRUE
+//#define GFX_USE_OS_CHIBIOS GFXON
+//#define GFX_USE_OS_WIN32 GFXON
+//#define GFX_USE_OS_LINUX GFXON
+//#define GFX_USE_OS_OSX GFXON
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GDISP TRUE
+#define GFX_USE_GDISP GFXON
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_CIRCLE TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-//#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_TEXT TRUE
- #define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_CIRCLE GFXON
+#define GDISP_NEED_CONVEX_POLYGON GFXON
+//#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_TEXT GFXON
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
-#define GDISP_NEED_IMAGE TRUE
- #define GDISP_NEED_IMAGE_GIF TRUE
+#define GDISP_NEED_IMAGE GFXON
+ #define GDISP_NEED_IMAGE_GIF GFXON
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_MULTITHREAD GFXON
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GWIN TRUE
-
-#define GWIN_NEED_WINDOWMANAGER TRUE
- #define GWIN_NEED_FLASHING TRUE
-
-#define GWIN_NEED_CONSOLE TRUE
- #define GWIN_CONSOLE_USE_HISTORY TRUE
- #define GWIN_CONSOLE_HISTORY_AVERAGING TRUE
- #define GWIN_CONSOLE_HISTORY_ATCREATE TRUE
-#define GWIN_NEED_GRAPH TRUE
-
-#define GWIN_NEED_WIDGET TRUE
- #define GWIN_NEED_LABEL TRUE
- #define GWIN_LABEL_ATTRIBUTE TRUE
- #define GWIN_NEED_BUTTON TRUE
-// #define GWIN_BUTTON_LAZY_RELEASE TRUE
- #define GWIN_NEED_SLIDER TRUE
- #define GWIN_NEED_CHECKBOX TRUE
- #define GWIN_NEED_IMAGE TRUE
- #define GWIN_NEED_RADIO TRUE
- #define GWIN_NEED_LIST TRUE
- #define GWIN_NEED_LIST_IMAGES TRUE
- #define GWIN_NEED_PROGRESSBAR TRUE
- #define GWIN_PROGRESSBAR_AUTO TRUE
-
-#define GWIN_NEED_CONTAINERS TRUE
- #define GWIN_NEED_CONTAINER TRUE
-
-#define GWIN_NEED_TABSET TRUE
+#define GFX_USE_GWIN GFXON
+
+#define GWIN_NEED_WINDOWMANAGER GFXON
+ #define GWIN_NEED_FLASHING GFXON
+
+#define GWIN_NEED_CONSOLE GFXON
+ #define GWIN_CONSOLE_USE_HISTORY GFXON
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXON
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXON
+#define GWIN_NEED_GRAPH GFXON
+
+#define GWIN_NEED_WIDGET GFXON
+ #define GWIN_NEED_LABEL GFXON
+ #define GWIN_LABEL_ATTRIBUTE GFXON
+ #define GWIN_NEED_BUTTON GFXON
+// #define GWIN_BUTTON_LAZY_RELEASE GFXON
+ #define GWIN_NEED_SLIDER GFXON
+ #define GWIN_NEED_CHECKBOX GFXON
+ #define GWIN_NEED_IMAGE GFXON
+ #define GWIN_NEED_RADIO GFXON
+ #define GWIN_NEED_LIST GFXON
+ #define GWIN_NEED_LIST_IMAGES GFXON
+ #define GWIN_NEED_PROGRESSBAR GFXON
+ #define GWIN_PROGRESSBAR_AUTO GFXON
+
+#define GWIN_NEED_CONTAINERS GFXON
+ #define GWIN_NEED_CONTAINER GFXON
+
+#define GWIN_NEED_TABSET GFXON
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GEVENT TRUE
+#define GFX_USE_GEVENT GFXON
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GTIMER TRUE
+#define GFX_USE_GTIMER GFXON
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GQUEUE TRUE
+#define GFX_USE_GQUEUE GFXON
-#define GQUEUE_NEED_ASYNC TRUE
+#define GQUEUE_NEED_ASYNC GFXON
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GINPUT GFXON
-#define GINPUT_NEED_MOUSE TRUE
-//#define GINPUT_NEED_TOGGLE TRUE
-//#define GINPUT_NEED_DIAL TRUE
+#define GINPUT_NEED_MOUSE GFXON
+//#define GINPUT_NEED_TOGGLE GFXON
+//#define GINPUT_NEED_DIAL GFXON
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-#define GFX_USE_GFILE TRUE
+#define GFX_USE_GFILE GFXON
-#define GFILE_NEED_PRINTG TRUE
-#define GFILE_NEED_STRINGS TRUE
+#define GFILE_NEED_PRINTG GFXON
+#define GFILE_NEED_STRINGS GFXON
-#define GFILE_NEED_ROMFS TRUE
-//#define GFILE_NEED_NATIVEFS TRUE
+#define GFILE_NEED_ROMFS GFXON
+//#define GFILE_NEED_NATIVEFS GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_calibration_grabber/gfxconf.h b/demos/tools/touch_calibration_grabber/gfxconf.h
index c073a5d3..b21ffad4 100644
--- a/demos/tools/touch_calibration_grabber/gfxconf.h
+++ b/demos/tools/touch_calibration_grabber/gfxconf.h
@@ -31,32 +31,32 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
-#define GWIN_CONSOLE_USE_FLOAT TRUE
+#define GWIN_NEED_CONSOLE GFXON
+#define GWIN_CONSOLE_USE_FLOAT GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_driver_test/gfxconf.h b/demos/tools/touch_driver_test/gfxconf.h
index 3d93a138..dd278222 100644
--- a/demos/tools/touch_driver_test/gfxconf.h
+++ b/demos/tools/touch_driver_test/gfxconf.h
@@ -31,32 +31,32 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_TOUCH_STARTRAW TRUE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_TOUCH_STARTRAW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/touch_raw_readings/gfxconf.h b/demos/tools/touch_raw_readings/gfxconf.h
index 3d93a138..dd278222 100644
--- a/demos/tools/touch_raw_readings/gfxconf.h
+++ b/demos/tools/touch_raw_readings/gfxconf.h
@@ -31,32 +31,32 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GWIN TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GWIN GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_CLIP TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_MULTITHREAD TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_CLIP GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_MULTITHREAD GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GWIN sub-system. */
-#define GWIN_NEED_CONSOLE TRUE
+#define GWIN_NEED_CONSOLE GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
-#define GINPUT_TOUCH_STARTRAW TRUE
+#define GINPUT_NEED_MOUSE GFXON
+#define GINPUT_TOUCH_STARTRAW GFXON
#endif /* _GFXCONF_H */
diff --git a/demos/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h
index 4df44bc4..4cbe4981 100644
--- a/demos/tools/uGFXnetDisplay/gfxconf.h
+++ b/demos/tools/uGFXnetDisplay/gfxconf.h
@@ -9,30 +9,30 @@
#define _GFXCONF_H
/* The operating system to use. One of these must be defined - preferably in your Makefile */
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
/* GFX sub-systems to turn on */
-#define GFX_USE_GDISP TRUE
-#define GFX_USE_GEVENT TRUE
-#define GFX_USE_GTIMER TRUE
-#define GFX_USE_GINPUT TRUE
+#define GFX_USE_GDISP GFXON
+#define GFX_USE_GEVENT GFXON
+#define GFX_USE_GTIMER GFXON
+#define GFX_USE_GINPUT GFXON
/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION TRUE
-#define GDISP_NEED_TEXT TRUE
-#define GDISP_NEED_CONTROL TRUE
-#define GDISP_NEED_SCROLL TRUE
-#define GDISP_NEED_PIXELREAD TRUE
-#define GDISP_NEED_STREAMING TRUE
+#define GDISP_NEED_VALIDATION GFXON
+#define GDISP_NEED_TEXT GFXON
+#define GDISP_NEED_CONTROL GFXON
+#define GDISP_NEED_SCROLL GFXON
+#define GDISP_NEED_PIXELREAD GFXON
+#define GDISP_NEED_STREAMING GFXON
/* Builtin Fonts */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
+#define GDISP_INCLUDE_FONT_UI2 GFXON
/* Features for the GINPUT sub-system. */
-#define GINPUT_NEED_MOUSE TRUE
+#define GINPUT_NEED_MOUSE GFXON
/* We need to use this specific pixel format to match the network protocol */
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/demos/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c
index 26ae4b89..69703825 100644
--- a/demos/tools/uGFXnetDisplay/main.c
+++ b/demos/tools/uGFXnetDisplay/main.c
@@ -20,14 +20,14 @@
// Do we wish to use old style socket calls. Some socket libraries only support the old version.
// It is better to use the new version where possible however as it also supports IPv6.
#ifndef OLD_STYLE_SOCKETS
- #define OLD_STYLE_SOCKETS FALSE
+ #define OLD_STYLE_SOCKETS GFXOFF
#endif
// Which operating systems support a command line
#if defined(WIN32) || GFX_USE_OS_WIN32 || GFX_USE_OS_OSX || GFX_USE_OS_LINUX
- #define EMBEDED_OS FALSE
+ #define EMBEDED_OS GFXOFF
#else
- #define EMBEDED_OS TRUE
+ #define EMBEDED_OS GFXON
#endif
#if GNETCODE_VERSION != GNETCODE_VERSION_1_0
@@ -103,7 +103,7 @@
COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.")
#endif
#undef GDISP_GFXNET_UNSAFE_SOCKETS
- #define GDISP_GFXNET_UNSAFE_SOCKETS TRUE
+ #define GDISP_GFXNET_UNSAFE_SOCKETS GFXON
#endif
#endif
diff --git a/docs/src/containers.dox b/docs/src/containers.dox
index 5a397420..f9a834f4 100644
--- a/docs/src/containers.dox
+++ b/docs/src/containers.dox
@@ -21,5 +21,5 @@
*
* For the common window API, please see @ref Container.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
*/
diff --git a/docs/src/widgets.dox b/docs/src/widgets.dox
index b3e827e5..1305a6f9 100644
--- a/docs/src/widgets.dox
+++ b/docs/src/widgets.dox
@@ -28,5 +28,5 @@
*
* For the common window API, please see @ref Widget.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
*/
diff --git a/docs/src/windows.dox b/docs/src/windows.dox
index 63c25f3a..b72c27a1 100644
--- a/docs/src/windows.dox
+++ b/docs/src/windows.dox
@@ -31,5 +31,5 @@
*
* For the common window API, please see @ref Window.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
*/
diff --git a/drivers/gadc/AT91SAM7/gadc_lld_config.h b/drivers/gadc/AT91SAM7/gadc_lld_config.h
index de5af3d3..8e477877 100644
--- a/drivers/gadc/AT91SAM7/gadc_lld_config.h
+++ b/drivers/gadc/AT91SAM7/gadc_lld_config.h
@@ -25,7 +25,7 @@
/**
* @brief ChibiOS has a nasty bug in its _adc_isr_full_code() routine (defined in adc.h as a macro).
* Do we have the version of ChibiOS with this bug.
- * @detail Set to TRUE if ChibiOS has this bug.
+ * @detail Set to GFXON if ChibiOS has this bug.
* @note Fixed in ChibiOS 2.4.4stable and 2.5.2unstable (and the repository from 18th Feb 2013)
* @note This bug prevents us re-calling adcStartConversionI() from with the ISR even though
* it is clearly designed to handle it. For some reason (on this micro) the high speed timer
@@ -35,7 +35,7 @@
* @note For the AT91SAM7 ADC driver, it post-dates the finding of the bug so we safely
* say that the bug doesn't exist for this driver.
*/
-#define CHIBIOS_ADC_ISR_FULL_CODE_BUG FALSE
+#define CHIBIOS_ADC_ISR_FULL_CODE_BUG GFXOFF
/**
* @brief The maximum sample frequency supported by this CPU
diff --git a/drivers/gaudio/Win32/gaudio_play_config.h b/drivers/gaudio/Win32/gaudio_play_config.h
index c4830010..03156500 100644
--- a/drivers/gaudio/Win32/gaudio_play_config.h
+++ b/drivers/gaudio/Win32/gaudio_play_config.h
@@ -19,8 +19,8 @@
#define GAUDIO_PLAY_FORMAT1 ARRAY_DATA_16BITSIGNED
#define GAUDIO_PLAY_FORMAT2 ARRAY_DATA_8BITUNSIGNED
#define GAUDIO_PLAY_NUM_CHANNELS 2
-#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE
-#define GAUDIO_PLAY_CHANNEL1_IS_STEREO TRUE
+#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF
+#define GAUDIO_PLAY_CHANNEL1_IS_STEREO GFXON
#define GAUDIO_PLAY_MONO 0
#define GAUDIO_PLAY_STEREO 1
diff --git a/drivers/gaudio/Win32/gaudio_record_config.h b/drivers/gaudio/Win32/gaudio_record_config.h
index 5897212b..565fb3bb 100644
--- a/drivers/gaudio/Win32/gaudio_record_config.h
+++ b/drivers/gaudio/Win32/gaudio_record_config.h
@@ -19,8 +19,8 @@
#define GAUDIO_RECORD_FORMAT1 ARRAY_DATA_16BITSIGNED
#define GAUDIO_RECORD_FORMAT2 ARRAY_DATA_8BITUNSIGNED
#define GAUDIO_RECORD_NUM_CHANNELS 2
-#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE
-#define GAUDIO_RECORD_CHANNEL1_IS_STEREO TRUE
+#define GAUDIO_RECORD_CHANNEL0_IS_STEREO GFXOFF
+#define GAUDIO_RECORD_CHANNEL1_IS_STEREO GFXON
#define GAUDIO_RECORD_MONO 0
#define GAUDIO_RECORD_STEREO 1
diff --git a/drivers/gaudio/gadc/gaudio_record_board_template.h b/drivers/gaudio/gadc/gaudio_record_board_template.h
index 42c15205..74e5b698 100644
--- a/drivers/gaudio/gadc/gaudio_record_board_template.h
+++ b/drivers/gaudio/gadc/gaudio_record_board_template.h
@@ -14,7 +14,7 @@
#define GAUDIO_RECORD_NUM_CHANNELS 1
-#define GAUDIO_RECORD_CHANNEL0_IS_STEREO FALSE
+#define GAUDIO_RECORD_CHANNEL0_IS_STEREO GFXOFF
#define GAUDIO_RECORD_MICROPHONE 0
diff --git a/drivers/gaudio/gadc/gaudio_record_gadc.c b/drivers/gaudio/gadc/gaudio_record_gadc.c
index a35d070b..c894c84b 100644
--- a/drivers/gaudio/gadc/gaudio_record_gadc.c
+++ b/drivers/gaudio/gadc/gaudio_record_gadc.c
@@ -12,7 +12,7 @@
/* Double check the GADC system is turned on */
#if !GFX_USE_GADC
- #error "GAUDIO - The GADC driver for GAUDIO requires GFX_USE_GADC to be TRUE"
+ #error "GAUDIO - The GADC driver for GAUDIO requires GFX_USE_GADC to be GFXON"
#endif
/* Include the driver defines */
diff --git a/drivers/gaudio/pwm/gaudio_play_config.h b/drivers/gaudio/pwm/gaudio_play_config.h
index 9c65cd11..508b0a65 100644
--- a/drivers/gaudio/pwm/gaudio_play_config.h
+++ b/drivers/gaudio/pwm/gaudio_play_config.h
@@ -26,7 +26,7 @@
#define GAUDIO_PLAY_FORMAT1 ARRAY_DATA_10BITUNSIGNED
#define GAUDIO_PLAY_FORMAT2 ARRAY_DATA_8BITUNSIGNED
#define GAUDIO_PLAY_NUM_CHANNELS 1
-#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE
+#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF
#define GAUDIO_PLAY_MONO 0
#endif /* GFX_USE_GAUDIO && GAUDIO_NEED_PLAY */
diff --git a/drivers/gaudio/vs1053/gaudio_play_config.h b/drivers/gaudio/vs1053/gaudio_play_config.h
index 51a3d273..b0b17a8c 100644
--- a/drivers/gaudio/vs1053/gaudio_play_config.h
+++ b/drivers/gaudio/vs1053/gaudio_play_config.h
@@ -22,7 +22,7 @@
* No testing is made of the file format - if there is an error it can only be detected by the codec chip
* and its behaviour is undefined (we haven't tested).
* Note that some formats require a firmware patch to be installed to play correctly.
- * In this case define VS1053_FIRMWARE_PATCH as TRUE in your gfxconf.h file and include the patch file
+ * In this case define VS1053_FIRMWARE_PATCH as GFXON in your gfxconf.h file and include the patch file
* in your project directory. The patch file MUST be called "vs1053_patch.plg".
*/
#define GAUDIO_PLAY_MAX_SAMPLE_FREQUENCY 48000
@@ -32,8 +32,8 @@
#define GAUDIO_PLAY_FORMAT3 ARRAY_DATA_UNKNOWN
#define GAUDIO_PLAY_FORMAT_FILE ARRAY_DATA_UNKNOWN
#define GAUDIO_PLAY_NUM_CHANNELS 2
-#define GAUDIO_PLAY_CHANNEL0_IS_STEREO FALSE
-#define GAUDIO_PLAY_CHANNEL1_IS_STEREO TRUE
+#define GAUDIO_PLAY_CHANNEL0_IS_STEREO GFXOFF
+#define GAUDIO_PLAY_CHANNEL1_IS_STEREO GFXON
#define GAUDIO_PLAY_MONO 0
#define GAUDIO_PLAY_STEREO 1
diff --git a/drivers/gaudio/vs1053/gaudio_play_vs1053.c b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
index 2aab288c..c96ec036 100644
--- a/drivers/gaudio/vs1053/gaudio_play_vs1053.c
+++ b/drivers/gaudio/vs1053/gaudio_play_vs1053.c
@@ -23,7 +23,7 @@
#define VS1053_CLK 12288000
#endif
#ifndef VS1053_FIRMWARE_PATCH
- #define VS1053_FIRMWARE_PATCH FALSE
+ #define VS1053_FIRMWARE_PATCH GFXOFF
#endif
#ifndef VS1053_POLL_RATE
#define VS1053_POLL_RATE 5
diff --git a/drivers/gaudio/vs1053/readme.txt b/drivers/gaudio/vs1053/readme.txt
index d5d10145..3b0ded50 100644
--- a/drivers/gaudio/vs1053/readme.txt
+++ b/drivers/gaudio/vs1053/readme.txt
@@ -10,5 +10,5 @@ Requires GFX_USE_GTIMER
* No testing is made of the file format - if there is an error it can only be detected by the codec chip
* and its behaviour is undefined (we haven't tested).
* Note that some formats require a firmware patch to be installed to play correctly.
- * In this case define VS1053_FIRMWARE_PATCH as TRUE in your gfxconf.h file and include the patch file
+ * In this case define VS1053_FIRMWARE_PATCH as GFXON in your gfxconf.h file and include the patch file
* in your project directory. The patch file MUST be called "vs1053_patch.plg".
diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h b/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h
index 637f4f4e..e147c159 100644
--- a/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h
+++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h
@@ -10,10 +10,10 @@
#if GFX_USE_GDISP
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
diff --git a/drivers/gdisp/AlteraFramereader/readme.txt b/drivers/gdisp/AlteraFramereader/readme.txt
index 87777be4..d56ee27e 100644
--- a/drivers/gdisp/AlteraFramereader/readme.txt
+++ b/drivers/gdisp/AlteraFramereader/readme.txt
@@ -17,7 +17,7 @@ as swap the framebuffer pointers for the default GDisplay to draw to the other f
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
2. To your makefile add the following lines:
include $(GFXLIB)/gfx.mk
diff --git a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
index 20e2088d..ad261b44 100644
--- a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
+++ b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h
@@ -37,7 +37,7 @@
*
* @note Do a "blinking" clear, i.e. clear to opposite polarity first.
* This reduces the image persistence.<br>
- * #define EINK_BLINKCLEAR TRUE
+ * #define EINK_BLINKCLEAR GFXON
*
* @note Number of passes to use when clearing the display<br>
* #define EINK_CLEARCOUNT 10
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
index cd54155c..8291cdcc 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c
@@ -59,7 +59,7 @@
/* Do a "blinking" clear, i.e. clear to opposite polarity first.
* This reduces the image persistence. */
#ifndef EINK_BLINKCLEAR
- #define EINK_BLINKCLEAR TRUE
+ #define EINK_BLINKCLEAR GFXON
#endif
/* Number of passes to use when clearing the display */
diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_config.h b/drivers/gdisp/ED060SC4/gdisp_lld_config.h
index 47e84779..8b485622 100644
--- a/drivers/gdisp/ED060SC4/gdisp_lld_config.h
+++ b/drivers/gdisp/ED060SC4/gdisp_lld_config.h
@@ -12,10 +12,10 @@
#if GFX_USE_GDISP
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_CLEARS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_CLEARS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/ED060SC4/readme.txt b/drivers/gdisp/ED060SC4/readme.txt
index 852a0010..2cdfbdda 100644
--- a/drivers/gdisp/ED060SC4/readme.txt
+++ b/drivers/gdisp/ED060SC4/readme.txt
@@ -54,7 +54,7 @@ Instead, it uses reverse engineered waveforms that are mostly functional.
The following #defines control the waveforms:
-#define EINK_BLINKCLEAR TRUE // Clear to opposite color first
+#define EINK_BLINKCLEAR GFXON // Clear to opposite color first
#define EINK_CLEARCOUNT 10 // Number of sweeps to clear the display
#define EINK_WRITECOUNT 4 // Number of sweeps when writing to display
diff --git a/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h b/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h
index a8c669c9..ec129abe 100644
--- a/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h
+++ b/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h
@@ -11,7 +11,7 @@
#endif
// Uncomment this if your frame buffer device requires flushing
-//#define GDISP_HARDWARE_FLUSH TRUE
+//#define GDISP_HARDWARE_FLUSH GFXON
#ifdef GDISP_DRIVER_VMT
diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_config.h b/drivers/gdisp/Fb24bpp/gdisp_lld_config.h
index 40798ea9..f6eed742 100644
--- a/drivers/gdisp/Fb24bpp/gdisp_lld_config.h
+++ b/drivers/gdisp/Fb24bpp/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Any other support comes from the board file
#include "board_fb24bpp.h"
diff --git a/drivers/gdisp/Fb24bpp/readme.txt b/drivers/gdisp/Fb24bpp/readme.txt
index 83e7f56b..9c738444 100644
--- a/drivers/gdisp/Fb24bpp/readme.txt
+++ b/drivers/gdisp/Fb24bpp/readme.txt
@@ -1,7 +1,7 @@
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
2. To your makefile add the following lines:
include $(GFXLIB)/gfx.mk
diff --git a/drivers/gdisp/HX8347D/gdisp_lld_config.h b/drivers/gdisp/HX8347D/gdisp_lld_config.h
index 0602ca0e..f1b8cc1f 100644
--- a/drivers/gdisp/HX8347D/gdisp_lld_config.h
+++ b/drivers/gdisp/HX8347D/gdisp_lld_config.h
@@ -14,8 +14,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9225/gdisp_lld_config.h b/drivers/gdisp/ILI9225/gdisp_lld_config.h
index 1bad8632..aaf99a9f 100644
--- a/drivers/gdisp/ILI9225/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9225/gdisp_lld_config.h
@@ -12,10 +12,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_FILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9320/gdisp_lld_config.h b/drivers/gdisp/ILI9320/gdisp_lld_config.h
index 04834079..09e99f0d 100644
--- a/drivers/gdisp/ILI9320/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-//#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+//#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9325/gdisp_lld_config.h b/drivers/gdisp/ILI9325/gdisp_lld_config.h
index 95bd2937..78c1b983 100644
--- a/drivers/gdisp/ILI9325/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9341/gdisp_lld_config.h b/drivers/gdisp/ILI9341/gdisp_lld_config.h
index d3625d70..f5beef27 100644
--- a/drivers/gdisp/ILI9341/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9341/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-//#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+//#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9342/gdisp_lld_config.h b/drivers/gdisp/ILI9342/gdisp_lld_config.h
index 7dfd0627..963940af 100644
--- a/drivers/gdisp/ILI9342/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9342/gdisp_lld_config.h
@@ -14,8 +14,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_config.h b/drivers/gdisp/ILI93xx/gdisp_lld_config.h
index 0fd5ffac..6bd75c73 100644
--- a/drivers/gdisp/ILI93xx/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI93xx/gdisp_lld_config.h
@@ -10,10 +10,10 @@
#if GFX_USE_GDISP
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9481/gdisp_lld_config.h b/drivers/gdisp/ILI9481/gdisp_lld_config.h
index ba48718a..4a9140e4 100644
--- a/drivers/gdisp/ILI9481/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9481/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9488/gdisp_lld_config.h b/drivers/gdisp/ILI9488/gdisp_lld_config.h
index dd128d28..251b28c3 100644
--- a/drivers/gdisp/ILI9488/gdisp_lld_config.h
+++ b/drivers/gdisp/ILI9488/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/KS0108/board_KS0108_example.h b/drivers/gdisp/KS0108/board_KS0108_example.h
index 86541f73..ffc6e9c2 100644
--- a/drivers/gdisp/KS0108/board_KS0108_example.h
+++ b/drivers/gdisp/KS0108/board_KS0108_example.h
@@ -38,11 +38,11 @@
// My Settings
#define GDISP_SCREEN_HEIGHT 64
#define GDISP_SCREEN_WIDTH 128
-#define KS0108_NEED_READ FALSE
-#define KS0108_HAS_RESET FALSE
-#define KS0108_NEED_BACKLIGHT FALSE
-#define KS0108_NEED_PWMBACKLIGHT FALSE
-#define KS0108_NOP_DLY TRUE //doesn't work for me without!
+#define KS0108_NEED_READ GFXOFF
+#define KS0108_HAS_RESET GFXOFF
+#define KS0108_NEED_BACKLIGHT GFXOFF
+#define KS0108_NEED_PWMBACKLIGHT GFXOFF
+#define KS0108_NOP_DLY GFXON //doesn't work for me without!
#define LINE_D0 PAL_LINE(GPIOB, 0U)
#define LINE_D1 PAL_LINE(GPIOB, 1U)
diff --git a/drivers/gdisp/KS0108/gdisp_lld_config.h b/drivers/gdisp/KS0108/gdisp_lld_config.h
index a153e224..6aa50672 100644
--- a/drivers/gdisp/KS0108/gdisp_lld_config.h
+++ b/drivers/gdisp/KS0108/gdisp_lld_config.h
@@ -12,7 +12,7 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
#endif /* _GDISP_LLD_CONFIG_H */
diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_config.h b/drivers/gdisp/LGDP4532/gdisp_lld_config.h
index 3f11ecc3..a8a4014a 100644
--- a/drivers/gdisp/LGDP4532/gdisp_lld_config.h
+++ b/drivers/gdisp/LGDP4532/gdisp_lld_config.h
@@ -10,10 +10,10 @@
#if GFX_USE_GDISP
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
index 3f29f611..424cc43b 100644
--- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h
@@ -14,8 +14,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB444
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
index 8488d732..1eea9e58 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c
@@ -34,7 +34,7 @@
*
* Some of the more modern controllers have a broken command set. If you have one of these
* you will recognise it by the colors being off on anything drawn after an odd (as opposed to
- * even) pixel count area being drawn. If so then set GDISP_GE8_BROKEN_CONTROLLER to TRUE
+ * even) pixel count area being drawn. If so then set GDISP_GE8_BROKEN_CONTROLLER to GFXON
* on your gdisp_lld_board.h file. The price is that streaming calls that are completed
* without exactly the window size write operations and where the number of write operations
* is odd (rather than even), it will draw an extra pixel. If this is important to you, turn on
@@ -67,7 +67,7 @@
// Set parameters if they are not already set
#ifndef GDISP_GE8_BROKEN_CONTROLLER
- #define GDISP_GE8_BROKEN_CONTROLLER TRUE
+ #define GDISP_GE8_BROKEN_CONTROLLER GFXON
#endif
#ifndef GDISP_SCREEN_HEIGHT
#define GDISP_SCREEN_HEIGHT 130
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
index 83b2d629..1735088f 100644
--- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
+++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h
@@ -20,17 +20,17 @@
* define GDISP_NOKIA_ORIENTATION as false in your gfxconf.h.
*/
#ifndef GDISP_NOKIA_ORIENTATION
- #define GDISP_NOKIA_ORIENTATION TRUE
+ #define GDISP_NOKIA_ORIENTATION GFXON
#endif
#if GDISP_NOKIA_ORIENTATION && GDISP_NEED_CONTROL
- #define GDISP_HARDWARE_CONTROL TRUE
- #define GDISP_HARDWARE_DRAWPIXEL TRUE
- #define GDISP_HARDWARE_FILLS TRUE
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_CONTROL GFXON
+ #define GDISP_HARDWARE_DRAWPIXEL GFXON
+ #define GDISP_HARDWARE_FILLS GFXON
+ #define GDISP_HARDWARE_BITFILLS GFXON
#else
- #define GDISP_HARDWARE_CONTROL TRUE
- #define GDISP_HARDWARE_STREAM_WRITE TRUE
+ #define GDISP_HARDWARE_CONTROL GFXON
+ #define GDISP_HARDWARE_STREAM_WRITE GFXON
#endif
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB444
diff --git a/drivers/gdisp/PCD8544/gdisp_lld_config.h b/drivers/gdisp/PCD8544/gdisp_lld_config.h
index 253b2aaf..9771b2ab 100644
--- a/drivers/gdisp/PCD8544/gdisp_lld_config.h
+++ b/drivers/gdisp/PCD8544/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Set this to your frame buffer pixel format.
#ifndef GDISP_LLD_PIXELFORMAT
diff --git a/drivers/gdisp/PCF8812/gdisp_lld_config.h b/drivers/gdisp/PCF8812/gdisp_lld_config.h
index 253b2aaf..9771b2ab 100644
--- a/drivers/gdisp/PCF8812/gdisp_lld_config.h
+++ b/drivers/gdisp/PCF8812/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Set this to your frame buffer pixel format.
#ifndef GDISP_LLD_PIXELFORMAT
diff --git a/drivers/gdisp/QImage/gdisp_lld_config.h b/drivers/gdisp/QImage/gdisp_lld_config.h
index ae97cfcb..4d143bed 100644
--- a/drivers/gdisp/QImage/gdisp_lld_config.h
+++ b/drivers/gdisp/QImage/gdisp_lld_config.h
@@ -13,8 +13,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
diff --git a/drivers/gdisp/R61505U/gdisp_lld_config.h b/drivers/gdisp/R61505U/gdisp_lld_config.h
index 04834079..09e99f0d 100644
--- a/drivers/gdisp/R61505U/gdisp_lld_config.h
+++ b/drivers/gdisp/R61505U/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-//#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+//#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/RA6963/board_RA6963.h b/drivers/gdisp/RA6963/board_RA6963.h
index a7e1426b..6d959775 100755
--- a/drivers/gdisp/RA6963/board_RA6963.h
+++ b/drivers/gdisp/RA6963/board_RA6963.h
@@ -26,11 +26,11 @@
#define _GDISP_LLD_BOARD_H
// My Settings
-#define RA6963_NEED_READ FALSE //works, but is very slow!
-#define RA6963_HAS_RESET FALSE
-#define RA6963_NEED_FONT_SELECT FALSE
-#define RA6963_NEED_BACKLIGHT FALSE
-#define RA6963_NEED_PWMBACKLIGHT FALSE
+#define RA6963_NEED_READ GFXOFF //works, but is very slow!
+#define RA6963_HAS_RESET GFXOFF
+#define RA6963_NEED_FONT_SELECT GFXOFF
+#define RA6963_NEED_BACKLIGHT GFXOFF
+#define RA6963_NEED_PWMBACKLIGHT GFXOFF
#define GDISP_SCREEN_HEIGHT 64
#define GDISP_SCREEN_WIDTH 128
#define GDISP_INITIAL_CONTRAST 50
diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c
index 2a983a65..7cf741d6 100755
--- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c
+++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c
@@ -117,16 +117,16 @@
#define RA6963_TEXT_HOME (RA6963_GRAPHIC_HOME + RA6963_GRAPHIC_SIZE)
//#define RA6963_OFFSET_REGISTER 2
-#if (RA6963_NEED_READ == FALSE)
-#define BUFFSZ (RA6963_GRAPHIC_SIZE)
-#define RAM(g) ((uint8_t *)g->priv)
-#define POS (((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA))
+#if !RA6963_NEED_READ
+ #define BUFFSZ (RA6963_GRAPHIC_SIZE)
+ #define RAM(g) ((uint8_t *)g->priv)
+ #define POS (((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA))
#endif
#ifndef GDISP_INITIAL_CONTRAST
-#define GDISP_INITIAL_CONTRAST 50
+ #define GDISP_INITIAL_CONTRAST 50
#endif
#ifndef GDISP_INITIAL_BACKLIGHT
-#define GDISP_INITIAL_BACKLIGHT 100
+ #define GDISP_INITIAL_BACKLIGHT 100
#endif
@@ -142,11 +142,11 @@
/*===========================================================================*/
LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
-#if (RA6963_NEED_READ == FALSE)
+#if RA6963_NEED_READ
+ g->priv = 0;
+#else
// The private area is the display surface.
g->priv = gfxAlloc(BUFFSZ);
-#else
- g->priv = 0;
#endif
// Initialise the board interface
init_board(g);
@@ -228,10 +228,10 @@ static void set_viewport(GDisplay *g) {
LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
uint8_t temp;
-#if (RA6963_NEED_READ == FALSE)
- temp = RAM(g)[POS];
-#else
+#if RA6963_NEED_READ
temp = read_data(g);
+#else
+ temp = RAM(g)[POS];
#endif
if (g->p.color != White) {
@@ -242,7 +242,7 @@ LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
}
write_data(g, temp);
-#if (RA6963_NEED_READ == FALSE)
+#if !RA6963_NEED_READ
RAM(g)[POS] = temp;
#endif
//write_cmd(g, RA6963_DATA_WRITE_AND_INCREMENT);
diff --git a/drivers/gdisp/RA6963/gdisp_lld_config.h b/drivers/gdisp/RA6963/gdisp_lld_config.h
index 15c81d70..a829f9ff 100755
--- a/drivers/gdisp/RA6963/gdisp_lld_config.h
+++ b/drivers/gdisp/RA6963/gdisp_lld_config.h
@@ -13,12 +13,12 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE FALSE
-#define GDISP_HARDWARE_STREAM_READ FALSE
-#define GDISP_HARDWARE_CONTROL FALSE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXOFF
+#define GDISP_HARDWARE_STREAM_READ GFXOFF
+#define GDISP_HARDWARE_CONTROL GFXOFF
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
-#define GDISP_HARDWARE_FILLS FALSE
+#define GDISP_HARDWARE_FILLS GFXOFF
#endif /* GFX_USE_GDISP */
diff --git a/drivers/gdisp/RA8875/gdisp_lld_config.h b/drivers/gdisp/RA8875/gdisp_lld_config.h
index 03a58afa..1f4e0ac9 100644
--- a/drivers/gdisp/RA8875/gdisp_lld_config.h
+++ b/drivers/gdisp/RA8875/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/S6D1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h
index 03a58afa..1f4e0ac9 100644
--- a/drivers/gdisp/S6D1121/gdisp_lld_config.h
+++ b/drivers/gdisp/S6D1121/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_config.h b/drivers/gdisp/SPFD54124B/gdisp_lld_config.h
index 52ac315b..335d4c70 100644
--- a/drivers/gdisp/SPFD54124B/gdisp_lld_config.h
+++ b/drivers/gdisp/SPFD54124B/gdisp_lld_config.h
@@ -20,8 +20,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/SSD1289/board_SSD1289_template.h b/drivers/gdisp/SSD1289/board_SSD1289_template.h
index 86478c73..bbf8147a 100644
--- a/drivers/gdisp/SSD1289/board_SSD1289_template.h
+++ b/drivers/gdisp/SSD1289/board_SSD1289_template.h
@@ -58,10 +58,10 @@ static GFXINLINE uint16_t read_data(GDisplay *g) {
}
//Optional define if your board interface supports it
-//#define GDISP_USE_DMA TRUE
+//#define GDISP_USE_DMA GFXON
-// Optional define - valid only when GDISP_USE_DMA is TRUE
-//#define GDISP_NO_DMA_FROM_STACK FALSE
+// Optional define - valid only when GDISP_USE_DMA is GFXON
+//#define GDISP_NO_DMA_FROM_STACK GFXOFF
#if defined(GDISP_USE_DMA) && GDISP_USE_DMA
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
index 722a71b3..e88798aa 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
+++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c
@@ -32,10 +32,10 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
#ifndef GDISP_USE_DMA
- #define GDISP_USE_DMA FALSE
+ #define GDISP_USE_DMA GFXOFF
#endif
#ifndef GDISP_NO_DMA_FROM_STACK
- #define GDISP_NO_DMA_FROM_STACK FALSE
+ #define GDISP_NO_DMA_FROM_STACK GFXOFF
#endif
/*===========================================================================*/
diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h
index 4b882df1..3aab39a6 100644
--- a/drivers/gdisp/SSD1289/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h
@@ -14,16 +14,16 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#if defined(GDISP_USE_DMA) && GDISP_USE_DMA
- #define GDISP_HARDWARE_FILLS TRUE
+ #define GDISP_HARDWARE_FILLS GFXON
#if !defined(GDISP_PIXELFORMAT) || GDISP_PIXELFORMAT == 0x2565
// Hardware BitBlts are only supported in native pixel format on this controller
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_BITFILLS GFXON
#endif
#endif
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_config.h b/drivers/gdisp/SSD1306/gdisp_lld_config.h
index 2d8b6602..10cb8a71 100644
--- a/drivers/gdisp/SSD1306/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1306/gdisp_lld_config.h
@@ -14,11 +14,11 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/SSD1306/readme.txt b/drivers/gdisp/SSD1306/readme.txt
index 6f0220be..6454ad22 100644
--- a/drivers/gdisp/SSD1306/readme.txt
+++ b/drivers/gdisp/SSD1306/readme.txt
@@ -10,7 +10,7 @@ Know restictions:
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
diff --git a/drivers/gdisp/SSD1322/board_SSD1322_template.h b/drivers/gdisp/SSD1322/board_SSD1322_template.h
index 11759a95..cb3a4740 100644
--- a/drivers/gdisp/SSD1322/board_SSD1322_template.h
+++ b/drivers/gdisp/SSD1322/board_SSD1322_template.h
@@ -12,7 +12,7 @@
//#define SSD1322_USE_DMA
#ifndef SSD1322_USE_DMA
- #define SSD1322_USE_DMA FALSE
+ #define SSD1322_USE_DMA GFXOFF
#endif
static GFXINLINE void init_board(GDisplay *g) {
diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
index 38c711a8..961c22f0 100644
--- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
+++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c
@@ -33,7 +33,7 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
#ifndef SSD1322_USE_DMA
- #define SSD1322_USE_DMA FALSE
+ #define SSD1322_USE_DMA GFXOFF
#endif
#define SSD1322_ROW_WIDTH (GDISP_SCREEN_WIDTH/2)
diff --git a/drivers/gdisp/SSD1322/gdisp_lld_config.h b/drivers/gdisp/SSD1322/gdisp_lld_config.h
index 8ede4bc6..8b8a9525 100644
--- a/drivers/gdisp/SSD1322/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1322/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY16
diff --git a/drivers/gdisp/SSD1322/readme.txt b/drivers/gdisp/SSD1322/readme.txt
index 571dcd62..29dc6025 100644
--- a/drivers/gdisp/SSD1322/readme.txt
+++ b/drivers/gdisp/SSD1322/readme.txt
@@ -10,7 +10,7 @@ Know restictions:
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
diff --git a/drivers/gdisp/SSD1331/gdisp_lld_config.h b/drivers/gdisp/SSD1331/gdisp_lld_config.h
index dbbb3501..a5eb3f75 100644
--- a/drivers/gdisp/SSD1331/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1331/gdisp_lld_config.h
@@ -15,10 +15,10 @@
/*===========================================================================*/
// This controller supports some optimized drawing routines - but no read (at least with SPI interfacing)
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_SCROLL TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_SCROLL GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// This driver supports 4 pixel formats - pick the one you want.
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/SSD1351/gdisp_lld_config.h b/drivers/gdisp/SSD1351/gdisp_lld_config.h
index def94f44..33edcfd3 100644
--- a/drivers/gdisp/SSD1351/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1351/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-//#define GDISP_HARDWARE_STREAM_READ TRUE
-//#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+//#define GDISP_HARDWARE_STREAM_READ GFXON
+//#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/SSD1848/gdisp_lld_config.h b/drivers/gdisp/SSD1848/gdisp_lld_config.h
index c7e7d906..020d323d 100644
--- a/drivers/gdisp/SSD1848/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1848/gdisp_lld_config.h
@@ -14,12 +14,12 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE /* This controller requires flushing */
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CLEARS TRUE
-#define GDISP_HARDWARE_BITFILLS TRUE
+#define GDISP_HARDWARE_FLUSH GFXON /* This controller requires flushing */
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CLEARS GFXON
+#define GDISP_HARDWARE_BITFILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
index 98436040..35df624f 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
+++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c
@@ -56,7 +56,7 @@ typedef struct LCD_Parameters {
/*===========================================================================*/
#ifndef GDISP_SSD1963_NO_INIT
- #define GDISP_SSD1963_NO_INIT FALSE
+ #define GDISP_SSD1963_NO_INIT GFXOFF
#endif
#ifndef GDISP_INITIAL_CONTRAST
#define GDISP_INITIAL_CONTRAST 50
@@ -154,7 +154,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
/*
* Some displays (e.g. Displaytech) have an on-board setup process which just requires that we don't touch anything for a time after power up.
- * For this type of display define GDISP_SSD1963_NO_INIT as TRUE, and implement an appropriate delay in the board file.
+ * For this type of display define GDISP_SSD1963_NO_INIT as GFXON, and implement an appropriate delay in the board file.
* With such displays we can skip most of the initialisation. We also skip pulsing the reset pin, since it
* will introduce an extra second or so of display to the startup time.
*/
diff --git a/drivers/gdisp/SSD1963/gdisp_lld_config.h b/drivers/gdisp/SSD1963/gdisp_lld_config.h
index 7dfd0627..963940af 100644
--- a/drivers/gdisp/SSD1963/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD1963/gdisp_lld_config.h
@@ -14,8 +14,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/SSD1963/readme.txt b/drivers/gdisp/SSD1963/readme.txt
index 4eda17db..982fb1b6 100644
--- a/drivers/gdisp/SSD1963/readme.txt
+++ b/drivers/gdisp/SSD1963/readme.txt
@@ -2,6 +2,6 @@ SSD1963 driver modified to handle Displaytech INTXXX displays, which self-initia
To use this mode, add:
-#define GDISP_SSD1963_NO_INIT TRUE
+#define GDISP_SSD1963_NO_INIT GFXON
...either in the board-specific header file, or in gfxconf.h
diff --git a/drivers/gdisp/SSD2119/board_SSD2119_template.h b/drivers/gdisp/SSD2119/board_SSD2119_template.h
index 86478c73..bbf8147a 100644
--- a/drivers/gdisp/SSD2119/board_SSD2119_template.h
+++ b/drivers/gdisp/SSD2119/board_SSD2119_template.h
@@ -58,10 +58,10 @@ static GFXINLINE uint16_t read_data(GDisplay *g) {
}
//Optional define if your board interface supports it
-//#define GDISP_USE_DMA TRUE
+//#define GDISP_USE_DMA GFXON
-// Optional define - valid only when GDISP_USE_DMA is TRUE
-//#define GDISP_NO_DMA_FROM_STACK FALSE
+// Optional define - valid only when GDISP_USE_DMA is GFXON
+//#define GDISP_NO_DMA_FROM_STACK GFXOFF
#if defined(GDISP_USE_DMA) && GDISP_USE_DMA
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
index 5ae25b1c..6426f508 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
+++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c
@@ -32,10 +32,10 @@
#define GDISP_INITIAL_BACKLIGHT 100
#endif
#ifndef GDISP_USE_DMA
- #define GDISP_USE_DMA FALSE
+ #define GDISP_USE_DMA GFXOFF
#endif
#ifndef GDISP_NO_DMA_FROM_STACK
- #define GDISP_NO_DMA_FROM_STACK FALSE
+ #define GDISP_NO_DMA_FROM_STACK GFXOFF
#endif
#include "ssd2119.h"
diff --git a/drivers/gdisp/SSD2119/gdisp_lld_config.h b/drivers/gdisp/SSD2119/gdisp_lld_config.h
index 671c7f79..19b040a9 100644
--- a/drivers/gdisp/SSD2119/gdisp_lld_config.h
+++ b/drivers/gdisp/SSD2119/gdisp_lld_config.h
@@ -14,16 +14,16 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_STREAM_READ TRUE
-#define GDISP_HARDWARE_STREAM_POS TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_STREAM_READ GFXON
+#define GDISP_HARDWARE_STREAM_POS GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#if defined(GDISP_USE_DMA) && GDISP_USE_DMA
- #define GDISP_HARDWARE_FILLS TRUE
+ #define GDISP_HARDWARE_FILLS GFXON
#if !defined(GDISP_PIXELFORMAT) || GDISP_PIXELFORMAT == 0x2565
// Hardware BitBlts are only supported in native pixel format on this controller
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_BITFILLS GFXON
#endif
#endif
diff --git a/drivers/gdisp/ST7565/gdisp_lld_config.h b/drivers/gdisp/ST7565/gdisp_lld_config.h
index 48587b9e..4bb291f6 100644
--- a/drivers/gdisp/ST7565/gdisp_lld_config.h
+++ b/drivers/gdisp/ST7565/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c
index c0bf2164..ea1966a5 100644
--- a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c
+++ b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c
@@ -43,19 +43,19 @@
// Define one of supported type, if not defined yet
#if !defined(ST7735_TYPE_R) && !defined(ST7735_TYPE_B)
// It seems all modern boards is 7735R
- #define ST7735_TYPE_R TRUE
+ #define ST7735_TYPE_R GFXON
#endif
// Define one of supported color packing, if not defined yet
#if !defined(ST7735_COLOR_RGB) && !defined(ST7735_COLOR_BRG)
// It seems all modern boards is RGB
- #define ST7735_COLOR_RGB TRUE
+ #define ST7735_COLOR_RGB GFXON
#endif
// Strange boars with shifted coords
#if !defined (ST7735_SHIFTED_COORDS)
- #define ST7735_SHIFTED_COORDS FALSE
+ #define ST7735_SHIFTED_COORDS GFXOFF
#endif
@@ -193,12 +193,12 @@ static const unsigned char
ST7735_NORON , DELAY, // 3: Normal display on, no args, w/delay
10, // 10 ms delay
ST7735_DISPON , DELAY, // 4: Main screen turn on, no args w/delay
- 100
+ 100
}; // 100 ms delay
#endif
-static void execute_cmds (const uint8_t *addr) {
+static void execute_cmds(GDisplay *g, const uint8_t *addr) {
unsigned int cmds = *addr++;
while (cmds--) {
@@ -211,7 +211,7 @@ static void execute_cmds (const uint8_t *addr) {
if (ms) {
ms = *addr++;
gfxSleepMilliseconds(ms==255?500:ms);
- }
+ }
}
}
@@ -231,7 +231,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
// Get the bus for the following initialisation commands
acquire_bus(g);
- execute_cmds (init_cmds);
+ execute_cmds(g, init_cmds);
release_bus(g);
// Finish Init
@@ -252,7 +252,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
static void set_viewport(GDisplay *g) {
write_cmd (g, ST7735_CASET);
- write_data (g, g->p.x+ST7735_COL_SHIFT);
+ write_data (g, g->p.x+ST7735_COL_SHIFT);
write_data (g, g->p.x+g->p.cx-1+ST7735_COL_SHIFT);
write_cmd (g, ST7735_RASET);
write_data (g, g->p.y+ST7735_ROW_SHIFT);
diff --git a/drivers/gdisp/ST7735/gdisp_lld_config.h b/drivers/gdisp/ST7735/gdisp_lld_config.h
index 5c76924e..b910e3d1 100644
--- a/drivers/gdisp/ST7735/gdisp_lld_config.h
+++ b/drivers/gdisp/ST7735/gdisp_lld_config.h
@@ -12,9 +12,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
index 8164c166..5635b27c 100644
--- a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
+++ b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h
@@ -8,7 +8,7 @@
#ifndef _GDISP_LLD_BOARD_H
#define _GDISP_LLD_BOARD_H
-#define ALLOW_2ND_LAYER TRUE
+#define ALLOW_2ND_LAYER GFXON
static const ltdcConfig driverCfg = {
480, 272, // Width, Height (pixels)
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
index 4e232999..4bc231d9 100644
--- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
+++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c
@@ -24,13 +24,13 @@
#endif
#ifndef LTDC_USE_DMA2D
- #define LTDC_USE_DMA2D FALSE
+ #define LTDC_USE_DMA2D GFXOFF
#endif
#ifndef LTDC_NO_CLOCK_INIT
- #define LTDC_NO_CLOCK_INIT FALSE
+ #define LTDC_NO_CLOCK_INIT GFXOFF
#endif
#ifndef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH FALSE
+ #define LTDC_DMA_CACHE_FLUSH GFXOFF
#endif
#include "stm32_ltdc.h"
@@ -40,7 +40,7 @@
#if defined(STM32F7) || defined(STM32F746xx)
#undef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH TRUE
+ #define LTDC_DMA_CACHE_FLUSH GFXON
#endif
#endif
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h
index e5a66bb0..7777a1bc 100644
--- a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h
+++ b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define LTDC_USE_DMA2D TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define LTDC_USE_DMA2D GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Both these pixel formats are supported - pick one.
// RGB565 obviously is faster and uses less RAM but with lower color resolution than RGB888
@@ -38,12 +38,12 @@
#if LTDC_USE_DMA2D
// DMA2D supports accelerated fills
- #define GDISP_HARDWARE_FILLS TRUE
+ #define GDISP_HARDWARE_FILLS GFXON
// Accelerated bitfills are also possible but only for GDISP_ROTATE_0
// and if no color translation is required (for now)
#if !GDISP_NEED_CONTROL && !defined(GDISP_PIXELFORMAT)
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_BITFILLS GFXON
#endif
#endif /* GDISP_USE_DMA2D */
diff --git a/drivers/gdisp/STM32LTDC/readme.txt b/drivers/gdisp/STM32LTDC/readme.txt
index 269d3cfb..dcc17d39 100644
--- a/drivers/gdisp/STM32LTDC/readme.txt
+++ b/drivers/gdisp/STM32LTDC/readme.txt
@@ -1,7 +1,7 @@
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
2. To your makefile add the following lines:
include $(GFXLIB)/gfx.mk
diff --git a/drivers/gdisp/TLS8204/gdisp_lld_config.h b/drivers/gdisp/TLS8204/gdisp_lld_config.h
index 253b2aaf..9771b2ab 100644
--- a/drivers/gdisp/TLS8204/gdisp_lld_config.h
+++ b/drivers/gdisp/TLS8204/gdisp_lld_config.h
@@ -14,10 +14,10 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Set this to your frame buffer pixel format.
#ifndef GDISP_LLD_PIXELFORMAT
diff --git a/drivers/gdisp/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h
index 53111358..02c3d821 100644
--- a/drivers/gdisp/TestStub/gdisp_lld_config.h
+++ b/drivers/gdisp/TestStub/gdisp_lld_config.h
@@ -14,8 +14,8 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/UC1601s/gdisp_lld_config.h b/drivers/gdisp/UC1601s/gdisp_lld_config.h
index 14dc6375..c52cd6a3 100644
--- a/drivers/gdisp/UC1601s/gdisp_lld_config.h
+++ b/drivers/gdisp/UC1601s/gdisp_lld_config.h
@@ -14,11 +14,11 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS FALSE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXOFF
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/UC1610/gdisp_lld_config.h b/drivers/gdisp/UC1610/gdisp_lld_config.h
index 36e37ad5..86402a20 100644
--- a/drivers/gdisp/UC1610/gdisp_lld_config.h
+++ b/drivers/gdisp/UC1610/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY4
diff --git a/drivers/gdisp/UC8173/board_UC8173_template.h b/drivers/gdisp/UC8173/board_UC8173_template.h
index b5fd36fe..4a164e3a 100644
--- a/drivers/gdisp/UC8173/board_UC8173_template.h
+++ b/drivers/gdisp/UC8173/board_UC8173_template.h
@@ -9,11 +9,11 @@
#define _GDISP_LLD_BOARD_H
// Define options for this driver
-#define UC8173_REVERSEAXIS_Y FALSE
-#define UC8173_REVERSEAXIS_X FALSE
-#define UC8173_USE_OTP_LUT FALSE /* Use the LUT in the OTP - untested */
+#define UC8173_REVERSEAXIS_Y GFXOFF
+#define UC8173_REVERSEAXIS_X GFXOFF
+#define UC8173_USE_OTP_LUT GFXOFF /* Use the LUT in the OTP - untested */
#define UC8173_DEFAULT_MODE 0 /* Which entry in the mode table to start with */
-#define UC8173_CAN_READ FALSE /* Reading the controller chip is supported */
+#define UC8173_CAN_READ GFXOFF /* Reading the controller chip is supported */
#define UC8173_VCOM_VOLTAGE -2.80 /* Read this off the sticker on the back of the display or set UC8173_CAN_READ to have the chip read */
#define UC8171_BORDER 0 /* 0 = Hi-Z, 1 = Black, 2 = White */
diff --git a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
index 88e2761e..6b227ccb 100644
--- a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
+++ b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c
@@ -35,19 +35,19 @@ typedef struct UC8173Lut {
/*------------------ Default UC8173 parameters ------------------*/
#ifndef UC8173_REVERSEAXIS_Y
- #define UC8173_REVERSEAXIS_Y FALSE
+ #define UC8173_REVERSEAXIS_Y GFXOFF
#endif
#ifndef UC8173_REVERSEAXIS_X
- #define UC8173_REVERSEAXIS_X FALSE
+ #define UC8173_REVERSEAXIS_X GFXOFF
#endif
#ifndef UC8173_DEFAULT_MODE
#define UC8173_DEFAULT_MODE 0
#endif
#ifndef UC8173_USE_OTP_LUT
- #define UC8173_USE_OTP_LUT FALSE
+ #define UC8173_USE_OTP_LUT GFXOFF
#endif
#ifndef UC8173_CAN_READ
- #define UC8173_CAN_READ FALSE
+ #define UC8173_CAN_READ GFXOFF
#endif
#ifdef UC8173_VCOM_VOLTAGE
#define UC8173_VCOM_VOLTAGEBYTE (((UC8173_VCOM_VOLTAGE) + 0.1)/-0.05)
@@ -56,7 +56,7 @@ typedef struct UC8173Lut {
#define UC8171_BORDER 0 /* 0 = Hi-Z, 1 = Black, 2 = White */
#endif
#ifndef UC8173_INIT_REAL_LUT
- #define UC8173_INIT_REAL_LUT TRUE
+ #define UC8173_INIT_REAL_LUT GFXON
#endif
#define UC8173_HEIGHT 240
#define UC8173_WIDTH 240
@@ -67,7 +67,7 @@ typedef struct UC8173Lut {
#define FB_WIDTH UC8173_WIDTH
#define FB_HEIGHT UC8173_HEIGHT
#define FB_PAGES 1
-#define FB_PIXELORDER_MSB TRUE
+#define FB_PIXELORDER_MSB GFXON
/*------------------ Include Generic FB Code ------------------*/
// This FB is for 1,2 or 4 bits per pixel packed along the x-axis
@@ -242,7 +242,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g)
write_data(g, vc);
}
#else
- #error "UC8173: Either UC8173_VCOM_VOLTAGE or UC8173_VCOM_VOLTAGEBYTE must be defined or UC8173_CAN_READ must be TRUE"
+ #error "UC8173: Either UC8173_VCOM_VOLTAGE or UC8173_VCOM_VOLTAGEBYTE must be defined or UC8173_CAN_READ must be GFXON"
#endif
// Undocumented register - Values from example code
diff --git a/drivers/gdisp/UC8173/gdisp_lld_config.h b/drivers/gdisp/UC8173/gdisp_lld_config.h
index 1d9146a2..4002c225 100644
--- a/drivers/gdisp/UC8173/gdisp_lld_config.h
+++ b/drivers/gdisp/UC8173/gdisp_lld_config.h
@@ -14,11 +14,11 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-//#define GDISP_HARDWARE_PIXELREAD TRUE - not implemented yet
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS FALSE
+#define GDISP_HARDWARE_FLUSH GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+//#define GDISP_HARDWARE_PIXELREAD GFXON - not implemented yet
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXOFF
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
//#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY4
diff --git a/drivers/gdisp/framebuffer/board_framebuffer_template.h b/drivers/gdisp/framebuffer/board_framebuffer_template.h
index 0ee08ef2..3e74e92b 100644
--- a/drivers/gdisp/framebuffer/board_framebuffer_template.h
+++ b/drivers/gdisp/framebuffer/board_framebuffer_template.h
@@ -11,7 +11,7 @@
#endif
// Uncomment this if your frame buffer device requires flushing
-//#define GDISP_HARDWARE_FLUSH TRUE
+//#define GDISP_HARDWARE_FLUSH GFXON
#ifdef GDISP_DRIVER_VMT
diff --git a/drivers/gdisp/framebuffer/gdisp_lld_config.h b/drivers/gdisp/framebuffer/gdisp_lld_config.h
index 08dbbb39..c12fa401 100644
--- a/drivers/gdisp/framebuffer/gdisp_lld_config.h
+++ b/drivers/gdisp/framebuffer/gdisp_lld_config.h
@@ -14,9 +14,9 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
// Any other support comes from the board file
#include "board_framebuffer.h"
diff --git a/drivers/gdisp/framebuffer/readme.txt b/drivers/gdisp/framebuffer/readme.txt
index e13321e4..ead74122 100644
--- a/drivers/gdisp/framebuffer/readme.txt
+++ b/drivers/gdisp/framebuffer/readme.txt
@@ -1,7 +1,7 @@
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
2. To your makefile add the following lines:
include $(GFXLIB)/gfx.mk
diff --git a/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h b/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h
index e10e52f6..28f3e258 100644
--- a/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h
+++ b/drivers/ginput/dial/GADC/ginput_lld_dial_board_template.h
@@ -18,7 +18,7 @@
#define GINPUT_DIAL_NUM_PORTS 1
#define GINPUT_DIAL_DEVICE0 GADC_PHYSDEV_DIAL
#define GINPUT_DIAL_POLL_PERIOD 200
-#define GINPUT_DIAL_CYCLE_POLL FALSE
+#define GINPUT_DIAL_CYCLE_POLL GFXOFF
#endif /* GFX_USE_GINPUT && GINPUT_NEED_DIAL */
diff --git a/drivers/ginput/dial/GADC/readme.txt b/drivers/ginput/dial/GADC/readme.txt
index 25558dbc..5bfce2ec 100644
--- a/drivers/ginput/dial/GADC/readme.txt
+++ b/drivers/ginput/dial/GADC/readme.txt
@@ -1,9 +1,9 @@
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GINPUT TRUE
- #define GINPUT_NEED_DIAL TRUE
- #define GINPUT_NEED_GADC TRUE
+ a) #define GFX_USE_GINPUT GFXON
+ #define GINPUT_NEED_DIAL GFXON
+ #define GINPUT_NEED_GADC GFXON
d) If you are not using a known board then create a ginput_lld_toggle_board.h file
and ensure it is on your include path.
Use the ginput_lld_dial_board_example.h file as a basis.
diff --git a/drivers/ginput/toggle/Pal/readme.txt b/drivers/ginput/toggle/Pal/readme.txt
index 3cc9bcd9..0eeb341d 100644
--- a/drivers/ginput/toggle/Pal/readme.txt
+++ b/drivers/ginput/toggle/Pal/readme.txt
@@ -1,8 +1,8 @@
To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GINPUT TRUE
- #define GINPUT_NEED_TOGGLE TRUE
+ a) #define GFX_USE_GINPUT GFXON
+ #define GINPUT_NEED_TOGGLE GFXON
d) If you are not using a known board then create a ginput_lld_toggle_board.h file
and ensure it is on your include path.
Use the ginput_lld_toggle_board_example.h file as a basis.
diff --git a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h
index 1daa0b1e..fb3a8b52 100644
--- a/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h
+++ b/drivers/ginput/touch/FT5336/gmouse_lld_FT5336_board_template.h
@@ -19,11 +19,11 @@
// How much extra data to allocate at the end of the GMouse structure for the board's use
#define GMOUSE_FT5336_BOARD_DATA_SIZE 0
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5336_SELF_CALIBRATE FALSE
+#define GMOUSE_FT5336_SELF_CALIBRATE GFXOFF
static bool_t init_board(GMouse* m, unsigned instance)
{
diff --git a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
index 9042f893..728fa695 100644
--- a/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
+++ b/drivers/ginput/touch/FT5x06/gmouse_lld_FT5x06_board_template.h
@@ -19,11 +19,11 @@
// How much extra data to allocate at the end of the GMouse structure for the board's use
#define GMOUSE_FT5x06_BOARD_DATA_SIZE 0
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT5x06_SELF_CALIBRATE FALSE
+#define GMOUSE_FT5x06_SELF_CALIBRATE GFXOFF
static bool_t init_board(GMouse* m, unsigned driverinstance) {
}
diff --git a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h
index 7c0b6663..85b54652 100644
--- a/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h
+++ b/drivers/ginput/touch/FT6x06/gmouse_lld_FT6x06_board_template.h
@@ -19,11 +19,11 @@
// How much extra data to allocate at the end of the GMouse structure for the board's use
#define GMOUSE_FT6x06_BOARD_DATA_SIZE 0
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_FT6x06_SELF_CALIBRATE FALSE
+#define GMOUSE_FT6x06_SELF_CALIBRATE GFXOFF
static bool_t init_board(GMouse* m, unsigned driverinstance) {
}
diff --git a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event_board_template.h b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event_board_template.h
index c6bf5a7b..9f3acdd3 100644
--- a/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event_board_template.h
+++ b/drivers/ginput/touch/Linux-Event/gmouse_lld_linux_event_board_template.h
@@ -21,12 +21,12 @@
// The linux device input used for touchscreen
#define GMOUSE_LINUX_EVENT_DEVICE "/dev/input/event0"
-// Set this to TRUE if you want self-calibration.
+// Set this to GFXON if you want self-calibration.
// NOTE: This is not as accurate as real calibration.
// It requires the orientation of the touch panel to match the display.
// It requires the active area of the touch panel to exactly match the display size.
-#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE FALSE
+#define GMOUSE_LINUX_EVENT_SELF_CALIBRATE GFXOFF
-#define GMOUSE_LINUX_EVENT_FINGERMODE TRUE
+#define GMOUSE_LINUX_EVENT_FINGERMODE GFXON
#endif /* _GINPUT_LLD_MOUSE_BOARD_H */
diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
index 2eb8f429..896074b9 100644
--- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
+++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610.c
@@ -20,13 +20,13 @@
// Extra settings for the users gfxconf.h file. See readme.txt
#ifndef GMOUSE_STMPE610_SELF_CALIBRATE
- #define GMOUSE_STMPE610_SELF_CALIBRATE FALSE
+ #define GMOUSE_STMPE610_SELF_CALIBRATE GFXOFF
#endif
#ifndef GMOUSE_STMPE610_READ_PRESSURE
- #define GMOUSE_STMPE610_READ_PRESSURE FALSE
+ #define GMOUSE_STMPE610_READ_PRESSURE GFXOFF
#endif
#ifndef GMOUSE_STMPE610_TEST_MODE
- #define GMOUSE_STMPE610_TEST_MODE FALSE
+ #define GMOUSE_STMPE610_TEST_MODE GFXOFF
#endif
/**
diff --git a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
index f426176d..14917e53 100644
--- a/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
+++ b/drivers/ginput/touch/STMPE610/gmouse_lld_STMPE610_board_template.h
@@ -20,18 +20,18 @@
#define GMOUSE_STMPE610_BOARD_DATA_SIZE 0
// Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE610_READ_PRESSURE FALSE
-//#define GMOUSE_STMPE610_SELF_CALIBRATE FALSE
-//#define GMOUSE_STMPE610_TEST_MODE FALSE
+//#define GMOUSE_STMPE610_READ_PRESSURE GFXOFF
+//#define GMOUSE_STMPE610_SELF_CALIBRATE GFXOFF
+//#define GMOUSE_STMPE610_TEST_MODE GFXOFF
-// If TRUE this board has the STMPE610 IRQ pin connected to a GPIO.
-// Note: For tested hardware this is unreliable and should be set to FALSE until tested.
+// If GFXON this board has the STMPE610 IRQ pin connected to a GPIO.
+// Note: For tested hardware this is unreliable and should be set to GFXOFF until tested.
// Symptoms are that mouse readings just appear to stop for a bit. Lifting the touch
// and re-applying the touch cause readings to start again.
-#define GMOUSE_STMPE610_GPIO_IRQPIN FALSE
+#define GMOUSE_STMPE610_GPIO_IRQPIN GFXOFF
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE610_SLOW_CPU FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE610_SLOW_CPU GFXOFF
static bool_t init_board(GMouse* m, unsigned driverinstance) {
}
diff --git a/drivers/ginput/touch/STMPE610/readme.txt b/drivers/ginput/touch/STMPE610/readme.txt
index 03ff9019..a89b63de 100644
--- a/drivers/ginput/touch/STMPE610/readme.txt
+++ b/drivers/ginput/touch/STMPE610/readme.txt
@@ -1,11 +1,11 @@
This driver has a number of optional settings which can be specified in gfxconf.h:
-#define GMOUSE_STMPE610_READ_PRESSURE TRUE
+#define GMOUSE_STMPE610_READ_PRESSURE GFXON
Returns pressure values when the touch is down. On tested boards this ranges from 90 to 150. 255 is touch off.
-#define GMOUSE_STMPE610_SELF_CALIBRATE TRUE
+#define GMOUSE_STMPE610_SELF_CALIBRATE GFXON
Scale the touch readings to avoid calibration. This is not as accurate as real calibration.
-#define GMOUSE_STMPE610_TEST_MODE TRUE
+#define GMOUSE_STMPE610_TEST_MODE GFXON
Return raw readings for diagnostic use with the "touch_raw_readings" tool.
diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
index 8cb1b70e..90496b29 100644
--- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
+++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811.c
@@ -20,13 +20,13 @@
// Extra settings for the users gfxconf.h file. See readme.txt
#ifndef GMOUSE_STMPE811_SELF_CALIBRATE
- #define GMOUSE_STMPE811_SELF_CALIBRATE FALSE
+ #define GMOUSE_STMPE811_SELF_CALIBRATE GFXOFF
#endif
#ifndef GMOUSE_STMPE811_READ_PRESSURE
- #define GMOUSE_STMPE811_READ_PRESSURE FALSE
+ #define GMOUSE_STMPE811_READ_PRESSURE GFXOFF
#endif
#ifndef GMOUSE_STMPE811_TEST_MODE
- #define GMOUSE_STMPE811_TEST_MODE FALSE
+ #define GMOUSE_STMPE811_TEST_MODE GFXOFF
#endif
/**
diff --git a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
index 0b307ed2..fb979f8b 100644
--- a/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
+++ b/drivers/ginput/touch/STMPE811/gmouse_lld_STMPE811_board_template.h
@@ -20,18 +20,18 @@
#define GMOUSE_STMPE811_BOARD_DATA_SIZE 0
// Options - Leave these commented to make it user configurable in the gfxconf.h
-//#define GMOUSE_STMPE811_READ_PRESSURE FALSE
-//#define GMOUSE_STMPE811_SELF_CALIBRATE FALSE
-//#define GMOUSE_STMPE811_TEST_MODE FALSE
+//#define GMOUSE_STMPE811_READ_PRESSURE GFXOFF
+//#define GMOUSE_STMPE811_SELF_CALIBRATE GFXOFF
+//#define GMOUSE_STMPE811_TEST_MODE GFXOFF
-// If TRUE this board has the STMPE811 IRQ pin connected to a GPIO.
-// Note: For tested hardware this is unreliable and should be set to FALSE until tested.
+// If GFXON this board has the STMPE811 IRQ pin connected to a GPIO.
+// Note: For tested hardware this is unreliable and should be set to GFXOFF until tested.
// Symptoms are that mouse readings just appear to stop for a bit. Lifting the touch
// and re-applying the touch cause readings to start again.
-#define GMOUSE_STMPE811_GPIO_IRQPIN FALSE
+#define GMOUSE_STMPE811_GPIO_IRQPIN GFXOFF
-// If TRUE this is a really slow CPU and we should always clear the FIFO between reads.
-#define GMOUSE_STMPE811_SLOW_CPU FALSE
+// If GFXON this is a really slow CPU and we should always clear the FIFO between reads.
+#define GMOUSE_STMPE811_SLOW_CPU GFXOFF
static bool_t init_board(GMouse* m, unsigned driverinstance) {
}
diff --git a/drivers/ginput/touch/STMPE811/readme.txt b/drivers/ginput/touch/STMPE811/readme.txt
index 60d7f603..250dd844 100644
--- a/drivers/ginput/touch/STMPE811/readme.txt
+++ b/drivers/ginput/touch/STMPE811/readme.txt
@@ -1,11 +1,11 @@
This driver has a number of optional settings which can be specified in gfxconf.h:
-#define GMOUSE_STMPE811_READ_PRESSURE TRUE
+#define GMOUSE_STMPE811_READ_PRESSURE GFXON
Returns pressure values when the touch is down. On tested boards this ranges from 90 to 150. 255 is touch off.
-#define GMOUSE_STMPE811_SELF_CALIBRATE TRUE
+#define GMOUSE_STMPE811_SELF_CALIBRATE GFXON
Scale the touch readings to avoid calibration. This is not as accurate as real calibration.
-#define GMOUSE_STMPE811_TEST_MODE TRUE
+#define GMOUSE_STMPE811_TEST_MODE GFXON
Return raw readings for diagnostic use with the "touch_raw_readings" tool.
diff --git a/drivers/multiple/SDL/gdisp_lld_SDL.c b/drivers/multiple/SDL/gdisp_lld_SDL.c
index e833b99e..5e2661a3 100644
--- a/drivers/multiple/SDL/gdisp_lld_SDL.c
+++ b/drivers/multiple/SDL/gdisp_lld_SDL.c
@@ -25,7 +25,7 @@
#include "../../../src/gdisp/gdisp_driver.h"
#ifndef GDISP_FORCE_24BIT
- #define GDISP_FORCE_24BIT FALSE
+ #define GDISP_FORCE_24BIT GFXOFF
#endif
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
diff --git a/drivers/multiple/SDL/gdisp_lld_config.h b/drivers/multiple/SDL/gdisp_lld_config.h
index 22fc4180..4a1af08e 100644
--- a/drivers/multiple/SDL/gdisp_lld_config.h
+++ b/drivers/multiple/SDL/gdisp_lld_config.h
@@ -12,12 +12,12 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_BITFILLS FALSE
-#define GDISP_HARDWARE_SCROLL FALSE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL FALSE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_BITFILLS GFXOFF
+#define GDISP_HARDWARE_SCROLL GFXOFF
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXOFF
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
diff --git a/drivers/multiple/SDL/readme.txt b/drivers/multiple/SDL/readme.txt
index 3bbaec59..9e9530d9 100644
--- a/drivers/multiple/SDL/readme.txt
+++ b/drivers/multiple/SDL/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
and a touchscreen driver.
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
- b) #define GFX_USE_GINPUT TRUE
- #define GINPUT_USE_MOUSE TRUE
+ a) #define GFX_USE_GDISP GFXON
+ b) #define GFX_USE_GINPUT GFXON
+ #define GINPUT_USE_MOUSE GFXON
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640
diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c
index a724769d..0ce0f25a 100644
--- a/drivers/multiple/Win32/gdisp_lld_Win32.c
+++ b/drivers/multiple/Win32/gdisp_lld_Win32.c
@@ -25,7 +25,7 @@
#endif
#ifndef GDISP_WIN32_USE_INDIRECT_UPDATE
/**
- * Setting this to TRUE delays updating the screen
+ * Setting this to GFXON delays updating the screen
* to the windows paint routine. Due to the
* drawing lock this does not add as much speed
* as might be expected but it is still faster in
@@ -37,20 +37,20 @@
* if you are debugging drawing and want to see each
* pixel as it is set.
*/
- #define GDISP_WIN32_USE_INDIRECT_UPDATE TRUE
+ #define GDISP_WIN32_USE_INDIRECT_UPDATE GFXON
#endif
#ifndef GKEYBOARD_WIN32_NO_LAYOUT
/**
- * Setting this to TRUE turns off the layout engine.
+ * Setting this to GFXON turns off the layout engine.
* In this situation "cooked" characters are returned but
* shift states etc are lost.
* As only a limited number of keyboard layouts are currently
* defined for Win32 in uGFX (currently only US English), setting this
- * to TRUE enables the windows keyboard mapping to be pass non-English
+ * to GFXON enables the windows keyboard mapping to be pass non-English
* characters to uGFX or to handle non-standard keyboard layouts at
* the expense of losing special function keys etc.
*/
- #define GKEYBOARD_WIN32_NO_LAYOUT FALSE
+ #define GKEYBOARD_WIN32_NO_LAYOUT GFXOFF
#endif
#ifndef GKEYBOARD_WIN32_DEFAULT_LAYOUT
#define GKEYBOARD_WIN32_DEFAULT_LAYOUT KeyboardLayout_Win32_US
@@ -136,7 +136,7 @@
#if !GKEYBOARD_WIN32_NO_LAYOUT
#if GKEYBOARD_LAYOUT_OFF
- #error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_WIN32_NO_LAYOUT=TRUE."
+ #error "The Win32 keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=GFXOFF or GKEYBOARD_WIN32_NO_LAYOUT=GFXON."
#endif
#include "../../../src/ginput/ginput_keyboard_microcode.h"
@@ -381,9 +381,9 @@
};
#elif !GKEYBOARD_LAYOUT_OFF
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size."
+ #warning "The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size.")
+ COMPILER_WARNING("The WIN32 keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size.")
#endif
#endif
@@ -467,7 +467,7 @@ void gfxEmulatorSetParentWindow(void *hwnd) {
priv->mousebuttons = buttons;
priv->mousex = x;
priv->mousey = y;
- if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always TRUE
+ if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always true
_gmouseWakeup(priv->mouse);
}
void gfxEmulatorMouseEnable(GDisplay *g, bool_t enabled) {
@@ -634,7 +634,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
priv->mousebuttons = btns;
priv->mousex = (coord_t)LOWORD(lParam);
priv->mousey = (coord_t)HIWORD(lParam);
- if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always TRUE
+ if ((gmvmt(priv->mouse)->d.flags & GMOUSE_VFLG_NOPOLL)) // For normal setup this is always true
_gmouseWakeup(priv->mouse);
}
break;
@@ -652,7 +652,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
else if (HIWORD(lParam) & KF_REPEAT)
keybuffer[keypos++] = 0x01; // Repeat
keybuffer[keypos++] = wParam;
- if ((gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL)) // For normal setup this is always TRUE
+ if ((gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL)) // For normal setup this is always true
_gkeyboardWakeup(keyboard);
}
return 0;
@@ -666,7 +666,7 @@ static LRESULT myWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam)
w = wParam;
len = WideCharToMultiByte(CP_UTF8, 0, &w, 1, (char *)(keybuffer+keypos), sizeof(keybuffer)-keypos, 0, 0);
keypos += len;
- if (len && (gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL)) // For normal setup this is always TRUE
+ if (len && (gkvmt(keyboard)->d.flags & GKEYBOARD_VFLG_NOPOLL)) // For normal setup this is always true
_gkeyboardWakeup(keyboard);
}
return 0;
diff --git a/drivers/multiple/Win32/gdisp_lld_config.h b/drivers/multiple/Win32/gdisp_lld_config.h
index 4178a948..710cd3fb 100644
--- a/drivers/multiple/Win32/gdisp_lld_config.h
+++ b/drivers/multiple/Win32/gdisp_lld_config.h
@@ -17,31 +17,31 @@
// Calling gdispGFlush() is optional for this driver but can be used by the
// application to force a display update. eg after streaming.
-#define GDISP_HARDWARE_FLUSH TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
//#define GDISP_WIN32_STREAMING_TEST
#ifdef GDISP_WIN32_STREAMING_TEST
// These streaming routines are here only to debug the high level gdisp
// code for streaming controllers. They are slow, inefficient and have
// lots of debugging turned on.
- #define GDISP_HARDWARE_STREAM_WRITE TRUE
- #define GDISP_HARDWARE_STREAM_READ TRUE
- #define GDISP_HARDWARE_STREAM_POS TRUE
+ #define GDISP_HARDWARE_STREAM_WRITE GFXON
+ #define GDISP_HARDWARE_STREAM_READ GFXON
+ #define GDISP_HARDWARE_STREAM_POS GFXON
#else
// The proper way on the Win32. These routines are nice and fast.
- #define GDISP_HARDWARE_DRAWPIXEL TRUE
- #define GDISP_HARDWARE_FILLS TRUE
- #define GDISP_HARDWARE_PIXELREAD TRUE
- #define GDISP_HARDWARE_SCROLL TRUE
+ #define GDISP_HARDWARE_DRAWPIXEL GFXON
+ #define GDISP_HARDWARE_FILLS GFXON
+ #define GDISP_HARDWARE_PIXELREAD GFXON
+ #define GDISP_HARDWARE_SCROLL GFXON
// Bit-blits on Win32 are currently only supported for True-Color bit-depths greater than 8 bits
// Note: At the time this file is included we have not calculated all our color
// definitions so we need to do this by hand.
#if !defined(GDISP_PIXELFORMAT)
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_BITFILLS GFXON
#elif (GDISP_PIXELFORMAT & 0x2000) && (((GDISP_PIXELFORMAT & 0x0F00)>>8)+((GDISP_PIXELFORMAT & 0x00F0)>>4)+((GDISP_PIXELFORMAT & 0x000F))) > 8
- #define GDISP_HARDWARE_BITFILLS TRUE
+ #define GDISP_HARDWARE_BITFILLS GFXON
#endif
#endif
diff --git a/drivers/multiple/Win32/readme.txt b/drivers/multiple/Win32/readme.txt
index 932deb8b..47080f73 100644
--- a/drivers/multiple/Win32/readme.txt
+++ b/drivers/multiple/Win32/readme.txt
@@ -4,10 +4,10 @@ This driver is special in that it implements both the gdisp low level driver,
optionally a touchscreen driver, and optionally a toggle driver.
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
- b) Optionally #define GFX_USE_GINPUT TRUE
- #define GINPUT_USE_MOUSE TRUE
- #define GINPUT_USE_TOGGLE TRUE
+ a) #define GFX_USE_GDISP GFXON
+ b) Optionally #define GFX_USE_GINPUT GFXON
+ #define GINPUT_USE_MOUSE GFXON
+ #define GINPUT_USE_TOGGLE GFXON
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640
diff --git a/drivers/multiple/X/gdisp_lld_X.c b/drivers/multiple/X/gdisp_lld_X.c
index 0d471d09..f27795a8 100644
--- a/drivers/multiple/X/gdisp_lld_X.c
+++ b/drivers/multiple/X/gdisp_lld_X.c
@@ -24,7 +24,7 @@
// Configuration parameters for this driver
#ifndef GDISP_FORCE_24BIT
- #define GDISP_FORCE_24BIT FALSE
+ #define GDISP_FORCE_24BIT GFXOFF
#endif
#ifndef GDISP_SCREEN_WIDTH
#define GDISP_SCREEN_WIDTH 640
@@ -34,17 +34,17 @@
#endif
#ifndef GKEYBOARD_X_NO_LAYOUT
/**
- * Setting this to TRUE turns off the layout engine.
+ * Setting this to GFXON turns off the layout engine.
* In this situation "cooked" characters are returned but
* shift states etc are lost.
* As only a limited number of keyboard layouts are currently
* defined for X in uGFX (currently none), setting this
- * to TRUE enables the X keyboard mapping to be pass non-English
+ * to GFXON enables the X keyboard mapping to be pass non-English
* characters to uGFX or to handle non-standard keyboard layouts at
* the expense of losing special function keys etc.
*/
- // We set this to TRUE by default as currently the X layout code is not complete!
- #define GKEYBOARD_X_NO_LAYOUT TRUE
+ // We set this to GFXON by default as currently the X layout code is not complete!
+ #define GKEYBOARD_X_NO_LAYOUT GFXON
#endif
#ifndef GKEYBOARD_X_DEFAULT_LAYOUT
#define GKEYBOARD_X_DEFAULT_LAYOUT KeyboardLayout_X_US
@@ -102,7 +102,7 @@
#if !GKEYBOARD_X_NO_LAYOUT
#if GKEYBOARD_LAYOUT_OFF
- #error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=FALSE or GKEYBOARD_X_NO_LAYOUT=TRUE."
+ #error "The X keyboard driver is using the layout engine. Please set GKEYBOARD_LAYOUT_OFF=GFXOFF or GKEYBOARD_X_NO_LAYOUT=GFXON."
#endif
// Forward definitions
@@ -133,9 +133,9 @@
};
#elif !GKEYBOARD_LAYOUT_OFF
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size."
+ #warning "The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=TRUE to save code size.")
+ COMPILER_WARNING("The X keyboard driver is not using the layout engine. If no other keyboard is using it consider defining GKEYBOARD_LAYOUT_OFF=GFXON to save code size.")
#endif
#endif
diff --git a/drivers/multiple/X/gdisp_lld_config.h b/drivers/multiple/X/gdisp_lld_config.h
index 55d61d74..87aca5cf 100644
--- a/drivers/multiple/X/gdisp_lld_config.h
+++ b/drivers/multiple/X/gdisp_lld_config.h
@@ -14,12 +14,12 @@
/* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_BITFILLS FALSE
-#define GDISP_HARDWARE_SCROLL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL FALSE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_BITFILLS GFXOFF
+#define GDISP_HARDWARE_SCROLL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXOFF
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
diff --git a/drivers/multiple/X/readme.txt b/drivers/multiple/X/readme.txt
index b26dce5d..622b7334 100644
--- a/drivers/multiple/X/readme.txt
+++ b/drivers/multiple/X/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
and a touchscreen driver.
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
- b) #define GFX_USE_GINPUT TRUE
- #define GINPUT_USE_MOUSE TRUE
+ a) #define GFX_USE_GDISP GFXON
+ b) #define GFX_USE_GINPUT GFXON
+ #define GINPUT_USE_MOUSE GFXON
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_config.h b/drivers/multiple/uGFXnet/gdisp_lld_config.h
index e181d91e..1d2056f6 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_config.h
+++ b/drivers/multiple/uGFXnet/gdisp_lld_config.h
@@ -17,13 +17,13 @@
// Calling gdispGFlush() is optional for this driver but can be used by the
// application to force a display update. eg after streaming.
-#define GDISP_HARDWARE_FLUSH TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_BITFILLS TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_SCROLL TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_BITFILLS GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_SCROLL GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
index 01c6ac89..bb8ffbe6 100644
--- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
+++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c
@@ -27,13 +27,13 @@
#define GDISP_GFXNET_PORT GNETCODE_DEFAULT_PORT
#endif
#ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY
- #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
+ #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF
#endif
#ifndef GDISP_GFXNET_UNSAFE_SOCKETS
- #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
+ #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF
#endif
#ifndef GDISP_GFXNET_BROKEN_LWIP_ACCEPT
- #define GDISP_GFXNET_BROKEN_LWIP_ACCEPT FALSE
+ #define GDISP_GFXNET_BROKEN_LWIP_ACCEPT GFXOFF
#endif
#if GINPUT_NEED_MOUSE
@@ -143,7 +143,7 @@
COMPILER_WARNING("GDISP: uGFXnet - LWIP sockets are not thread-safe. GDISP_GFXNET_UNSAFE_SOCKETS has been turned on for you.")
#endif
#undef GDISP_GFXNET_UNSAFE_SOCKETS
- #define GDISP_GFXNET_UNSAFE_SOCKETS TRUE
+ #define GDISP_GFXNET_UNSAFE_SOCKETS GFXON
#endif
#endif
diff --git a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
index 576df7ee..3d8841cf 100644
--- a/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnet/ginput_lld_mouse_config.h
@@ -14,8 +14,8 @@
#if 1
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_MOUSE
#define GINPUT_MOUSE_CLICK_TIME TIME_INFINITE // Long click != Context Click
- #define GINPUT_MOUSE_NEED_CALIBRATION FALSE
- #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
+ #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF
+ #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF
#define GINPUT_MOUSE_READ_CYCLES 1
#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR -1
#define GINPUT_MOUSE_MAX_CLICK_JITTER 0
@@ -23,8 +23,8 @@
#else
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH
#define GINPUT_MOUSE_CLICK_TIME 700 // Long click = Context Click
- #define GINPUT_MOUSE_NEED_CALIBRATION FALSE // Can be set to TRUE just for testing
- #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
+ #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF // Can be set to GFXON just for testing
+ #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF
#define GINPUT_MOUSE_READ_CYCLES 1
#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 2
#define GINPUT_MOUSE_MAX_CLICK_JITTER 2
@@ -36,6 +36,6 @@
//#define GINPUT_MOUSE_POLL_PERIOD 25 // Poll driven
// This driver does not require rotation of co-ordinates for orientations other than 0.
-#define GINPUT_MOUSE_NO_ROTATION TRUE
+#define GINPUT_MOUSE_NO_ROTATION GFXON
#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
diff --git a/drivers/multiple/uGFXnet/readme.txt b/drivers/multiple/uGFXnet/readme.txt
index 0cb3ee07..bc380829 100644
--- a/drivers/multiple/uGFXnet/readme.txt
+++ b/drivers/multiple/uGFXnet/readme.txt
@@ -4,17 +4,17 @@ This driver is special in that it implements both the gdisp low level driver
and a touchscreen driver.
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
- b) Optionally #define GFX_USE_GINPUT TRUE
- #define GINPUT_USE_MOUSE TRUE
+ a) #define GFX_USE_GDISP GFXON
+ b) Optionally #define GFX_USE_GINPUT GFXON
+ #define GINPUT_USE_MOUSE GFXON
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640 // Virtual display width
#define GDISP_SCREEN_HEIGHT 480 // Virtual display height
- #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE // Your socket library is not thread-safe
- // LWIP automatically sets this to TRUE
- #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE // You want a custom Start_LWIP() function (LWIP only)
- #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE // Don't halt waiting for the first connection
+ #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF // Your socket library is not thread-safe
+ // LWIP automatically sets this to GFXON
+ #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP GFXOFF // You want a custom Start_LWIP() function (LWIP only)
+ #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF // Don't halt waiting for the first connection
$define GDISP_GFXNET_PORT 13001 // The TCP port the display sits on
2. To your makefile add the following lines:
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h b/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
index e181d91e..1d2056f6 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h
@@ -17,13 +17,13 @@
// Calling gdispGFlush() is optional for this driver but can be used by the
// application to force a display update. eg after streaming.
-#define GDISP_HARDWARE_FLUSH TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
-#define GDISP_HARDWARE_BITFILLS TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_SCROLL TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_FLUSH GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
+#define GDISP_HARDWARE_BITFILLS GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_SCROLL GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
index 7963acab..dc208cbe 100644
--- a/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
+++ b/drivers/multiple/uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp
@@ -29,7 +29,7 @@
#define GDISP_GFXNET_PORT GNETCODE_DEFAULT_PORT
#endif
#ifndef GDISP_DONT_WAIT_FOR_NET_DISPLAY
- #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
+ #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF
#endif
static WiFiServer server(GDISP_GFXNET_PORT);
diff --git a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
index 576df7ee..3d8841cf 100644
--- a/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
+++ b/drivers/multiple/uGFXnetESP8266/ginput_lld_mouse_config.h
@@ -14,8 +14,8 @@
#if 1
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_MOUSE
#define GINPUT_MOUSE_CLICK_TIME TIME_INFINITE // Long click != Context Click
- #define GINPUT_MOUSE_NEED_CALIBRATION FALSE
- #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
+ #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF
+ #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF
#define GINPUT_MOUSE_READ_CYCLES 1
#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR -1
#define GINPUT_MOUSE_MAX_CLICK_JITTER 0
@@ -23,8 +23,8 @@
#else
#define GINPUT_MOUSE_EVENT_TYPE GEVENT_TOUCH
#define GINPUT_MOUSE_CLICK_TIME 700 // Long click = Context Click
- #define GINPUT_MOUSE_NEED_CALIBRATION FALSE // Can be set to TRUE just for testing
- #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE FALSE
+ #define GINPUT_MOUSE_NEED_CALIBRATION GFXOFF // Can be set to GFXON just for testing
+ #define GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE GFXOFF
#define GINPUT_MOUSE_READ_CYCLES 1
#define GINPUT_MOUSE_MAX_CALIBRATION_ERROR 2
#define GINPUT_MOUSE_MAX_CLICK_JITTER 2
@@ -36,6 +36,6 @@
//#define GINPUT_MOUSE_POLL_PERIOD 25 // Poll driven
// This driver does not require rotation of co-ordinates for orientations other than 0.
-#define GINPUT_MOUSE_NO_ROTATION TRUE
+#define GINPUT_MOUSE_NO_ROTATION GFXON
#endif /* _LLD_GINPUT_MOUSE_CONFIG_H */
diff --git a/drivers/multiple/uGFXnetESP8266/readme.txt b/drivers/multiple/uGFXnetESP8266/readme.txt
index d7ce2178..c06be3aa 100644
--- a/drivers/multiple/uGFXnetESP8266/readme.txt
+++ b/drivers/multiple/uGFXnetESP8266/readme.txt
@@ -4,9 +4,9 @@ This driver is special in that it implements both the gdisp low level driver
and a touchscreen driver.
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
- b) Optionally #define GFX_USE_GINPUT TRUE
- #define GINPUT_USE_MOUSE TRUE
+ a) #define GFX_USE_GDISP GFXON
+ b) Optionally #define GFX_USE_GINPUT GFXON
+ #define GINPUT_USE_MOUSE GFXON
c) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
d) Optionally the following (with appropriate values):
#define GDISP_SCREEN_WIDTH 640 // Virtual display width
@@ -21,7 +21,7 @@ and a touchscreen driver.
#define GDISP_GFXNET_WIFI_PASSWORD "password" // Your wifi password.
// Not required if GDISP_GFXNET_WIFI_INIT_FUNCTION
// is specified.
- #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE // Don't halt waiting for the first connection
+ #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF // Don't halt waiting for the first connection
$define GDISP_GFXNET_PORT 13001 // The TCP port the display sits on
diff --git a/gfx.h b/gfx.h
index abbad5d6..e248c701 100644
--- a/gfx.h
+++ b/gfx.h
@@ -19,95 +19,115 @@
#ifndef _GFX_H
#define _GFX_H
-/**
- * These two definitions below are required before anything else so that we can
- * turn module definitions off and on.
- */
-
-/**
- * @brief Generic 'false' boolean constant.
- */
-#if !defined(FALSE) || defined(__DOXYGEN__)
- #define FALSE 0
+// Everything here is C, not C++
+#ifdef __cplusplus
+extern "C" {
#endif
+// ------------------------------ Initial preparation ---------------------------------
+
+// ------------------------------ Load the user configuration ---------------------------------
+
+// Definitions for option configuration
+#define GFXOFF (0)
+#define GFXON (-1)
+
+// gfxconf.h is the user's project configuration for the GFX system.
+#include "gfxconf.h"
+
+// ------------------------------ Determine build environment info - COMPILER, CPU etc ---------------------------------
+
/**
- * @brief Generic 'true' boolean constant.
+ * @name GFX compatibility options
+ * @{
*/
-#if !defined(TRUE) || defined(__DOXYGEN__)
- #define TRUE -1
+ /**
+ * @brief Include the uGFX V2.x API
+ * @details Defaults to GFXON
+ */
+ #ifndef GFX_COMPAT_V2
+ #define GFX_COMPAT_V2 GFXON
+ #endif
+/** @} */
+
+#if GFX_COMPAT_V2
+ // These need to be defined here for compatibility with V2.x user config files
+ #if !defined(FALSE)
+ #define FALSE 0
+ #endif
+ #if !defined(TRUE)
+ #define TRUE -1
+ #endif
#endif
// Macro concatination and strify - not API documented
-#define GFXCATX(a, b) GFXCAT(a, b)
#define GFXCAT(a, b) a ## b
-#define GFXSTRX(a) GFXSTR(a)
+#define GFXCATX(a, b) GFXCAT(a, b)
#define GFXSTR(a) #a
+#define GFXSTRX(a) GFXSTR(a)
-/* gfxconf.h is the user's project configuration for the GFX system. */
-#include "gfxconf.h"
-
-/* Include Compiler and CPU support */
+// Include Compiler and CPU support
#include "src/gfx_compilers.h"
+// ------------------------------ Enumerate all options ---------------------------------
/**
* @name GFX sub-systems that can be turned on
* @{
*/
/**
* @brief GFX Driver API
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
* @note Not much useful can be done without a driver
*/
#ifndef GFX_USE_GDRIVER
- #define GFX_USE_GDRIVER TRUE
+ #define GFX_USE_GDRIVER GFXON
#endif
/**
* @brief GFX Graphics Display Basic API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add the specific hardware driver to your makefile.
* Eg. include $(GFXLIB)/drivers/gdisp/Nokia6610/driver.mk
*/
#ifndef GFX_USE_GDISP
- #define GFX_USE_GDISP FALSE
+ #define GFX_USE_GDISP GFXOFF
#endif
/**
* @brief GFX Graphics Windowing API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details Extends the GDISP API to add the concept of graphic windows.
* @note Also supports high-level "window" objects such as console windows,
* buttons, graphing etc
*/
#ifndef GFX_USE_GWIN
- #define GFX_USE_GWIN FALSE
+ #define GFX_USE_GWIN GFXOFF
#endif
/**
* @brief GFX Event API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details Defines the concept of a "Source" that can send "Events" to "Listeners".
*/
#ifndef GFX_USE_GEVENT
- #define GFX_USE_GEVENT FALSE
+ #define GFX_USE_GEVENT GFXOFF
#endif
/**
* @brief GFX Timer API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details Provides thread context timers - both one-shot and periodic.
*/
#ifndef GFX_USE_GTIMER
- #define GFX_USE_GTIMER FALSE
+ #define GFX_USE_GTIMER GFXOFF
#endif
/**
* @brief GFX Queue API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details Provides queue management.
*/
#ifndef GFX_USE_GQUEUE
- #define GFX_USE_GQUEUE FALSE
+ #define GFX_USE_GQUEUE GFXOFF
#endif
/**
* @brief GFX Input Device API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add the specific hardware drivers to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
@@ -115,48 +135,67 @@
* include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
*/
#ifndef GFX_USE_GINPUT
- #define GFX_USE_GINPUT FALSE
+ #define GFX_USE_GINPUT GFXOFF
#endif
/**
* @brief GFX Generic Periodic ADC API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_GADC
- #define GFX_USE_GADC FALSE
+ #define GFX_USE_GADC GFXOFF
#endif
/**
* @brief GFX Audio API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add the specific hardware drivers to your makefile.
* Eg.
* include $(GFXLIB)/drivers/gaudio/GADC/driver.mk
*/
#ifndef GFX_USE_GAUDIO
- #define GFX_USE_GAUDIO FALSE
+ #define GFX_USE_GAUDIO GFXOFF
#endif
/**
* @brief GFX Miscellaneous Routines API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Turning this on without turning on any GMISC_NEED_xxx macros will result
* in no extra code being compiled in. GMISC is made up from the sum of its
* parts.
*/
#ifndef GFX_USE_GMISC
- #define GFX_USE_GMISC FALSE
+ #define GFX_USE_GMISC GFXOFF
#endif
/**
* @brief GFX File API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_GFILE
- #define GFX_USE_GFILE FALSE
+ #define GFX_USE_GFILE GFXOFF
#endif
/**
* @brief GFX Translation Support API
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_GTRANS
- #define GFX_USE_GTRANS FALSE
+ #define GFX_USE_GTRANS GFXOFF
+ #endif
+/** @} */
+
+/**
+ * @name GFX compatibility options
+ * @{
+ */
+ /**
+ * @brief Include the uGFX V2.x Old Colors
+ * @details Defaults to GFXON
+ * @pre Requires GFX_COMPAT_V2 to be GFXON
+ * @note The old color definitions (particularly Red, Green & Blue) can
+ * cause symbol conflicts with many platforms eg Win32, STM32 HAL etc.
+ * Although officially these symbols are part of the V2.x API, this
+ * option allows them to be turned off even when the rest of the V2.x
+ * API is turned on.
+ */
+ #ifndef GFX_COMPAT_OLDCOLORS
+ #define GFX_COMPAT_OLDCOLORS GFXON
#endif
/** @} */
@@ -178,13 +217,17 @@
#include "src/gadc/gadc_options.h"
#include "src/gaudio/gaudio_options.h"
+// ------------------------------ Load driver configuration ---------------------------------
+
+// ------------------------------ Apply configuration rules ---------------------------------
+
/**
* Interdependency safety checks on the sub-systems.
* These must be in dependency order.
*
*/
#ifndef GFX_DISPLAY_RULE_WARNINGS
- #define GFX_DISPLAY_RULE_WARNINGS FALSE
+ #define GFX_DISPLAY_RULE_WARNINGS GFXOFF
#endif
#include "src/gwin/gwin_rules.h"
#include "src/ginput/ginput_rules.h"
@@ -200,6 +243,8 @@
#include "src/gdriver/gdriver_rules.h"
#include "src/gos/gos_rules.h"
+// ------------------------------ Define API definitions ---------------------------------
+
/**
* Include the sub-system header files
*/
@@ -217,54 +262,50 @@
#include "src/gadc/gadc.h"
#include "src/gaudio/gaudio.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
+/**
+ * @brief The one call to start it all
+ *
+ * @note This will initialise each sub-system that has been turned on.
+ * For example, if GFX_USE_GDISP is defined then display will be initialised
+ * and cleared to black.
+ * @note If you define GFX_OS_NO_INIT as GFXON in your gfxconf.h file then ugfx doesn't try to
+ * initialise the operating system for you when you call @p gfxInit().
+ * @note If you define GFX_OS_EXTRA_INIT_FUNCTION in your gfxconf.h file the macro is the
+ * name of a void function with no parameters that is called immediately after
+ * operating system initialisation (whether or not GFX_OS_NO_INIT is set).
+ * @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the
+ * name of a void function with no parameters that is called immediately before
+ * operating system de-initialisation (as ugfx is exiting).
+ * @note If GFX_OS_CALL_UGFXMAIN is set uGFXMain() is called after all initialisation is complete.
+ *
+ * @api
+ */
+void gfxInit(void);
- /**
- * @brief The one call to start it all
- *
- * @note This will initialise each sub-system that has been turned on.
- * For example, if GFX_USE_GDISP is defined then display will be initialised
- * and cleared to black.
- * @note If you define GFX_OS_NO_INIT as TRUE in your gfxconf.h file then ugfx doesn't try to
- * initialise the operating system for you when you call @p gfxInit().
- * @note If you define GFX_OS_EXTRA_INIT_FUNCTION in your gfxconf.h file the macro is the
- * name of a void function with no parameters that is called immediately after
- * operating system initialisation (whether or not GFX_OS_NO_INIT is set).
- * @note If you define GFX_OS_EXTRA_DEINIT_FUNCTION in your gfxconf.h file the macro is the
- * name of a void function with no parameters that is called immediately before
- * operating system de-initialisation (as ugfx is exiting).
- * @note If GFX_OS_CALL_UGFXMAIN is set uGFXMain() is called after all initialisation is complete.
- *
- * @api
- */
- void gfxInit(void);
+/**
+ * @brief The one call to end it all
+ *
+ * @note This will de-initialise each sub-system that has been turned on.
+ *
+ * @api
+ */
+void gfxDeinit(void);
+#if GFX_OS_CALL_UGFXMAIN || defined(__DOXYGEN__)
/**
- * @brief The one call to end it all
+ * @brief The function containing all the user uGFX application code.
*
- * @note This will de-initialise each sub-system that has been turned on.
+ * @note This is called by gfxInit() and is expected to never return.
+ * It is defined by the user.
*
- * @api
+ * @pre GFX_OS_CALL_UGFXMAIN is GFXON
*/
- void gfxDeinit(void);
+ void uGFXMain(void);
+#endif
- #if GFX_OS_CALL_UGFXMAIN || defined(__DOXYGEN__)
- /**
- * @brief The function containing all the user uGFX application code.
- *
- * @note This is called by gfxInit() and is expected to never return.
- * It is defined by the user.
- *
- * @pre GFX_OS_CALL_UGFXMAIN is GFXON
- */
- void uGFXMain(void);
- #endif
#ifdef __cplusplus
}
#endif
-
#endif /* _GFX_H */
/** @} */
diff --git a/gfx.mk b/gfx.mk
index 3201c313..89454e6b 100644
--- a/gfx.mk
+++ b/gfx.mk
@@ -37,35 +37,35 @@ endif
# Include the operating system define
ifeq ($(OPT_OS),arduino)
- GFXDEFS += GFX_USE_OS_ARDUINO=TRUE
+ GFXDEFS += GFX_USE_OS_ARDUINO=GFXON
endif
ifeq ($(OPT_OS),win32)
- GFXDEFS += GFX_USE_OS_WIN32=TRUE
+ GFXDEFS += GFX_USE_OS_WIN32=GFXON
endif
ifeq ($(OPT_OS),win32.chibios)
- GFXDEFS += GFX_USE_OS_CHIBIOS=TRUE
+ GFXDEFS += GFX_USE_OS_CHIBIOS=GFXON
endif
ifeq ($(OPT_OS),win32.raw32)
- GFXDEFS += GFX_USE_OS_RAW32=TRUE
+ GFXDEFS += GFX_USE_OS_RAW32=GFXON
endif
ifeq ($(OPT_OS),linux)
- GFXDEFS += GFX_USE_OS_LINUX=TRUE
+ GFXDEFS += GFX_USE_OS_LINUX=GFXON
endif
ifeq ($(OPT_OS),osx)
- GFXDEFS += GFX_USE_OS_OSX=TRUE
+ GFXDEFS += GFX_USE_OS_OSX=GFXON
endif
ifeq ($(OPT_OS),chibios)
- GFXDEFS += GFX_USE_OS_CHIBIOS=TRUE
+ GFXDEFS += GFX_USE_OS_CHIBIOS=GFXON
endif
ifeq ($(OPT_OS),freertos)
- GFXDEFS += GFX_USE_OS_FREERTOS=TRUE
+ GFXDEFS += GFX_USE_OS_FREERTOS=GFXON
endif
ifeq ($(OPT_OS),ecos)
- GFXDEFS += GFX_USE_OS_ECOS=TRUE
+ GFXDEFS += GFX_USE_OS_ECOS=GFXON
endif
ifeq ($(OPT_OS),rawrtos)
- GFXDEFS += GFX_USE_OS_RAWRTOS=TRUE
+ GFXDEFS += GFX_USE_OS_RAWRTOS=GFXON
endif
ifeq ($(OPT_OS),raw32)
- GFXDEFS += GFX_USE_OS_RAW32=TRUE
+ GFXDEFS += GFX_USE_OS_RAW32=GFXON
endif
diff --git a/gfxconf.example.h b/gfxconf.example.h
index 208061e5..661c2d5b 100644
--- a/gfxconf.example.h
+++ b/gfxconf.example.h
@@ -22,234 +22,239 @@
#ifndef _GFXCONF_H
#define _GFXCONF_H
+///////////////////////////////////////////////////////////////////////////
+// GFX - Compatibility options //
+///////////////////////////////////////////////////////////////////////////
+//#define GFX_COMPAT_V2 GFXON
+//#define GFX_COMPAT_OLDCOLORS GFXON
///////////////////////////////////////////////////////////////////////////
// GOS - One of these must be defined, preferably in your Makefile //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_OS_CHIBIOS FALSE
-//#define GFX_USE_OS_FREERTOS FALSE
-// #define GFX_FREERTOS_USE_TRACE FALSE
-//#define GFX_USE_OS_WIN32 FALSE
-//#define GFX_USE_OS_LINUX FALSE
-//#define GFX_USE_OS_OSX FALSE
-//#define GFX_USE_OS_ECOS FALSE
-//#define GFX_USE_OS_RAWRTOS FALSE
-//#define GFX_USE_OS_ARDUINO FALSE
-//#define GFX_USE_OS_KEIL FALSE
-//#define GFX_USE_OS_RTX5 FALSE
-//#define GFX_USE_OS_CMSIS FALSE
-//#define GFX_USE_OS_CMSIS2 FALSE
-//#define GFX_USE_OS_RAW32 FALSE
-//#define GFX_USE_OS_ZEPHYR FALSE
-//#define GFX_USE_OS_NIOS FALSE
-//#define GFX_USE_OS_QT FALSE
+//#define GFX_USE_OS_CHIBIOS GFXOFF
+//#define GFX_USE_OS_FREERTOS GFXOFF
+// #define GFX_FREERTOS_USE_TRACE GFXOFF
+//#define GFX_USE_OS_WIN32 GFXOFF
+//#define GFX_USE_OS_LINUX GFXOFF
+//#define GFX_USE_OS_OSX GFXOFF
+//#define GFX_USE_OS_ECOS GFXOFF
+//#define GFX_USE_OS_RAWRTOS GFXOFF
+//#define GFX_USE_OS_ARDUINO GFXOFF
+//#define GFX_USE_OS_KEIL GFXOFF
+//#define GFX_USE_OS_RTX5 GFXOFF
+//#define GFX_USE_OS_CMSIS GFXOFF
+//#define GFX_USE_OS_CMSIS2 GFXOFF
+//#define GFX_USE_OS_RAW32 GFXOFF
+//#define GFX_USE_OS_ZEPHYR GFXOFF
+//#define GFX_USE_OS_NIOS GFXOFF
+//#define GFX_USE_OS_QT GFXOFF
// #define INTERRUPTS_OFF() optional_code
// #define INTERRUPTS_ON() optional_code
// Options that (should where relevant) apply to all operating systems
-// #define GFX_NO_INLINE FALSE
+// #define GFX_NO_INLINE GFXOFF
// #define GFX_COMPILER GFX_COMPILER_UNKNOWN
-// #define GFX_SHOW_COMPILER FALSE
+// #define GFX_SHOW_COMPILER GFXOFF
// #define GFX_CPU GFX_CPU_UNKNOWN
-// #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE
+// #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXOFF
// #define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_UNKNOWN
// #define GFX_OS_HEAP_SIZE 0
-// #define GFX_OS_NO_INIT FALSE
-// #define GFX_OS_INIT_NO_WARNING FALSE
+// #define GFX_OS_NO_INIT GFXOFF
+// #define GFX_OS_INIT_NO_WARNING GFXOFF
// #define GFX_OS_PRE_INIT_FUNCTION myHardwareInitRoutine
// #define GFX_OS_EXTRA_INIT_FUNCTION myOSInitRoutine
// #define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine
-// #define GFX_OS_CALL_UGFXMAIN FALSE
+// #define GFX_OS_CALL_UGFXMAIN GFXOFF
// #define GFX_OS_UGFXMAIN_STACKSIZE 0
-// #define GFX_EMULATE_MALLOC FALSE
+// #define GFX_EMULATE_MALLOC GFXOFF
///////////////////////////////////////////////////////////////////////////
// GDISP //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GDISP FALSE
-
-//#define GDISP_NEED_AUTOFLUSH FALSE
-//#define GDISP_NEED_TIMERFLUSH FALSE
-//#define GDISP_NEED_VALIDATION TRUE
-//#define GDISP_NEED_CLIP TRUE
-//#define GDISP_NEED_CIRCLE FALSE
-//#define GDISP_NEED_DUALCIRCLE FALSE
-//#define GDISP_NEED_ELLIPSE FALSE
-//#define GDISP_NEED_ARC FALSE
-//#define GDISP_NEED_ARCSECTORS FALSE
-//#define GDISP_NEED_CONVEX_POLYGON FALSE
-//#define GDISP_NEED_SCROLL FALSE
-//#define GDISP_NEED_PIXELREAD FALSE
-//#define GDISP_NEED_CONTROL FALSE
-//#define GDISP_NEED_QUERY FALSE
-//#define GDISP_NEED_MULTITHREAD FALSE
-//#define GDISP_NEED_STREAMING FALSE
-//#define GDISP_NEED_TEXT FALSE
-// #define GDISP_NEED_TEXT_WORDWRAP FALSE
+//#define GFX_USE_GDISP GFXOFF
+
+//#define GDISP_NEED_AUTOFLUSH GFXOFF
+//#define GDISP_NEED_TIMERFLUSH GFXOFF
+//#define GDISP_NEED_VALIDATION GFXON
+//#define GDISP_NEED_CLIP GFXON
+//#define GDISP_NEED_CIRCLE GFXOFF
+//#define GDISP_NEED_DUALCIRCLE GFXOFF
+//#define GDISP_NEED_ELLIPSE GFXOFF
+//#define GDISP_NEED_ARC GFXOFF
+//#define GDISP_NEED_ARCSECTORS GFXOFF
+//#define GDISP_NEED_CONVEX_POLYGON GFXOFF
+//#define GDISP_NEED_SCROLL GFXOFF
+//#define GDISP_NEED_PIXELREAD GFXOFF
+//#define GDISP_NEED_CONTROL GFXOFF
+//#define GDISP_NEED_QUERY GFXOFF
+//#define GDISP_NEED_MULTITHREAD GFXOFF
+//#define GDISP_NEED_STREAMING GFXOFF
+//#define GDISP_NEED_TEXT GFXOFF
+// #define GDISP_NEED_TEXT_WORDWRAP GFXOFF
// #define GDISP_NEED_TEXT_BOXPADLR 1
// #define GDISP_NEED_TEXT_BOXPADTB 1
-// #define GDISP_NEED_ANTIALIAS FALSE
-// #define GDISP_NEED_UTF8 FALSE
-// #define GDISP_NEED_TEXT_KERNING FALSE
-// #define GDISP_INCLUDE_FONT_UI1 FALSE
-// #define GDISP_INCLUDE_FONT_UI2 FALSE // The smallest preferred font.
-// #define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
-// #define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE
-// #define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE
-// #define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
-// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
-// #define GDISP_INCLUDE_USER_FONTS FALSE
-
-//#define GDISP_NEED_IMAGE FALSE
-// #define GDISP_NEED_IMAGE_NATIVE FALSE
-// #define GDISP_NEED_IMAGE_GIF FALSE
+// #define GDISP_NEED_ANTIALIAS GFXOFF
+// #define GDISP_NEED_UTF8 GFXOFF
+// #define GDISP_NEED_TEXT_KERNING GFXOFF
+// #define GDISP_INCLUDE_FONT_UI1 GFXOFF
+// #define GDISP_INCLUDE_FONT_UI2 GFXOFF // The smallest preferred font.
+// #define GDISP_INCLUDE_FONT_LARGENUMBERS GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS10 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS12 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS16 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS20 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS24 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS32 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 GFXOFF
+// #define GDISP_INCLUDE_FONT_FIXED_10X20 GFXOFF
+// #define GDISP_INCLUDE_FONT_FIXED_7X14 GFXOFF
+// #define GDISP_INCLUDE_FONT_FIXED_5X8 GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS20_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA GFXOFF
+// #define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA GFXOFF
+// #define GDISP_INCLUDE_USER_FONTS GFXOFF
+
+//#define GDISP_NEED_IMAGE GFXOFF
+// #define GDISP_NEED_IMAGE_NATIVE GFXOFF
+// #define GDISP_NEED_IMAGE_GIF GFXOFF
// #define GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE 32
-// #define GDISP_NEED_IMAGE_BMP FALSE
-// #define GDISP_NEED_IMAGE_BMP_1 TRUE
-// #define GDISP_NEED_IMAGE_BMP_4 TRUE
-// #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE
-// #define GDISP_NEED_IMAGE_BMP_8 TRUE
-// #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE
-// #define GDISP_NEED_IMAGE_BMP_16 TRUE
-// #define GDISP_NEED_IMAGE_BMP_24 TRUE
-// #define GDISP_NEED_IMAGE_BMP_32 TRUE
+// #define GDISP_NEED_IMAGE_BMP GFXOFF
+// #define GDISP_NEED_IMAGE_BMP_1 GFXON
+// #define GDISP_NEED_IMAGE_BMP_4 GFXON
+// #define GDISP_NEED_IMAGE_BMP_4_RLE GFXON
+// #define GDISP_NEED_IMAGE_BMP_8 GFXON
+// #define GDISP_NEED_IMAGE_BMP_8_RLE GFXON
+// #define GDISP_NEED_IMAGE_BMP_16 GFXON
+// #define GDISP_NEED_IMAGE_BMP_24 GFXON
+// #define GDISP_NEED_IMAGE_BMP_32 GFXON
// #define GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE 32
-// #define GDISP_NEED_IMAGE_JPG FALSE
-// #define GDISP_NEED_IMAGE_PNG FALSE
-// #define GDISP_NEED_IMAGE_PNG_INTERLACED FALSE
-// #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY TRUE
-// #define GDISP_NEED_IMAGE_PNG_BACKGROUND TRUE
+// #define GDISP_NEED_IMAGE_JPG GFXOFF
+// #define GDISP_NEED_IMAGE_PNG GFXOFF
+// #define GDISP_NEED_IMAGE_PNG_INTERLACED GFXOFF
+// #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY GFXON
+// #define GDISP_NEED_IMAGE_PNG_BACKGROUND GFXON
// #define GDISP_NEED_IMAGE_PNG_ALPHACLIFF 32
-// #define GDISP_NEED_IMAGE_PNG_PALETTE_124 TRUE
-// #define GDISP_NEED_IMAGE_PNG_PALETTE_8 TRUE
-// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 TRUE
-// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 TRUE
-// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 TRUE
-// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 TRUE
-// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 TRUE
-// #define GDISP_NEED_IMAGE_PNG_RGB_8 TRUE
-// #define GDISP_NEED_IMAGE_PNG_RGB_16 TRUE
-// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 TRUE
-// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 TRUE
+// #define GDISP_NEED_IMAGE_PNG_PALETTE_124 GFXON
+// #define GDISP_NEED_IMAGE_PNG_PALETTE_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGB_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGB_16 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 GFXON
+// #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 GFXON
// #define GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE 32
// #define GDISP_IMAGE_PNG_FILE_BUFFER_SIZE 8
// #define GDISP_IMAGE_PNG_Z_BUFFER_SIZE 32768
-// #define GDISP_NEED_IMAGE_ACCOUNTING FALSE
+// #define GDISP_NEED_IMAGE_ACCOUNTING GFXOFF
-//#define GDISP_NEED_PIXMAP FALSE
-// #define GDISP_NEED_PIXMAP_IMAGE FALSE
+//#define GDISP_NEED_PIXMAP GFXOFF
+// #define GDISP_NEED_PIXMAP_IMAGE GFXOFF
//#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE // If not defined the native hardware orientation is used.
//#define GDISP_LINEBUF_SIZE 128
//#define GDISP_STARTUP_COLOR Black
-//#define GDISP_NEED_STARTUP_LOGO TRUE
+//#define GDISP_NEED_STARTUP_LOGO GFXON
//#define GDISP_TOTAL_DISPLAYS 1
//#define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_Win32
// #ifdef GDISP_DRIVER_LIST
-// // For code and speed optimization define as TRUE or FALSE if all controllers have the same capability
-// #define GDISP_HARDWARE_STREAM_WRITE FALSE
-// #define GDISP_HARDWARE_STREAM_READ FALSE
-// #define GDISP_HARDWARE_STREAM_POS FALSE
-// #define GDISP_HARDWARE_DRAWPIXEL FALSE
-// #define GDISP_HARDWARE_CLEARS FALSE
-// #define GDISP_HARDWARE_FILLS FALSE
-// #define GDISP_HARDWARE_BITFILLS FALSE
-// #define GDISP_HARDWARE_SCROLL FALSE
-// #define GDISP_HARDWARE_PIXELREAD FALSE
-// #define GDISP_HARDWARE_CONTROL FALSE
-// #define GDISP_HARDWARE_QUERY FALSE
-// #define GDISP_HARDWARE_CLIP FALSE
+// // For code and speed optimization define as GFXON or GFXOFF if all controllers have the same capability
+// #define GDISP_HARDWARE_STREAM_WRITE GFXOFF
+// #define GDISP_HARDWARE_STREAM_READ GFXOFF
+// #define GDISP_HARDWARE_STREAM_POS GFXOFF
+// #define GDISP_HARDWARE_DRAWPIXEL GFXOFF
+// #define GDISP_HARDWARE_CLEARS GFXOFF
+// #define GDISP_HARDWARE_FILLS GFXOFF
+// #define GDISP_HARDWARE_BITFILLS GFXOFF
+// #define GDISP_HARDWARE_SCROLL GFXOFF
+// #define GDISP_HARDWARE_PIXELREAD GFXOFF
+// #define GDISP_HARDWARE_CONTROL GFXOFF
+// #define GDISP_HARDWARE_QUERY GFXOFF
+// #define GDISP_HARDWARE_CLIP GFXOFF
// #define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
// #endif
-//#define GDISP_USE_GFXNET FALSE
+//#define GDISP_USE_GFXNET GFXOFF
// #define GDISP_GFXNET_PORT 13001
-// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE
-// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
-// #define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
+// #define GDISP_GFXNET_CUSTOM_LWIP_STARTUP GFXOFF
+// #define GDISP_DONT_WAIT_FOR_NET_DISPLAY GFXOFF
+// #define GDISP_GFXNET_UNSAFE_SOCKETS GFXOFF
///////////////////////////////////////////////////////////////////////////
// GWIN //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GWIN FALSE
+//#define GFX_USE_GWIN GFXOFF
-//#define GWIN_NEED_WINDOWMANAGER FALSE
-// #define GWIN_REDRAW_IMMEDIATE FALSE
-// #define GWIN_REDRAW_SINGLEOP FALSE
-// #define GWIN_NEED_FLASHING FALSE
+//#define GWIN_NEED_WINDOWMANAGER GFXOFF
+// #define GWIN_REDRAW_IMMEDIATE GFXOFF
+// #define GWIN_REDRAW_SINGLEOP GFXOFF
+// #define GWIN_NEED_FLASHING GFXOFF
// #define GWIN_FLASHING_PERIOD 250
-//#define GWIN_NEED_CONSOLE FALSE
-// #define GWIN_CONSOLE_USE_HISTORY FALSE
-// #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE
-// #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE
-// #define GWIN_CONSOLE_ESCSEQ FALSE
-// #define GWIN_CONSOLE_USE_BASESTREAM FALSE
-// #define GWIN_CONSOLE_USE_FLOAT FALSE
-//#define GWIN_NEED_GRAPH FALSE
-//#define GWIN_NEED_GL3D FALSE
-
-//#define GWIN_NEED_WIDGET FALSE
+//#define GWIN_NEED_CONSOLE GFXOFF
+// #define GWIN_CONSOLE_USE_HISTORY GFXOFF
+// #define GWIN_CONSOLE_HISTORY_AVERAGING GFXOFF
+// #define GWIN_CONSOLE_HISTORY_ATCREATE GFXOFF
+// #define GWIN_CONSOLE_ESCSEQ GFXOFF
+// #define GWIN_CONSOLE_USE_BASESTREAM GFXOFF
+// #define GWIN_CONSOLE_USE_FLOAT GFXOFF
+//#define GWIN_NEED_GRAPH GFXOFF
+//#define GWIN_NEED_GL3D GFXOFF
+
+//#define GWIN_NEED_WIDGET GFXOFF
//#define GWIN_FOCUS_HIGHLIGHT_WIDTH 1
-// #define GWIN_NEED_LABEL FALSE
-// #define GWIN_LABEL_ATTRIBUTE FALSE
-// #define GWIN_NEED_BUTTON FALSE
-// #define GWIN_BUTTON_LAZY_RELEASE FALSE
-// #define GWIN_NEED_SLIDER FALSE
-// #define GWIN_SLIDER_NOSNAP FALSE
+// #define GWIN_NEED_LABEL GFXOFF
+// #define GWIN_LABEL_ATTRIBUTE GFXOFF
+// #define GWIN_NEED_BUTTON GFXOFF
+// #define GWIN_BUTTON_LAZY_RELEASE GFXOFF
+// #define GWIN_NEED_SLIDER GFXOFF
+// #define GWIN_SLIDER_NOSNAP GFXOFF
// #define GWIN_SLIDER_DEAD_BAND 5
// #define GWIN_SLIDER_TOGGLE_INC 20
-// #define GWIN_NEED_CHECKBOX FALSE
-// #define GWIN_NEED_IMAGE FALSE
-// #define GWIN_NEED_IMAGE_ANIMATION FALSE
-// #define GWIN_NEED_RADIO FALSE
-// #define GWIN_NEED_LIST FALSE
-// #define GWIN_NEED_LIST_IMAGES FALSE
-// #define GWIN_NEED_PROGRESSBAR FALSE
-// #define GWIN_PROGRESSBAR_AUTO FALSE
-// #define GWIN_NEED_KEYBOARD FALSE
+// #define GWIN_NEED_CHECKBOX GFXOFF
+// #define GWIN_NEED_IMAGE GFXOFF
+// #define GWIN_NEED_IMAGE_ANIMATION GFXOFF
+// #define GWIN_NEED_RADIO GFXOFF
+// #define GWIN_NEED_LIST GFXOFF
+// #define GWIN_NEED_LIST_IMAGES GFXOFF
+// #define GWIN_NEED_PROGRESSBAR GFXOFF
+// #define GWIN_PROGRESSBAR_AUTO GFXOFF
+// #define GWIN_NEED_KEYBOARD GFXOFF
// #define GWIN_KEYBOARD_DEFAULT_LAYOUT VirtualKeyboard_English1
-// #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE
-// #define GWIN_NEED_TEXTEDIT FALSE
-// #define GWIN_FLAT_STYLING FALSE
-// #define GWIN_WIDGET_TAGS FALSE
-
-//#define GWIN_NEED_CONTAINERS FALSE
-// #define GWIN_NEED_CONTAINER FALSE
-// #define GWIN_NEED_FRAME FALSE
-// #define GWIN_NEED_TABSET FALSE
+// #define GWIN_NEED_KEYBOARD_ENGLISH1 GFXON
+// #define GWIN_NEED_TEXTEDIT GFXOFF
+// #define GWIN_FLAT_STYLING GFXOFF
+// #define GWIN_WIDGET_TAGS GFXOFF
+
+//#define GWIN_NEED_CONTAINERS GFXOFF
+// #define GWIN_NEED_CONTAINER GFXOFF
+// #define GWIN_NEED_FRAME GFXOFF
+// #define GWIN_NEED_TABSET GFXOFF
// #define GWIN_TABSET_TABHEIGHT 18
///////////////////////////////////////////////////////////////////////////
// GTRANS //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GTRANS FALSE
+//#define GFX_USE_GTRANS GFXOFF
///////////////////////////////////////////////////////////////////////////
// GEVENT //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GEVENT FALSE
+//#define GFX_USE_GEVENT GFXOFF
-//#define GEVENT_ASSERT_NO_RESOURCE FALSE
+//#define GEVENT_ASSERT_NO_RESOURCE GFXOFF
//#define GEVENT_MAXIMUM_SIZE 32
//#define GEVENT_MAX_SOURCE_LISTENERS 32
@@ -257,7 +262,7 @@
///////////////////////////////////////////////////////////////////////////
// GTIMER //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GTIMER FALSE
+//#define GFX_USE_GTIMER GFXOFF
//#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
//#define GTIMER_THREAD_WORKAREA_SIZE 2048
@@ -266,89 +271,93 @@
///////////////////////////////////////////////////////////////////////////
// GQUEUE //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GQUEUE FALSE
+//#define GFX_USE_GQUEUE GFXOFF
-//#define GQUEUE_NEED_ASYNC FALSE
-//#define GQUEUE_NEED_GSYNC FALSE
-//#define GQUEUE_NEED_FSYNC FALSE
-//#define GQUEUE_NEED_BUFFERS FALSE
+//#define GQUEUE_NEED_ASYNC GFXOFF
+//#define GQUEUE_NEED_GSYNC GFXOFF
+//#define GQUEUE_NEED_FSYNC GFXOFF
+//#define GQUEUE_NEED_BUFFERS GFXOFF
///////////////////////////////////////////////////////////////////////////
// GINPUT //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GINPUT FALSE
+//#define GFX_USE_GINPUT GFXOFF
-//#define GINPUT_NEED_MOUSE FALSE
-// #define GINPUT_TOUCH_STARTRAW FALSE
-// #define GINPUT_TOUCH_NOTOUCH FALSE
-// #define GINPUT_TOUCH_NOCALIBRATE FALSE
-// #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE
+//#define GINPUT_NEED_MOUSE GFXOFF
+// #define GINPUT_TOUCH_STARTRAW GFXOFF
+// #define GINPUT_TOUCH_NOTOUCH GFXOFF
+// #define GINPUT_TOUCH_NOCALIBRATE GFXOFF
+// #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF
// #define GINPUT_MOUSE_POLL_PERIOD 25
// #define GINPUT_MOUSE_CLICK_TIME 300
// #define GINPUT_TOUCH_CXTCLICK_TIME 700
-// #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE
-// #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE
+// #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF
+// #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF
// #define GMOUSE_DRIVER_LIST GMOUSEVMT_Win32, GMOUSEVMT_Win32
-//#define GINPUT_NEED_KEYBOARD FALSE
+// #define GINPUT_TOUCH_CALIBRATION_FONT1 "* Double"
+// #define GINPUT_TOUCH_CALIBRATION_FONT2 "* Narrow"
+// #define GINPUT_TOUCH_CALIBRATION_TITLE "Calibration"
+// #define GINPUT_TOUCH_CALIBRATION_ERROR "Calibration Failed!"
+//#define GINPUT_NEED_KEYBOARD GFXOFF
// #define GINPUT_KEYBOARD_POLL_PERIOD 200
// #define GKEYBOARD_DRIVER_LIST GKEYBOARDVMT_Win32, GKEYBOARDVMT_Win32
-// #define GKEYBOARD_LAYOUT_OFF FALSE
-// #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE
-//#define GINPUT_NEED_TOGGLE FALSE
-//#define GINPUT_NEED_DIAL FALSE
+// #define GKEYBOARD_LAYOUT_OFF GFXOFF
+// #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF
+//#define GINPUT_NEED_TOGGLE GFXOFF
+//#define GINPUT_NEED_DIAL GFXOFF
///////////////////////////////////////////////////////////////////////////
// GFILE //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GFILE FALSE
-
-//#define GFILE_NEED_PRINTG FALSE
-//#define GFILE_NEED_SCANG FALSE
-//#define GFILE_NEED_STRINGS FALSE
-//#define GFILE_NEED_FILELISTS FALSE
-//#define GFILE_NEED_STDIO FALSE
-//#define GFILE_NEED_NOAUTOMOUNT FALSE
-//#define GFILE_NEED_NOAUTOSYNC FALSE
-
-//#define GFILE_NEED_MEMFS FALSE
-//#define GFILE_NEED_ROMFS FALSE
-//#define GFILE_NEED_RAMFS FALSE
-//#define GFILE_NEED_FATFS FALSE
-//#define GFILE_NEED_NATIVEFS FALSE
-//#define GFILE_NEED_CHBIOSFS FALSE
-//#define GFILE_NEED_USERFS FALSE
-
-//#define GFILE_ALLOW_FLOATS FALSE
-//#define GFILE_ALLOW_DEVICESPECIFIC FALSE
+//#define GFX_USE_GFILE GFXOFF
+
+//#define GFILE_NEED_PRINTG GFXOFF
+//#define GFILE_NEED_SCANG GFXOFF
+//#define GFILE_NEED_STRINGS GFXOFF
+//#define GFILE_NEED_FILELISTS GFXOFF
+//#define GFILE_NEED_STDIO GFXOFF
+//#define GFILE_NEED_NOAUTOMOUNT GFXOFF
+//#define GFILE_NEED_NOAUTOSYNC GFXOFF
+
+//#define GFILE_NEED_MEMFS GFXOFF
+//#define GFILE_NEED_ROMFS GFXOFF
+//#define GFILE_NEED_RAMFS GFXOFF
+//#define GFILE_NEED_FATFS GFXOFF
+//#define GFILE_NEED_NATIVEFS GFXOFF
+//#define GFILE_NEED_CHBIOSFS GFXOFF
+//#define GFILE_NEED_USERFS GFXOFF
+
+//#define GFILE_ALLOW_FLOATS GFXOFF
+//#define GFILE_ALLOW_DEVICESPECIFIC GFXOFF
//#define GFILE_MAX_GFILES 3
///////////////////////////////////////////////////////////////////////////
// GADC //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GADC FALSE
+//#define GFX_USE_GADC GFXOFF
// #define GADC_MAX_LOWSPEED_DEVICES 4
///////////////////////////////////////////////////////////////////////////
// GAUDIO //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GAUDIO FALSE
-// #define GAUDIO_NEED_PLAY FALSE
-// #define GAUDIO_NEED_RECORD FALSE
+//#define GFX_USE_GAUDIO GFXOFF
+// #define GAUDIO_NEED_PLAY GFXOFF
+// #define GAUDIO_NEED_RECORD GFXOFF
///////////////////////////////////////////////////////////////////////////
// GMISC //
///////////////////////////////////////////////////////////////////////////
-//#define GFX_USE_GMISC FALSE
-
-//#define GMISC_NEED_ARRAYOPS FALSE
-//#define GMISC_NEED_FASTTRIG FALSE
-//#define GMISC_NEED_FIXEDTRIG FALSE
-//#define GMISC_NEED_INVSQRT FALSE
-// #define GMISC_INVSQRT_MIXED_ENDIAN FALSE
-// #define GMISC_INVSQRT_REAL_SLOW FALSE
-//#define GMISC_NEED_MATRIXFLOAT2D FALSE
-//#define GMISC_NEED_MATRIXFIXED2D FALSE
-//#define GMISC_NEED_HITTEST_POLY FALSE
+//#define GFX_USE_GMISC GFXOFF
+
+//#define GMISC_NEED_ARRAYOPS GFXOFF
+//#define GMISC_NEED_FASTTRIG GFXOFF
+//#define GMISC_NEED_FIXEDTRIG GFXOFF
+//#define GMISC_NEED_INVSQRT GFXOFF
+// #define GMISC_INVSQRT_MIXED_ENDIAN GFXOFF
+// #define GMISC_INVSQRT_REAL_SLOW GFXOFF
+//#define GMISC_NEED_MATRIXFLOAT2D GFXOFF
+//#define GMISC_NEED_MATRIXFIXED2D GFXOFF
+//#define GMISC_NEED_HITTEST_POLY GFXOFF
#endif /* _GFXCONF_H */
diff --git a/src/gadc/gadc_rules.h b/src/gadc/gadc_rules.h
index af863765..ec1331f2 100644
--- a/src/gadc/gadc_rules.h
+++ b/src/gadc/gadc_rules.h
@@ -20,28 +20,28 @@
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you."
+ #warning "GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GADC: GFX_USE_GTIMER is required if GFX_USE_GADC is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#endif
#if !GFX_USE_GQUEUE || !GQUEUE_NEED_GSYNC || !GQUEUE_NEED_BUFFERS
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is TRUE. They have been turned on for you."
+ #warning "GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is GFXON. They have been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is TRUE. They have been turned on for you.")
+ COMPILER_WARNING("GADC: GFX_USE_GQUEUE, GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GADC is GFXON. They have been turned on for you.")
#endif
#endif
#undef GFX_USE_GQUEUE
- #define GFX_USE_GQUEUE TRUE
+ #define GFX_USE_GQUEUE GFXON
#undef GQUEUE_NEED_BUFFERS
- #define GQUEUE_NEED_BUFFERS TRUE
+ #define GQUEUE_NEED_BUFFERS GFXON
#undef GQUEUE_NEED_GSYNC
- #define GQUEUE_NEED_GSYNC TRUE
+ #define GQUEUE_NEED_GSYNC GFXON
#endif
#endif
diff --git a/src/gaudio/gaudio_options.h b/src/gaudio/gaudio_options.h
index d6dfb105..41373c8f 100644
--- a/src/gaudio/gaudio_options.h
+++ b/src/gaudio/gaudio_options.h
@@ -24,13 +24,13 @@
* @brief Audio Play capability is needed
*/
#ifndef GAUDIO_NEED_PLAY
- #define GAUDIO_NEED_PLAY FALSE
+ #define GAUDIO_NEED_PLAY GFXOFF
#endif
/**
* @brief Audio Recording capability is needed
*/
#ifndef GAUDIO_NEED_RECORD
- #define GAUDIO_NEED_RECORD FALSE
+ #define GAUDIO_NEED_RECORD GFXOFF
#endif
/**
* @}
diff --git a/src/gaudio/gaudio_rules.h b/src/gaudio/gaudio_rules.h
index 7ab587da..71b732b3 100644
--- a/src/gaudio/gaudio_rules.h
+++ b/src/gaudio/gaudio_rules.h
@@ -18,53 +18,53 @@
#if GFX_USE_GAUDIO
#if !GAUDIO_NEED_PLAY && !GAUDIO_NEED_RECORD
- #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is TRUE"
+ #error "GAUDIO: GAUDIO_NEED_PLAY and/or GAUDIO_NEED_RECORD is required if GFX_USE_GAUDIO is GFXON"
#endif
#if !GFX_USE_GQUEUE
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you."
+ #warning "GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GAUDIO: GFX_USE_GQUEUE is required if GFX_USE_GAUDIO is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GQUEUE
- #define GFX_USE_GQUEUE TRUE
+ #define GFX_USE_GQUEUE GFXON
#endif
#if GAUDIO_NEED_PLAY && !GQUEUE_NEED_ASYNC
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you."
+ #warning "GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GAUDIO: GQUEUE_NEED_ASYNC is required if GAUDIO_NEED_PLAY is GFXON. It has been turned on for you.")
#endif
#endif
#undef GQUEUE_NEED_ASYNC
- #define GQUEUE_NEED_ASYNC TRUE
+ #define GQUEUE_NEED_ASYNC GFXON
#endif
#if !GQUEUE_NEED_GSYNC || !GQUEUE_NEED_BUFFERS
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you."
+ #warning "GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is TRUE. They have been turned on for you.")
+ COMPILER_WARNING("GAUDIO: GQUEUE_NEED_BUFFERS and GQUEUE_NEED_GSYNC are required if GFX_USE_GAUDIO is GFXON. They have been turned on for you.")
#endif
#endif
#undef GQUEUE_NEED_BUFFERS
- #define GQUEUE_NEED_BUFFERS TRUE
+ #define GQUEUE_NEED_BUFFERS GFXON
#undef GQUEUE_NEED_GSYNC
- #define GQUEUE_NEED_GSYNC TRUE
+ #define GQUEUE_NEED_GSYNC GFXON
#endif
#if GFX_USE_GEVENT && !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you."
+ #warning "GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GAUDIO: GFX_USE_GTIMER is required if GFX_USE_GAUDIO and GFX_USE_GEVENT are GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#endif
#endif
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c
index c2439a16..ad5386fc 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp.c
@@ -42,7 +42,7 @@ GDisplay *GDISP;
#define MUTEX_DEINIT(g)
#endif
-#define NEED_CLIPPING (GDISP_HARDWARE_CLIP != TRUE && (GDISP_NEED_VALIDATION || GDISP_NEED_CLIP))
+#define NEED_CLIPPING (GDISP_HARDWARE_CLIP != GFXON && (GDISP_NEED_VALIDATION || GDISP_NEED_CLIP))
#if !NEED_CLIPPING
#define TEST_CLIP_AREA(g)
@@ -119,7 +119,7 @@ static GFXINLINE void drawpixel(GDisplay *g) {
#endif
// Next best is cursor based streaming
- #if GDISP_HARDWARE_DRAWPIXEL != TRUE && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_DRAWPIXEL != GFXON && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_POS == HARDWARE_AUTODETECT
if (gvmt(g)->writepos)
#endif
@@ -133,7 +133,7 @@ static GFXINLINE void drawpixel(GDisplay *g) {
#endif
// Worst is general streaming
- #if GDISP_HARDWARE_DRAWPIXEL != TRUE && GDISP_HARDWARE_STREAM_POS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_DRAWPIXEL != GFXON && GDISP_HARDWARE_STREAM_POS != GFXON && GDISP_HARDWARE_STREAM_WRITE
// The following test is unneeded because we are guaranteed to have streaming if we don't have drawpixel
//#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
// if (gvmt(g)->writestart)
@@ -191,7 +191,7 @@ static GFXINLINE void fillarea(GDisplay *g) {
#endif
// Next best is hardware streaming
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -221,7 +221,7 @@ static GFXINLINE void fillarea(GDisplay *g) {
#endif
// Worst is pixel drawing
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -289,7 +289,7 @@ static void hline_clip(GDisplay *g) {
#endif
// Next best is cursor based streaming
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_POS && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_POS == HARDWARE_AUTODETECT
if (gvmt(g)->writepos)
#endif
@@ -304,7 +304,7 @@ static void hline_clip(GDisplay *g) {
#endif
// Next best is streaming
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_POS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_POS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -319,7 +319,7 @@ static void hline_clip(GDisplay *g) {
#endif
// Worst is drawing pixels
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -383,7 +383,7 @@ static void vline_clip(GDisplay *g) {
#endif
// Next best is streaming
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -410,7 +410,7 @@ static void vline_clip(GDisplay *g) {
#endif
// Worst is drawing pixels
- #if GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -770,7 +770,7 @@ void gdispGFlush(GDisplay *g) {
#endif
// Worst - save the parameters and use pixel drawing and/or area fills
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -816,7 +816,7 @@ void gdispGFlush(GDisplay *g) {
#endif
// Next best is to use bitfills with our line buffer
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS
#if GDISP_HARDWARE_BITFILLS == HARDWARE_AUTODETECT
if (gvmt(g)->blit)
#endif
@@ -856,7 +856,7 @@ void gdispGFlush(GDisplay *g) {
#endif
// Only slightly better than drawing pixels is to look for runs and use fillarea
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS
// We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming.
#if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT
if (gvmt(g)->fill)
@@ -892,7 +892,7 @@ void gdispGFlush(GDisplay *g) {
#endif
// Worst is using pixel drawing
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -934,7 +934,7 @@ void gdispGFlush(GDisplay *g) {
}
#endif
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_LINEBUF_SIZE != 0 && GDISP_HARDWARE_BITFILLS
#if GDISP_HARDWARE_BITFILLS == HARDWARE_AUTODETECT
if (gvmt(g)->blit)
#endif
@@ -951,7 +951,7 @@ void gdispGFlush(GDisplay *g) {
}
#endif
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS
// We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming.
#if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT
if (gvmt(g)->fill)
@@ -969,7 +969,7 @@ void gdispGFlush(GDisplay *g) {
}
#endif
- #if GDISP_HARDWARE_STREAM_WRITE != TRUE && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != TRUE) && GDISP_HARDWARE_FILLS != TRUE
+ #if GDISP_HARDWARE_STREAM_WRITE != GFXON && (GDISP_LINEBUF_SIZE == 0 || GDISP_HARDWARE_BITFILLS != GFXON) && GDISP_HARDWARE_FILLS != GFXON
{
autoflush_stopdone(g);
MUTEX_EXIT(g);
@@ -1019,7 +1019,7 @@ void gdispGClear(GDisplay *g, color_t color) {
#endif
// Next best is hardware accelerated area fill
- #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS
+ #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS
#if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT
if (gvmt(g)->fill)
#endif
@@ -1036,7 +1036,7 @@ void gdispGClear(GDisplay *g, color_t color) {
#endif
// Next best is streaming
- #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -1066,7 +1066,7 @@ void gdispGClear(GDisplay *g, color_t color) {
#endif
// Worst is drawing pixels
- #if GDISP_HARDWARE_CLEARS != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_CLEARS != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -1137,7 +1137,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Next best is hardware streaming
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -1173,7 +1173,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Only slightly better than drawing pixels is to look for runs and use fill area
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS
// We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming.
#if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT
if (gvmt(g)->fill)
@@ -1208,7 +1208,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Worst is drawing pixels
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -1255,7 +1255,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Worst is using software clipping
- #if GDISP_HARDWARE_CLIP != TRUE
+ #if GDISP_HARDWARE_CLIP != GFXON
{
if (x < 0) { cx += x; x = 0; }
if (y < 0) { cy += y; y = 0; }
@@ -2603,7 +2603,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
return c;
}
#endif
- #if GDISP_HARDWARE_PIXELREAD != TRUE && GDISP_HARDWARE_STREAM_READ
+ #if GDISP_HARDWARE_PIXELREAD != GFXON && GDISP_HARDWARE_STREAM_READ
#if GDISP_HARDWARE_STREAM_READ == HARDWARE_AUTODETECT
if (gvmt(g)->readcolor)
#endif
@@ -2620,7 +2620,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
return c;
}
#endif
- #if GDISP_HARDWARE_PIXELREAD != TRUE && GDISP_HARDWARE_STREAM_READ != TRUE
+ #if GDISP_HARDWARE_PIXELREAD != GFXON && GDISP_HARDWARE_STREAM_READ != GFXON
#if !GDISP_HARDWARE_PIXELREAD && !GDISP_HARDWARE_STREAM_READ
// Worst is "not possible"
#error "GDISP: GDISP_NEED_PIXELREAD has been set but there is no hardware support for reading the display"
@@ -2634,7 +2634,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#if GDISP_NEED_SCROLL
void gdispGVerticalScroll(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, int lines, color_t bgcolor) {
coord_t abslines;
- #if GDISP_HARDWARE_SCROLL != TRUE
+ #if GDISP_HARDWARE_SCROLL != GFXON
coord_t fy, dy, ix, fx, i, j;
#endif
@@ -2682,7 +2682,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Scroll Emulation
- #if GDISP_HARDWARE_SCROLL != TRUE
+ #if GDISP_HARDWARE_SCROLL != GFXON
{
cy -= abslines;
if (lines < 0) {
@@ -2726,7 +2726,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Next best line read is single pixel reads
- #if GDISP_HARDWARE_STREAM_READ != TRUE && GDISP_HARDWARE_PIXELREAD
+ #if GDISP_HARDWARE_STREAM_READ != GFXON && GDISP_HARDWARE_PIXELREAD
#if GDISP_HARDWARE_PIXELREAD == HARDWARE_AUTODETECT
if (gvmt(g)->get)
#endif
@@ -2775,7 +2775,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Next best line write is hardware streaming
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE
#if GDISP_HARDWARE_STREAM_WRITE == HARDWARE_AUTODETECT
if (gvmt(g)->writestart)
#endif
@@ -2800,7 +2800,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Next best line write is drawing pixels in combination with filling
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS && GDISP_HARDWARE_DRAWPIXEL
// We don't need to test for auto-detect on drawpixel as we know we have it because we don't have streaming.
#if GDISP_HARDWARE_FILLS == HARDWARE_AUTODETECT
if (gvmt(g)->fill)
@@ -2832,7 +2832,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Worst line write is drawing pixels
- #if GDISP_HARDWARE_BITFILLS != TRUE && GDISP_HARDWARE_STREAM_WRITE != TRUE && GDISP_HARDWARE_FILLS != TRUE && GDISP_HARDWARE_DRAWPIXEL
+ #if GDISP_HARDWARE_BITFILLS != GFXON && GDISP_HARDWARE_STREAM_WRITE != GFXON && GDISP_HARDWARE_FILLS != GFXON && GDISP_HARDWARE_DRAWPIXEL
// The following test is unneeded because we are guaranteed to have draw pixel if we don't have streaming
//#if GDISP_HARDWARE_DRAWPIXEL == HARDWARE_AUTODETECT
// if (gvmt(g)->pixel)
@@ -2906,7 +2906,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c
#endif
// Worst is software clipping
- #if GDISP_HARDWARE_CLIP != TRUE
+ #if GDISP_HARDWARE_CLIP != GFXON
{
g->clipx0 = 0;
g->clipy0 = 0;
diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h
index 4a097604..5bf2b284 100644
--- a/src/gdisp/gdisp.h
+++ b/src/gdisp/gdisp.h
@@ -15,7 +15,7 @@
*
* @details The GDISP module provides high level abstraction to interface pixel oriented graphic displays.
*
- * @pre GFX_USE_GDISP must be set to TRUE in gfxconf.h
+ * @pre GFX_USE_GDISP must be set to GFXON in gfxconf.h
*
* @note Each drawing routine supports a gdispXXXX and a gdispGXXXX function. The difference is that the
* gdispXXXX function does not require a display to be specified. Note there is a slight anomaly
@@ -30,7 +30,7 @@
#include "../../gfx.h"
/* This type definition is defined here as it gets used in other gfx sub-systems even
- * if GFX_USE_GDISP is FALSE.
+ * if GFX_USE_GDISP is GFXOFF.
*/
/**
@@ -201,15 +201,15 @@ extern GDisplay *GDISP;
* @note Packed pixels are not really supported at this point.
*/
#ifndef GDISP_PACKED_PIXELS
- #define GDISP_PACKED_PIXELS FALSE
+ #define GDISP_PACKED_PIXELS GFXOFF
#endif
/**
* @brief Do lines of pixels require packing for a blit
- * @note Ignored if GDISP_PACKED_PIXELS is FALSE
+ * @note Ignored if GDISP_PACKED_PIXELS is GFXOFF
*/
#ifndef GDISP_PACKED_LINES
- #define GDISP_PACKED_LINES FALSE
+ #define GDISP_PACKED_LINES GFXOFF
#endif
/** @} */
@@ -377,7 +377,7 @@ uint8_t gdispGGetContrast(GDisplay *g);
* know your controller does not need to be flushed there is no
* need to call it (which is in reality most controllers).
* @note Even for displays that require flushing, there is no need to
- * call this function if GDISP_NEED_AUTOFLUSH is TRUE.
+ * call this function if GDISP_NEED_AUTOFLUSH is GFXON.
* Calling it again won't hurt though.
*
*
@@ -478,7 +478,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Start a streaming operation.
* @details Stream data to a window on the display sequentially and very fast.
- * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h
* @note While streaming is in operation - no other calls to GDISP functions
* can be made (with the exception of @p gdispBlendColor() and streaming
* functions). If a call is made (eg in a multi-threaded application) the other
@@ -505,7 +505,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Send pixel data to the stream.
* @details Write a pixel to the next position in the streamed area and increment the position
- * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h
* @pre @p gdispStreamStart() has been called.
* @note If the gdispStreamStart() has not been called (or failed due to clipping), the
* data provided here is simply thrown away.
@@ -521,7 +521,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Finish the current streaming operation.
* @details Completes the current streaming operation and allows other GDISP calls to operate again.
- * @pre GDISP_NEED_STREAMING must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_STREAMING must be GFXON in your gfxconf.h
* @pre @p gdispStreamStart() has been called.
* @note If the gdispStreamStart() has not been called (or failed due to clipping), this
* call is simply ignored.
@@ -539,7 +539,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_CLIP || defined(__DOXYGEN__)
/**
* @brief Clip all drawing to the defined area.
- * @pre GDISP_NEED_CLIP must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CLIP must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The start position
@@ -556,7 +556,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_CIRCLE || defined(__DOXYGEN__)
/**
* @brief Draw a circle.
- * @pre GDISP_NEED_CIRCLE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CIRCLE must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the circle
@@ -570,7 +570,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a filled circle.
- * @pre GDISP_NEED_CIRCLE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CIRCLE must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the circle
@@ -586,7 +586,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_DUALCIRCLE || defined(__DOXYGEN__)
/**
* @brief Draw two filled circles with the same centre.
- * @pre GDISP_NEED_DUALCIRCLE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the circle
@@ -606,7 +606,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_ELLIPSE || defined(__DOXYGEN__)
/**
* @brief Draw an ellipse.
- * @pre GDISP_NEED_ELLIPSE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ELLIPSE must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the ellipse
@@ -620,7 +620,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a filled ellipse.
- * @pre GDISP_NEED_ELLIPSE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ELLIPSE must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the ellipse
@@ -637,7 +637,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__)
/**
* @brief Draw a selection of 45 degree arcs of a circle
- * @pre GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the circle
@@ -666,7 +666,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Fill a selection of 45 degree arcs of a circle
- * @pre GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center of the circle
@@ -697,7 +697,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_ARC || defined(__DOXYGEN__)
/**
* @brief Draw an arc.
- * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center point
@@ -722,7 +722,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a thick arc.
- * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] xc,yc The center point
@@ -747,7 +747,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a filled arc.
- * @pre GDISP_NEED_ARC must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARC must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The center point
@@ -777,7 +777,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get the color of a pixel.
* @return The color of the pixel.
- * @pre GDISP_NEED_PIXELREAD must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_PIXELREAD must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position of the pixel
@@ -793,7 +793,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_SCROLL || defined(__DOXYGEN__)
/**
* @brief Scroll vertically a section of the screen.
- * @pre GDISP_NEED_SCROLL must be set to TRUE in gfxconf.h
+ * @pre GDISP_NEED_SCROLL must be set to GFXON in gfxconf.h
* @note Optional.
* @note If lines is >= cy, it is equivelent to an area fill with bgcolor.
*
@@ -814,7 +814,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_CONTROL || defined(__DOXYGEN__)
/**
* @brief Control hardware specific parts of the display. eg powermodes, backlight etc
- * @pre GDISP_NEED_CONTROL must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CONTROL must be GFXON in your gfxconf.h
* @note Depending on the hardware implementation this function may not
* support some codes. They will be ignored.
*
@@ -833,7 +833,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_QUERY || defined(__DOXYGEN__)
/**
* @brief Query a property of the display.
- * @pre GDISP_NEED_QUERY must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_QUERY must be GFXON in your gfxconf.h
* @note The result must be typecast to the correct type.
* @note An unsupported query will return (void *)-1.
*
@@ -849,7 +849,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_CONVEX_POLYGON || defined(__DOXYGEN__)
/**
* @brief Draw an enclosed polygon (convex, non-convex or complex).
- * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] tx, ty Transform all points in pntarray by tx, ty
@@ -865,7 +865,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Fill a convex polygon
* @details Doesn't handle non-convex or complex polygons.
- * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] tx, ty Transform all points in pntarray by tx, ty
@@ -890,7 +890,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
* @brief Draw a line with a specified thickness
* @details The line thickness is specified in pixels. The line ends can
* be selected to be either flat or round.
- * @pre GDISP_NEED_CONVEX_POLYGON must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_CONVEX_POLYGON must be GFXON in your gfxconf.h
* @note Uses gdispGFillConvexPoly() internally to perform the drawing.
*
* @param[in] g The display to use
@@ -911,7 +911,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_TEXT || defined(__DOXYGEN__)
/**
* @brief Draw a text character.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position for the text
@@ -926,7 +926,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a text character with a filled background.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position for the text
@@ -942,7 +942,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a text string.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position for the text
@@ -957,7 +957,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a text string.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position for the text
@@ -973,7 +973,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a text string vertically centered within the specified box.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The position for the text (need to define top-right or base-line - check code)
@@ -990,7 +990,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a text string vertically centered within the specified box. The box background is filled with the specified background color.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
* @note The entire box is filled
*
* @param[in] g The display to use
@@ -1010,7 +1010,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get a metric of a font.
* @return The metric requested in pixels.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] font The font to test
* @param[in] metric The metric to measure
@@ -1022,7 +1022,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get the pixel width of a character.
* @return The width of the character in pixels. Does not include any between character padding.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] c The character to draw
* @param[in] font The font to use
@@ -1034,7 +1034,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get the pixel width of a string of a given character length.
* @return The width of the string in pixels.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @note Passing 0 to count has the same effect as calling gdispGetStringWidt()
*
@@ -1049,7 +1049,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get the pixel width of an entire string.
* @return The width of the string in pixels.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] str The string to measure
* @param[in] font The font to use
@@ -1062,7 +1062,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
* @brief Find a font and return it.
* @details The supplied name is matched against the font name. A '*' will replace 0 or more characters.
* @return Returns a font or NULL if no matching font could be found.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] name The font name to find.
*
@@ -1074,7 +1074,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Release a font after use.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] font The font to release.
*
@@ -1086,7 +1086,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
* @brief Make a scaled copy of an existing font.
* @details Allocates memory for new font metadata using gfxAlloc, remember to close font after use!
* @return A new font or NULL if out of memory.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
* @note A scaled font should probably not be added to the font list as it will prevent the
* unscaled font of the same name being found as it will be the scaled version that will be found.
*
@@ -1099,7 +1099,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Get the name of the specified font.
* @returns The name of the font.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] font The font to get the name for.
*
@@ -1110,7 +1110,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Add a font permanently to the font list.
* @returns TRUE on success. Reasons it may fail: out of memory, if it is already on the list, it is not a font loaded in RAM.
- * @pre GDISP_NEED_TEXT must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be GFXON in your gfxconf.h
*
* @param[in] font The font to add to the font list.
*
@@ -1124,7 +1124,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#if GDISP_NEED_ARC || GDISP_NEED_ARCSECTORS || defined(__DOXYGEN__)
/**
* @brief Draw a rectangular box with rounded corners
- * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The start position
@@ -1139,7 +1139,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/**
* @brief Draw a filled rectangular box with rounded corners
- * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_ARC or GDISP_NEED_ARCSECTORS must be GFXON in your gfxconf.h
*
* @param[in] g The display to use
* @param[in] x,y The start position
diff --git a/src/gdisp/gdisp_colors.h b/src/gdisp/gdisp_colors.h
index 0973e561..bf1a3f3b 100644
--- a/src/gdisp/gdisp_colors.h
+++ b/src/gdisp/gdisp_colors.h
@@ -80,30 +80,55 @@ typedef uint16_t colorformat;
* @name Some basic colors
* @{
*/
-#define White HTML2COLOR(0xFFFFFF)
-#define Black HTML2COLOR(0x000000)
-#define Gray HTML2COLOR(0x808080)
-#define Grey Gray
-#define Blue HTML2COLOR(0x0000FF)
-#define Red HTML2COLOR(0xFF0000)
-#define Fuchsia HTML2COLOR(0xFF00FF)
-#define Magenta Fuchsia
-#define Green HTML2COLOR(0x008000)
-#define Yellow HTML2COLOR(0xFFFF00)
-#define Aqua HTML2COLOR(0x00FFFF)
-#define Cyan Aqua
-#define Lime HTML2COLOR(0x00FF00)
-#define Maroon HTML2COLOR(0x800000)
-#define Navy HTML2COLOR(0x000080)
-#define Olive HTML2COLOR(0x808000)
-#define Purple HTML2COLOR(0x800080)
-#define Silver HTML2COLOR(0xC0C0C0)
-#define Teal HTML2COLOR(0x008080)
-#define Orange HTML2COLOR(0xFFA500)
-#define Pink HTML2COLOR(0xFFC0CB)
-#define SkyBlue HTML2COLOR(0x87CEEB)
+#define GFXWHITE HTML2COLOR(0xFFFFFF)
+#define GFXBLACK HTML2COLOR(0x000000)
+#define GFXGRAY HTML2COLOR(0x808080)
+#define GFXGREY GFXGRAY
+#define GFXBLUE HTML2COLOR(0x0000FF)
+#define GFXRED HTML2COLOR(0xFF0000)
+#define GFXFUCHSIA HTML2COLOR(0xFF00FF)
+#define GFXMAGENTA GFXFUCHSIA
+#define GFXGREEN HTML2COLOR(0x008000)
+#define GFXYELLOW HTML2COLOR(0xFFFF00)
+#define GFXAQUA HTML2COLOR(0x00FFFF)
+#define GFXCYAN GFXAQUA
+#define GFXLIME HTML2COLOR(0x00FF00)
+#define GFXMAROON HTML2COLOR(0x800000)
+#define GFXNAVY HTML2COLOR(0x000080)
+#define GFXOLIVE HTML2COLOR(0x808000)
+#define GFXPURPLE HTML2COLOR(0x800080)
+#define GFXSILVER HTML2COLOR(0xC0C0C0)
+#define GFXTEAL HTML2COLOR(0x008080)
+#define GFXORANGE HTML2COLOR(0xFFA500)
+#define GFXPINK HTML2COLOR(0xFFC0CB)
+#define GFXSKYBLUE HTML2COLOR(0x87CEEB)
/** @} */
+#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS
+ #define White GFXWHITE
+ #define Black GFXBLACK
+ #define Gray GFXGRAY
+ #define Grey GFXGREY
+ #define Blue GFXBLUE
+ #define Red GFXRED
+ #define Fuchsia GFXFUCHSIA
+ #define Magenta GFXMAGENTA
+ #define Green GFXGREEN
+ #define Yellow GFXYELLOW
+ #define Aqua GFXAQUA
+ #define Cyan GFXCYAN
+ #define Lime GFXLIME
+ #define Maroon GFXMAROON
+ #define Navy GFXNAVY
+ #define Olive GFXOLIVE
+ #define Purple GFXPURPLE
+ #define Silver GFXSILVER
+ #define Teal GFXTEAL
+ #define Orange GFXORANGE
+ #define Pink GFXPINK
+ #define SkyBlue GFXSKYBLUE
+#endif
+
#if defined(__DOXYGEN__)
/**
* @brief The color system (grayscale, palette or truecolor)
@@ -138,7 +163,7 @@ typedef uint16_t colorformat;
/**
* @brief Does the color need masking to remove invalid bits
*/
- #define COLOR_NEEDS_MASK FALSE
+ #define COLOR_NEEDS_MASK GFXOFF
/**
* @brief If the color needs masking to remove invalid bits, this is the mask
@@ -248,9 +273,9 @@ typedef uint16_t colorformat;
#error "GDISP: Cannot define color types with more than 32 bits"
#endif
#if COLOR_TYPE_BITS == COLOR_BITS
- #define COLOR_NEEDS_MASK FALSE
+ #define COLOR_NEEDS_MASK GFXOFF
#else
- #define COLOR_NEEDS_MASK TRUE
+ #define COLOR_NEEDS_MASK GFXON
#endif
#define COLOR_MASK() ((1 << COLOR_BITS)-1)
@@ -363,9 +388,9 @@ typedef uint16_t colorformat;
#error "GDISP: Cannot define gray-scale color types with more than 8 bits"
#endif
#if COLOR_TYPE_BITS == COLOR_BITS
- #define COLOR_NEEDS_MASK FALSE
+ #define COLOR_NEEDS_MASK GFXOFF
#else
- #define COLOR_NEEDS_MASK TRUE
+ #define COLOR_NEEDS_MASK GFXON
#endif
#define COLOR_MASK() ((1 << COLOR_BITS)-1)
diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h
index 09a12b06..14e019ff 100644
--- a/src/gdisp/gdisp_driver.h
+++ b/src/gdisp/gdisp_driver.h
@@ -23,28 +23,28 @@
// Are we currently compiling the driver itself?
#if defined(GDISP_DRIVER_VMT)
- #define IN_DRIVER TRUE
+ #define IN_DRIVER GFXON
#else
- #define IN_DRIVER FALSE
+ #define IN_DRIVER GFXOFF
#endif
// Is this a multiple driver situation?
#if defined(GDISP_DRIVER_LIST)
- #define IS_MULTIPLE TRUE
+ #define IS_MULTIPLE GFXON
#else
- #define IS_MULTIPLE FALSE
+ #define IS_MULTIPLE GFXOFF
#endif
// Do we need to use VMT calling rather than direct calls to the driver?
#if IS_MULTIPLE || GDISP_NEED_PIXMAP
- #define USE_VMT TRUE
+ #define USE_VMT GFXON
#else
- #define USE_VMT FALSE
+ #define USE_VMT GFXOFF
#endif
// Are we in the pixmap virtual driver
#ifndef IN_PIXMAP_DRIVER
- #define IN_PIXMAP_DRIVER FALSE
+ #define IN_PIXMAP_DRIVER GFXOFF
#endif
//------------------------------------------------------------------------------------------------------------
@@ -57,7 +57,7 @@
#define HARDWARE_DEFAULT HARDWARE_AUTODETECT
#else
// The default is not to include code functions that aren't needed
- #define HARDWARE_DEFAULT FALSE
+ #define HARDWARE_DEFAULT GFXOFF
#endif
//------------------------------------------------------------------------------------------------------------
@@ -68,7 +68,7 @@
*/
/**
* @brief The display hardware can benefit from being de-initialized when usage is complete.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note This is most useful for displays such as remote network displays.
@@ -79,7 +79,7 @@
/**
* @brief The display hardware can benefit from being flushed.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note Some controllers ** require ** the application to flush
@@ -90,7 +90,7 @@
/**
* @brief Hardware streaming writing is supported.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be provided by each driver
@@ -101,7 +101,7 @@
/**
* @brief Hardware streaming reading of the display surface is supported.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*
@@ -112,7 +112,7 @@
/**
* @brief Hardware supports setting the cursor position within the stream window.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note This is used to optimise setting of individual pixels within a stream window.
@@ -125,7 +125,7 @@
/**
* @brief Hardware accelerated draw pixel.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be provided by the driver
@@ -136,7 +136,7 @@
/**
* @brief Hardware accelerated screen clears.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note This clears the entire display surface regardless of the clipping area currently set
@@ -147,7 +147,7 @@
/**
* @brief Hardware accelerated rectangular fills.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -157,7 +157,7 @@
/**
* @brief Hardware accelerated fills from an image.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -167,7 +167,7 @@
/**
* @brief Hardware accelerated scrolling.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -177,7 +177,7 @@
/**
* @brief Reading back of pixel values.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -187,7 +187,7 @@
/**
* @brief The driver supports one or more control commands.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -197,7 +197,7 @@
/**
* @brief The driver supports a non-standard query.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
*/
@@ -207,7 +207,7 @@
/**
* @brief The driver supports a clipping in hardware.
- * @details Can be set to TRUE, FALSE or HARDWARE_AUTODETECT
+ * @details Can be set to GFXON, GFXOFF or HARDWARE_AUTODETECT
*
* @note HARDWARE_AUTODETECT is only meaningful when GDISP_DRIVER_LIST is defined
* @note If this is defined the driver must perform its own clipping on all calls to
@@ -223,8 +223,8 @@
//------------------------------------------------------------------------------------------------------------
-// For pixmaps certain routines MUST not be FALSE as they are needed for pixmap drawing
-// Similarly some routines MUST not be TRUE as pixmap's don't provide them.
+// For pixmaps certain routines MUST not be GFXOFF as they are needed for pixmap drawing
+// Similarly some routines MUST not be GFXON as pixmap's don't provide them.
#if GDISP_NEED_PIXMAP && !IN_DRIVER
#if !GDISP_HARDWARE_DEINIT
#undef GDISP_HARDWARE_DEINIT
@@ -242,39 +242,39 @@
#undef GDISP_HARDWARE_CONTROL
#define GDISP_HARDWARE_CONTROL HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_FLUSH == TRUE
+ #if GDISP_HARDWARE_FLUSH == GFXON
#undef GDISP_HARDWARE_FLUSH
#define GDISP_HARDWARE_FLUSH HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_STREAM_WRITE == TRUE
+ #if GDISP_HARDWARE_STREAM_WRITE == GFXON
#undef GDISP_HARDWARE_STREAM_WRITE
#define GDISP_HARDWARE_STREAM_WRITE HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_STREAM_READ == TRUE
+ #if GDISP_HARDWARE_STREAM_READ == GFXON
#undef GDISP_HARDWARE_STREAM_READ
#define GDISP_HARDWARE_STREAM_READ HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_CLEARS == TRUE
+ #if GDISP_HARDWARE_CLEARS == GFXON
#undef GDISP_HARDWARE_CLEARS
#define GDISP_HARDWARE_CLEARS HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_FILLS == TRUE
+ #if GDISP_HARDWARE_FILLS == GFXON
#undef GDISP_HARDWARE_FILLS
#define GDISP_HARDWARE_FILLS HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_BITFILLS == TRUE
+ #if GDISP_HARDWARE_BITFILLS == GFXON
#undef GDISP_HARDWARE_BITFILLS
#define GDISP_HARDWARE_BITFILLS HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_SCROLL == TRUE
+ #if GDISP_HARDWARE_SCROLL == GFXON
#undef GDISP_HARDWARE_SCROLL
#define GDISP_HARDWARE_SCROLL HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_QUERY == TRUE
+ #if GDISP_HARDWARE_QUERY == GFXON
#undef GDISP_HARDWARE_QUERY
#define GDISP_HARDWARE_QUERY HARDWARE_AUTODETECT
#endif
- #if GDISP_HARDWARE_CLIP == TRUE
+ #if GDISP_HARDWARE_CLIP == GFXON
#undef GDISP_HARDWARE_CLIP
#define GDISP_HARDWARE_CLIP HARDWARE_AUTODETECT
#endif
@@ -342,7 +342,7 @@ struct GDisplay {
#endif
// Software clipping
- #if GDISP_HARDWARE_CLIP != TRUE && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION)
+ #if GDISP_HARDWARE_CLIP != GFXON && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION)
coord_t clipx0, clipy0;
coord_t clipx1, clipy1; /* not inclusive */
#endif
@@ -430,7 +430,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_DEINIT || defined(__DOXYGEN__)
/**
* @brief The driver is being de-initialized
- * @pre GDISP_HARDWARE_FLUSH is TRUE
+ * @pre GDISP_HARDWARE_FLUSH is GFXON
*
* @param[in] g The driver structure
*
@@ -441,7 +441,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_FLUSH || defined(__DOXYGEN__)
/**
* @brief Flush the current drawing operations to the display
- * @pre GDISP_HARDWARE_FLUSH is TRUE
+ * @pre GDISP_HARDWARE_FLUSH is GFXON
*
* @param[in] g The driver structure
*
@@ -453,7 +453,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_STREAM_WRITE || defined(__DOXYGEN__)
/**
* @brief Start a streamed write operation
- * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE
+ * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON
*
* @param[in] g The driver structure
*
@@ -463,13 +463,13 @@ typedef struct GDISPVMT {
* @note The parameter variables must not be altered by the driver.
* @note Streaming operations that wrap the defined window have
* undefined results.
- * @note This must be followed by a call to @p gdisp_lld_write_pos() if GDISP_HARDWARE_STREAM_POS is TRUE.
+ * @note This must be followed by a call to @p gdisp_lld_write_pos() if GDISP_HARDWARE_STREAM_POS is GFXON.
*/
LLDSPEC void gdisp_lld_write_start(GDisplay *g);
/**
* @brief Send a pixel to the current streaming position and then increment that position
- * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE
+ * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON
*
* @param[in] g The driver structure
*
@@ -480,7 +480,7 @@ typedef struct GDISPVMT {
/**
* @brief End the current streaming write operation
- * @pre GDISP_HARDWARE_STREAM_WRITE is TRUE
+ * @pre GDISP_HARDWARE_STREAM_WRITE is GFXON
*
* @param[in] g The driver structure
*
@@ -491,7 +491,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_STREAM_POS || defined(__DOXYGEN__)
/**
* @brief Change the current position within the current streaming window
- * @pre GDISP_HARDWARE_STREAM_POS is TRUE and GDISP_HARDWARE_STREAM_WRITE is TRUE
+ * @pre GDISP_HARDWARE_STREAM_POS is GFXON and GDISP_HARDWARE_STREAM_WRITE is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The new position (which will always be within the existing stream window)
@@ -505,7 +505,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_STREAM_READ || defined(__DOXYGEN__)
/**
* @brief Start a streamed read operation
- * @pre GDISP_HARDWARE_STREAM_READ is TRUE
+ * @pre GDISP_HARDWARE_STREAM_READ is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The window position
@@ -520,7 +520,7 @@ typedef struct GDISPVMT {
/**
* @brief Read a pixel from the current streaming position and then increment that position
* @return The color at the current position
- * @pre GDISP_HARDWARE_STREAM_READ is TRUE
+ * @pre GDISP_HARDWARE_STREAM_READ is GFXON
*
* @param[in] g The driver structure
*
@@ -530,7 +530,7 @@ typedef struct GDISPVMT {
/**
* @brief End the current streaming operation
- * @pre GDISP_HARDWARE_STREAM_READ is TRUE
+ * @pre GDISP_HARDWARE_STREAM_READ is GFXON
*
* @param[in] g The driver structure
*
@@ -542,7 +542,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_DRAWPIXEL || defined(__DOXYGEN__)
/**
* @brief Draw a pixel
- * @pre GDISP_HARDWARE_DRAWPIXEL is TRUE
+ * @pre GDISP_HARDWARE_DRAWPIXEL is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The pixel position
@@ -556,7 +556,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_CLEARS || defined(__DOXYGEN__)
/**
* @brief Clear the screen using the defined color
- * @pre GDISP_HARDWARE_CLEARS is TRUE
+ * @pre GDISP_HARDWARE_CLEARS is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.color The color to set
@@ -569,7 +569,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_FILLS || defined(__DOXYGEN__)
/**
* @brief Fill an area with a single color
- * @pre GDISP_HARDWARE_FILLS is TRUE
+ * @pre GDISP_HARDWARE_FILLS is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The area position
@@ -584,7 +584,7 @@ typedef struct GDISPVMT {
#if GDISP_HARDWARE_BITFILLS || defined(__DOXYGEN__)
/**
* @brief Fill an area using a bitmap
- * @pre GDISP_HARDWARE_BITFILLS is TRUE
+ * @pre GDISP_HARDWARE_BITFILLS is GFXON
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The area position
@@ -602,7 +602,7 @@ typedef struct GDISPVMT {
/**
* @brief Read a pixel from the display
* @return The color at the defined position
- * @pre GDISP_HARDWARE_PIXELREAD is TRUE (and the application needs it)
+ * @pre GDISP_HARDWARE_PIXELREAD is GFXON (and the application needs it)
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The pixel position
@@ -615,7 +615,7 @@ typedef struct GDISPVMT {
#if (GDISP_HARDWARE_SCROLL && GDISP_NEED_SCROLL) || defined(__DOXYGEN__)
/**
* @brief Scroll an area of the screen
- * @pre GDISP_HARDWARE_SCROLL is TRUE (and the application needs it)
+ * @pre GDISP_HARDWARE_SCROLL is GFXON (and the application needs it)
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The area position
@@ -634,7 +634,7 @@ typedef struct GDISPVMT {
#if (GDISP_HARDWARE_CONTROL && GDISP_NEED_CONTROL) || defined(__DOXYGEN__)
/**
* @brief Control some feature of the hardware
- * @pre GDISP_HARDWARE_CONTROL is TRUE (and the application needs it)
+ * @pre GDISP_HARDWARE_CONTROL is GFXON (and the application needs it)
*
* @param[in] g The driver structure
* @param[in] g->p.x The operation to perform
@@ -649,7 +649,7 @@ typedef struct GDISPVMT {
/**
* @brief Query some feature of the hardware
* @return The information requested (typecast as void *)
- * @pre GDISP_HARDWARE_QUERY is TRUE (and the application needs it)
+ * @pre GDISP_HARDWARE_QUERY is GFXON (and the application needs it)
*
* @param[in] g The driver structure
* @param[in] g->p.x What to query
@@ -662,7 +662,7 @@ typedef struct GDISPVMT {
#if (GDISP_HARDWARE_CLIP && (GDISP_NEED_CLIP || GDISP_NEED_VALIDATION)) || defined(__DOXYGEN__)
/**
* @brief Set the hardware clipping area
- * @pre GDISP_HARDWARE_CLIP is TRUE (and the application needs it)
+ * @pre GDISP_HARDWARE_CLIP is GFXON (and the application needs it)
*
* @param[in] g The driver structure
* @param[in] g->p.x,g->p.y The area position
@@ -706,7 +706,7 @@ typedef struct GDISPVMT {
// Make sure the driver has a valid model
#if !GDISP_HARDWARE_STREAM_WRITE && !GDISP_HARDWARE_DRAWPIXEL
- #error "GDISP Driver: Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be TRUE"
+ #error "GDISP Driver: Either GDISP_HARDWARE_STREAM_WRITE or GDISP_HARDWARE_DRAWPIXEL must be GFXON"
#endif
// If we are not using multiple displays then hard-code the VMT name (except for the pixmap driver)
@@ -840,9 +840,9 @@ typedef struct GDISPVMT {
#error "GDISP: Cannot define low level driver color types with more than 32 bits"
#endif
#if LLDCOLOR_TYPE_BITS == LLDCOLOR_BITS
- #define LLDCOLOR_NEEDS_MASK FALSE
+ #define LLDCOLOR_NEEDS_MASK GFXOFF
#else
- #define LLDCOLOR_NEEDS_MASK TRUE
+ #define LLDCOLOR_NEEDS_MASK GFXON
#endif
#define LLDCOLOR_MASK() ((1 << LLDCOLOR_BITS)-1)
@@ -943,9 +943,9 @@ typedef struct GDISPVMT {
#error "GDISP: Cannot define gray-scale low level driver color types with more than 8 bits"
#endif
#if LLDCOLOR_TYPE_BITS == LLDCOLOR_BITS
- #define LLDCOLOR_NEEDS_MASK FALSE
+ #define LLDCOLOR_NEEDS_MASK GFXOFF
#else
- #define LLDCOLOR_NEEDS_MASK TRUE
+ #define LLDCOLOR_NEEDS_MASK GFXON
#endif
#define LLDCOLOR_MASK() ((1 << LLDCOLOR_BITS)-1)
@@ -1005,9 +1005,9 @@ typedef struct GDISPVMT {
*/
#ifndef GDISP_HARDWARE_USE_EXACT_COLOR
#if LLDCOLOR_BITS_R - COLOR_BITS_R >= LLDCOLOR_BITS_R/2 || LLDCOLOR_BITS_G - COLOR_BITS_G >= LLDCOLOR_BITS_G/2 || LLDCOLOR_BITS_B - COLOR_BITS_B >= LLDCOLOR_BITS_B/2
- #define GDISP_HARDWARE_USE_EXACT_COLOR TRUE
+ #define GDISP_HARDWARE_USE_EXACT_COLOR GFXON
#else
- #define GDISP_HARDWARE_USE_EXACT_COLOR FALSE
+ #define GDISP_HARDWARE_USE_EXACT_COLOR GFXOFF
#endif
#endif
diff --git a/src/gdisp/gdisp_image.h b/src/gdisp/gdisp_image.h
index d921e063..4cd348cf 100644
--- a/src/gdisp/gdisp_image.h
+++ b/src/gdisp/gdisp_image.h
@@ -127,7 +127,7 @@ extern "C" {
* @details Determine the image format and get ready to decode the first image frame
* @return GDISP_IMAGE_ERR_OK (0) on success or an error code.
*
- * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be TRUE. This only makes sense on the ChibiOS
+ * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be GFXON. This only makes sense on the ChibiOS
* operating system.
*
* @param[in] img The image structure
@@ -142,7 +142,7 @@ extern "C" {
* @details Determine the image format and get ready to decode the first image frame
* @return GDISP_IMAGE_ERR_OK (0) on success or an error code.
*
- * @pre GFILE_NEED_MEMFS must be TRUE
+ * @pre GFILE_NEED_MEMFS must be GFXON
*
* @param[in] img The image structure
* @param[in] ptr A pointer to the image bytes in memory
diff --git a/src/gdisp/gdisp_options.h b/src/gdisp/gdisp_options.h
index f5f2c18b..8fb409a2 100644
--- a/src/gdisp/gdisp_options.h
+++ b/src/gdisp/gdisp_options.h
@@ -22,175 +22,175 @@
*/
/**
* @brief Should drawing operations be automatically flushed.
- * @details Defaults to FALSE
- * @note If set to FALSE and the controller requires flushing
+ * @details Defaults to GFXOFF
+ * @note If set to GFXOFF and the controller requires flushing
* then the application must manually call @p gdispGFlush().
- * Setting this to TRUE causes GDISP to automatically flush
+ * Setting this to GFXON causes GDISP to automatically flush
* after each drawing operation. Note this may be slow but enables
* an application to avoid having to manually call the flush routine.
- * @note If TRUE and GDISP_NEED_TIMERFLUSH is also TRUE, this takes precedence.
+ * @note If GFXON and GDISP_NEED_TIMERFLUSH is also GFXON, this takes precedence.
* @note Most controllers don't need flushing which is why this is set to
- * FALSE by default.
+ * GFXOFF by default.
*/
#ifndef GDISP_NEED_AUTOFLUSH
- #define GDISP_NEED_AUTOFLUSH FALSE
+ #define GDISP_NEED_AUTOFLUSH GFXOFF
#endif
/**
* @brief Should drawing operations be automatically flushed on a timer.
- * @details Defaults to FALSE, Can be set to FALSE or a timer period in milliseconds.
+ * @details Defaults to GFXOFF, Can be set to GFXOFF or a timer period in milliseconds.
* @note The period should not be set too short or it will consume all your CPU. A
* value between 250 and 500 milliseconds would probably be suitable.
- * @note If TRUE and GDISP_NEED_AUTOFLUSH is also TRUE, this is ineffective.
+ * @note If GFXON and GDISP_NEED_AUTOFLUSH is also GFXON, this is ineffective.
* @note Most controllers don't need flushing which is why this is set to
- * FALSE by default.
+ * GFXOFF by default.
*/
#ifndef GDISP_NEED_TIMERFLUSH
- #define GDISP_NEED_TIMERFLUSH FALSE
+ #define GDISP_NEED_TIMERFLUSH GFXOFF
#endif
/**
* @brief Should all operations be clipped to the screen and colors validated.
- * @details Defaults to TRUE.
- * @note If this is FALSE, any operations that extend beyond the
+ * @details Defaults to GFXON.
+ * @note If this is GFXOFF, any operations that extend beyond the
* edge of the screen will have undefined results. Any
* out-of-range colors will produce undefined results.
- * @note This should always be left as the default (TRUE) unless you
+ * @note This should always be left as the default (GFXON) unless you
* are a maniac for speed and you have thoroughly tested your code
* and it never overwrites the edges of the screen.
- * @note Setting GDISP_NEED_CLIP to TRUE internally uses the same mechanism
- * as this validation. There is no advantage in setting this FALSE if
- * GDISP_NEED_CLIP is TRUE.
+ * @note Setting GDISP_NEED_CLIP to GFXON internally uses the same mechanism
+ * as this validation. There is no advantage in setting this GFXOFF if
+ * GDISP_NEED_CLIP is GFXON.
*/
#ifndef GDISP_NEED_VALIDATION
- #define GDISP_NEED_VALIDATION TRUE
+ #define GDISP_NEED_VALIDATION GFXON
#endif
/**
* @brief Are clipping functions needed.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_CLIP
- #define GDISP_NEED_CLIP TRUE
+ #define GDISP_NEED_CLIP GFXON
#endif
/**
* @brief Streaming functions are needed
- * @details Defaults to FALSE.
+ * @details Defaults to GFXOFF.
*/
#ifndef GDISP_NEED_STREAMING
- #define GDISP_NEED_STREAMING FALSE
+ #define GDISP_NEED_STREAMING GFXOFF
#endif
/**
* @brief Are text functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note You must also define at least one font.
*/
#ifndef GDISP_NEED_TEXT
- #define GDISP_NEED_TEXT FALSE
+ #define GDISP_NEED_TEXT GFXOFF
#endif
/**
* @brief Are circle functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Uses integer algorithms only. It does not use any trig or floating point.
*/
#ifndef GDISP_NEED_CIRCLE
- #define GDISP_NEED_CIRCLE FALSE
+ #define GDISP_NEED_CIRCLE GFXOFF
#endif
/**
* @brief Are dual circle functions needed (one circle inside another).
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Uses integer algorithms only. It does not use any trig or floating point.
*/
#ifndef GDISP_NEED_DUALCIRCLE
- #define GDISP_NEED_DUALCIRCLE FALSE
+ #define GDISP_NEED_DUALCIRCLE GFXOFF
#endif
/**
* @brief Are ellipse functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Uses integer algorithms only. It does not use any trig or floating point.
*/
#ifndef GDISP_NEED_ELLIPSE
- #define GDISP_NEED_ELLIPSE FALSE
+ #define GDISP_NEED_ELLIPSE GFXOFF
#endif
/**
* @brief Are arc sector functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Uses integer algorithms only. It does not use any trig or floating point.
*/
#ifndef GDISP_NEED_ARCSECTORS
- #define GDISP_NEED_ARCSECTORS FALSE
+ #define GDISP_NEED_ARCSECTORS GFXOFF
#endif
/**
* @brief Are arc functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This can be compiled using fully integer mathematics by
- * defining GFX_USE_GMISC and GMISC_NEED_FIXEDTRIG as TRUE.
+ * defining GFX_USE_GMISC and GMISC_NEED_FIXEDTRIG as GFXON.
* @note This can be compiled to use floating point but no trig functions
- * by defining GFX_USE_GMISC and GMISC_NEED_FASTTRIG as TRUE.
+ * by defining GFX_USE_GMISC and GMISC_NEED_FASTTRIG as GFXON.
* @note If neither of the above are defined it requires the maths library
* to be included in the link to provide floating point and trig support.
* ie include -lm in your compiler flags.
*/
#ifndef GDISP_NEED_ARC
- #define GDISP_NEED_ARC FALSE
+ #define GDISP_NEED_ARC GFXOFF
#endif
/**
* @brief Are convex polygon functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Convex polygons are those that have no internal angles. That is;
* you can draw a line from any point on the polygon to any other point
* on the polygon without it going outside the polygon.
*/
#ifndef GDISP_NEED_CONVEX_POLYGON
- #define GDISP_NEED_CONVEX_POLYGON FALSE
+ #define GDISP_NEED_CONVEX_POLYGON GFXOFF
#endif
/**
* @brief Are scrolling functions needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This function must be supported by the low level GDISP driver
* you have included in your project. If it isn't, defining this
* option will cause a compile error.
*/
#ifndef GDISP_NEED_SCROLL
- #define GDISP_NEED_SCROLL FALSE
+ #define GDISP_NEED_SCROLL GFXOFF
#endif
/**
* @brief Is the capability to read pixels back needed.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This function must be supported by the low level GDISP driver
* you have included in your project. If it isn't, defining this
* option will cause a compile error.
*/
#ifndef GDISP_NEED_PIXELREAD
- #define GDISP_NEED_PIXELREAD FALSE
+ #define GDISP_NEED_PIXELREAD GFXOFF
#endif
/**
* @brief Control some aspect of the hardware operation.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This allows control of hardware specific features such as
* screen rotation, backlight levels, contrast etc
*/
#ifndef GDISP_NEED_CONTROL
- #define GDISP_NEED_CONTROL FALSE
+ #define GDISP_NEED_CONTROL GFXOFF
#endif
/**
* @brief Query some aspect of the hardware operation.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This allows query of hardware specific features
*/
#ifndef GDISP_NEED_QUERY
- #define GDISP_NEED_QUERY FALSE
+ #define GDISP_NEED_QUERY GFXOFF
#endif
/**
* @brief Is the image interface required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE
- #define GDISP_NEED_IMAGE FALSE
+ #define GDISP_NEED_IMAGE GFXOFF
#endif
/**
* @brief Is the image interface required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_PIXMAP
- #define GDISP_NEED_PIXMAP FALSE
+ #define GDISP_NEED_PIXMAP GFXOFF
#endif
/**
* @}
@@ -200,10 +200,10 @@
*/
/**
* @brief Do the drawing functions need to be thread-safe.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_MULTITHREAD
- #define GDISP_NEED_MULTITHREAD FALSE
+ #define GDISP_NEED_MULTITHREAD GFXOFF
#endif
/**
* @}
@@ -214,10 +214,10 @@
/**
* @brief Should the startup logo be displayed
*
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_STARTUP_LOGO
- #define GDISP_NEED_STARTUP_LOGO TRUE
+ #define GDISP_NEED_STARTUP_LOGO GFXON
#endif
/**
* @brief Define the initial background color for all displays in the system.
@@ -270,8 +270,8 @@
* @note The same driver can occur more than once in the list to create an extra instance of that driver.
* @note If defining this you must also define GDISP_PIXELFORMAT for your application to use.
* Choose a value that is most common accross all your drivers for efficiency.
- * @note If using this you may optionally define the GDISP_HARDWARE_xxx values as either TRUE or FALSE.
- * Doing this causes GDISP to assume that all (TRUE) or none (FALSE) of the listed drivers have that
+ * @note If using this you may optionally define the GDISP_HARDWARE_xxx values as either GFXON or GFXOFF.
+ * Doing this causes GDISP to assume that all (GFXON) or none (GFXOFF) of the listed drivers have that
* capability. This can help improve drawing speed and efficiency.
*/
#define GDISP_DRIVER_LIST GDISPVMT_Win32, GDISPVMT_SSD1963
@@ -280,113 +280,113 @@
* @}
*
* @name GDISP Image Options
- * @pre GDISP_NEED_IMAGE must be TRUE
+ * @pre GDISP_NEED_IMAGE must be GFXON
* @{
*/
/**
* @brief Is native image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_NATIVE
- #define GDISP_NEED_IMAGE_NATIVE FALSE
+ #define GDISP_NEED_IMAGE_NATIVE GFXOFF
#endif
/**
* @brief Is GIF image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_GIF
- #define GDISP_NEED_IMAGE_GIF FALSE
+ #define GDISP_NEED_IMAGE_GIF GFXOFF
#endif
/**
* @brief Is BMP image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_BMP
- #define GDISP_NEED_IMAGE_BMP FALSE
+ #define GDISP_NEED_IMAGE_BMP GFXOFF
#endif
/**
* @brief Is JPG image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_JPG
- #define GDISP_NEED_IMAGE_JPG FALSE
+ #define GDISP_NEED_IMAGE_JPG GFXOFF
#endif
/**
* @brief Is PNG image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_PNG
- #define GDISP_NEED_IMAGE_PNG FALSE
+ #define GDISP_NEED_IMAGE_PNG GFXOFF
#endif
/**
* @brief Is memory accounting required during image decoding.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_IMAGE_ACCOUNTING
- #define GDISP_NEED_IMAGE_ACCOUNTING FALSE
+ #define GDISP_NEED_IMAGE_ACCOUNTING GFXOFF
#endif
/**
* @}
*
* @name GDISP BMP Image Options
- * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be TRUE
+ * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_BMP must be GFXON
* @{
*/
/**
* @brief Is BMP 1 bit per pixel (monochrome/2 color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_1
- #define GDISP_NEED_IMAGE_BMP_1 TRUE
+ #define GDISP_NEED_IMAGE_BMP_1 GFXON
#endif
/**
* @brief Is BMP 4 bits per pixel (16 color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_4
- #define GDISP_NEED_IMAGE_BMP_4 TRUE
+ #define GDISP_NEED_IMAGE_BMP_4 GFXON
#endif
/**
* @brief Is BMP 4 bits per pixel (16 color) with RLE compression image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_4_RLE
- #define GDISP_NEED_IMAGE_BMP_4_RLE TRUE
+ #define GDISP_NEED_IMAGE_BMP_4_RLE GFXON
#endif
/**
* @brief Is BMP 8 bits per pixel (256 color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_8
- #define GDISP_NEED_IMAGE_BMP_8 TRUE
+ #define GDISP_NEED_IMAGE_BMP_8 GFXON
#endif
/**
* @brief Is BMP 8 bits per pixel (256 color) with RLE compression image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_8_RLE
- #define GDISP_NEED_IMAGE_BMP_8_RLE TRUE
+ #define GDISP_NEED_IMAGE_BMP_8_RLE GFXON
#endif
/**
* @brief Is BMP 16 bits per pixel (65536 color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_16
- #define GDISP_NEED_IMAGE_BMP_16 TRUE
+ #define GDISP_NEED_IMAGE_BMP_16 GFXON
#endif
/**
* @brief Is BMP 24 bits per pixel (true-color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_24
- #define GDISP_NEED_IMAGE_BMP_24 TRUE
+ #define GDISP_NEED_IMAGE_BMP_24 GFXON
#endif
/**
* @brief Is BMP 32 bits per pixel (true-color) image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_BMP_32
- #define GDISP_NEED_IMAGE_BMP_32 TRUE
+ #define GDISP_NEED_IMAGE_BMP_32 GFXON
#endif
/**
* @brief The BMP blit buffer size.
@@ -401,7 +401,7 @@
* @}
*
* @name GDISP GIF Image Options
- * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_GIF must be TRUE
+ * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_GIF must be GFXON
* @{
*/
/**
@@ -416,37 +416,37 @@
* @}
*
* @name GDISP PNG Image Options
- * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_PNG must be TRUE
+ * @pre GDISP_NEED_IMAGE and GDISP_NEED_IMAGE_PNG must be GFXON
* @{
*/
/**
* @brief Is PNG Interlaced image decoding required.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Currently not supported due to the complex decoding and display requirements
*/
#ifndef GDISP_NEED_IMAGE_PNG_INTERLACED
- #define GDISP_NEED_IMAGE_PNG_INTERLACED FALSE
+ #define GDISP_NEED_IMAGE_PNG_INTERLACED GFXOFF
#endif
/**
* @brief Is PNG image transparency processed.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_TRANSPARENCY
- #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY TRUE
+ #define GDISP_NEED_IMAGE_PNG_TRANSPARENCY GFXON
#endif
/**
* @brief Is PNG background data processed.
- * @details Defaults to TRUE
- * @note If the background is specified in the image file and this define is TRUE,
+ * @details Defaults to GFXON
+ * @note If the background is specified in the image file and this define is GFXON,
* that background color is used for transparency and alpha blending.
*/
#ifndef GDISP_NEED_IMAGE_PNG_BACKGROUND
- #define GDISP_NEED_IMAGE_PNG_BACKGROUND TRUE
+ #define GDISP_NEED_IMAGE_PNG_BACKGROUND GFXON
#endif
/**
* @brief What is the cliff between non-blended alpha pixels being displayed or not.
* @details Range of 0 to 255
- * @note If GDISP_NEED_IMAGE_PNG_BACKGROUND is TRUE and the PNG file contains a
+ * @note If GDISP_NEED_IMAGE_PNG_BACKGROUND is GFXON and the PNG file contains a
* background color then the pixel will be blended with the background color
* according to the alpha.
* If not then no blending occurs. The pixel will either be set or not.
@@ -458,80 +458,80 @@
#endif
/**
* @brief Is 1, 2 and 4 bit PNG palettized image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_PALETTE_124
- #define GDISP_NEED_IMAGE_PNG_PALETTE_124 TRUE
+ #define GDISP_NEED_IMAGE_PNG_PALETTE_124 GFXON
#endif
/**
* @brief Is 8 bit PNG palettized image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_PALETTE_8
- #define GDISP_NEED_IMAGE_PNG_PALETTE_8 TRUE
+ #define GDISP_NEED_IMAGE_PNG_PALETTE_8 GFXON
#endif
/**
* @brief Is 1,2 and 4 bit PNG grayscale image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_124
- #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 TRUE
+ #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_124 GFXON
#endif
/**
* @brief Is 8 bit PNG grayscale image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_8
- #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 TRUE
+ #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_8 GFXON
#endif
/**
* @brief Is 16 bit PNG grayscale image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_GRAYSCALE_16
- #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 TRUE
+ #define GDISP_NEED_IMAGE_PNG_GRAYSCALE_16 GFXON
#endif
/**
* @brief Is 8 bit PNG grayscale with 8 bit alpha image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_GRAYALPHA_8
- #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 TRUE
+ #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_8 GFXON
#endif
/**
* @brief Is 16 bit PNG grayscale with 16 bit alpha image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_GRAYALPHA_16
- #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 TRUE
+ #define GDISP_NEED_IMAGE_PNG_GRAYALPHA_16 GFXON
#endif
/**
* @brief Is 8/8/8 bit PNG RGB image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_RGB_8
- #define GDISP_NEED_IMAGE_PNG_RGB_8 TRUE
+ #define GDISP_NEED_IMAGE_PNG_RGB_8 GFXON
#endif
/**
* @brief Is 16/16/16 bit PNG RGB image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_RGB_16
- #define GDISP_NEED_IMAGE_PNG_RGB_16 TRUE
+ #define GDISP_NEED_IMAGE_PNG_RGB_16 GFXON
#endif
/**
* @brief Is 8/8/8 bit PNG RGB with 8 bit alpha image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_RGBALPHA_8
- #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 TRUE
+ #define GDISP_NEED_IMAGE_PNG_RGBALPHA_8 GFXON
#endif
/**
* @brief Is 16/16/16 bit PNG RGB with 16 bit alpha image decoding required.
- * @details Defaults to TRUE
+ * @details Defaults to GFXON
*/
#ifndef GDISP_NEED_IMAGE_PNG_RGBALPHA_16
- #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 TRUE
+ #define GDISP_NEED_IMAGE_PNG_RGBALPHA_16 GFXON
#endif
/**
* @brief The PNG blit buffer size in pixels.
@@ -569,10 +569,10 @@
/**
* @brief Enable advanced word-wrapping.
* @details Only has an effect with @p gdispGDrawStringBox() and @p gdispGFillStringBox()
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_TEXT_WORDWRAP
- #define GDISP_NEED_TEXT_WORDWRAP FALSE
+ #define GDISP_NEED_TEXT_WORDWRAP GFXOFF
#endif
/**
* @brief Adding pixels to the left and right side of the box to pad text.
@@ -594,24 +594,24 @@
#endif
/**
* @brief Enable UTF-8 support for text rendering.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_UTF8
- #define GDISP_NEED_UTF8 FALSE
+ #define GDISP_NEED_UTF8 GFXOFF
#endif
/**
* @brief Enable kerning for font rendering (improves character placement).
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_TEXT_KERNING
- #define GDISP_NEED_TEXT_KERNING FALSE
+ #define GDISP_NEED_TEXT_KERNING GFXOFF
#endif
/**
* @brief Enable antialiased font support
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GDISP_NEED_ANTIALIAS
- #define GDISP_NEED_ANTIALIAS FALSE
+ #define GDISP_NEED_ANTIALIAS GFXOFF
#endif
/**
* @}
@@ -620,7 +620,7 @@
* @{
*/
#ifndef GDISP_NEED_PIXMAP_IMAGE
- #define GDISP_NEED_PIXMAP_IMAGE FALSE
+ #define GDISP_NEED_PIXMAP_IMAGE GFXOFF
#endif
/**
* @}
diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c
index c22ffcf0..45dee66b 100644
--- a/src/gdisp/gdisp_pixmap.c
+++ b/src/gdisp/gdisp_pixmap.c
@@ -25,11 +25,11 @@
#undef GDISP_HARDWARE_CONTROL
#undef GDISP_HARDWARE_QUERY
#undef GDISP_HARDWARE_CLIP
-#define GDISP_HARDWARE_DEINIT TRUE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define IN_PIXMAP_DRIVER TRUE
+#define GDISP_HARDWARE_DEINIT GFXON
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define IN_PIXMAP_DRIVER GFXON
#define GDISP_DRIVER_VMT GDISPVMT_pixmap
#define GDISP_DRIVER_VMT_FLAGS (GDISP_VFLG_DYNAMICONLY|GDISP_VFLG_PIXMAP)
diff --git a/src/gdisp/gdisp_pixmap.h b/src/gdisp/gdisp_pixmap.h
index a8024772..ebf7e1db 100644
--- a/src/gdisp/gdisp_pixmap.h
+++ b/src/gdisp/gdisp_pixmap.h
@@ -15,7 +15,7 @@
*
* @note A Pixmap is an off-screen virtual display that can be drawn to just like any other
* display. It can then be copied to a real display using the standard gdispGBlitArea() call.
- * @pre GDISP_NEED_PIXMAP must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_PIXMAP must be GFXON in your gfxconf.h
* @{
*/
@@ -69,7 +69,7 @@ extern "C" {
/**
* @brief Get a pointer to a native format gdispImage.
* @return A pointer to a NATIVE format gdispImage in memory or NULL if this display is not a pixmap.
- * @pre GDISP_NEED_PIXAMP_IMAGE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_PIXAMP_IMAGE must be GFXON in your gfxconf.h
*
* @param[in] g The pixmap virtual display
*
diff --git a/src/gdisp/gdisp_rules.h b/src/gdisp/gdisp_rules.h
index d9fb86bb..f6557d8f 100644
--- a/src/gdisp/gdisp_rules.h
+++ b/src/gdisp/gdisp_rules.h
@@ -26,7 +26,7 @@
#endif
#endif
#undef GFX_USE_GDRIVER
- #define GFX_USE_GDRIVER TRUE
+ #define GFX_USE_GDRIVER GFXON
#endif
#if defined(GDISP_DRIVER_LIST)
#if GDISP_TOTAL_DISPLAYS != 1
@@ -45,11 +45,11 @@
#endif
#endif
#undef GDISP_NEED_TIMERFLUSH
- #define GDISP_NEED_TIMERFLUSH FALSE
+ #define GDISP_NEED_TIMERFLUSH GFXOFF
#endif
#if GDISP_NEED_TIMERFLUSH
#if GDISP_NEED_TIMERFLUSH < 50 || GDISP_NEED_TIMERFLUSH > 1200
- #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (FALSE, 50-1200)."
+ #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (GFXOFF, 50-1200)."
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
@@ -60,9 +60,9 @@
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#undef GDISP_NEED_MULTITHREAD
- #define GDISP_NEED_MULTITHREAD TRUE
+ #define GDISP_NEED_MULTITHREAD GFXON
#endif
#endif
#if GDISP_NEED_ANTIALIAS && !GDISP_NEED_PIXELREAD
@@ -75,7 +75,7 @@
#endif
#endif
#undef GDISP_NEED_PIXELREAD
- #define GDISP_NEED_PIXELREAD TRUE
+ #define GDISP_NEED_PIXELREAD GFXON
#else
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
@@ -97,19 +97,19 @@
#endif
#endif
#undef GDISP_INCLUDE_FONT_UI2
- #define GDISP_INCLUDE_FONT_UI2 TRUE
+ #define GDISP_INCLUDE_FONT_UI2 GFXON
#endif
#if GDISP_NEED_IMAGE
#if !GFX_USE_GFILE
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you."
+ #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GFILE
- #define GFX_USE_GFILE TRUE
+ #define GFX_USE_GFILE GFXON
#endif
#endif
#endif
diff --git a/src/gdriver/gdriver.h b/src/gdriver/gdriver.h
index 6f245ef1..4a1959a6 100644
--- a/src/gdriver/gdriver.h
+++ b/src/gdriver/gdriver.h
@@ -26,7 +26,7 @@
* @note This module gdriver.h file is NOT included in the general gfx.h file.
* Instead it is included in each driver type's driver API.
*
- * @pre GFX_USE_GDRIVER must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GDRIVER must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gevent/gevent.h b/src/gevent/gevent.h
index 3c5a0bd4..8b95235d 100644
--- a/src/gevent/gevent.h
+++ b/src/gevent/gevent.h
@@ -15,7 +15,7 @@
* @details GEVENT provides a simple to use but yet powerful event
* system.
*
- * @pre GFX_USE_GEVENT must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GEVENT must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gevent/gevent_options.h b/src/gevent/gevent_options.h
index 7f68fd32..192cf725 100644
--- a/src/gevent/gevent_options.h
+++ b/src/gevent/gevent_options.h
@@ -22,12 +22,12 @@
*/
/**
* @brief Should routines assert() if they run out of resources.
- * @details Defaults to FALSE.
- * @details If FALSE the application must be prepared to handle these
+ * @details Defaults to GFXOFF.
+ * @details If GFXOFF the application must be prepared to handle these
* failures.
*/
#ifndef GEVENT_ASSERT_NO_RESOURCE
- #define GEVENT_ASSERT_NO_RESOURCE FALSE
+ #define GEVENT_ASSERT_NO_RESOURCE GFXOFF
#endif
/**
* @}
diff --git a/src/gfile/gfile_options.h b/src/gfile/gfile_options.h
index 7b157b9f..b559842d 100644
--- a/src/gfile/gfile_options.h
+++ b/src/gfile/gfile_options.h
@@ -25,10 +25,10 @@
* @details The filesystem is normally mounted automatically if the
* user does not do it manually. This option turns that off
* so the user must manually mount the file-system first.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFILE_NEED_NOAUTOMOUNT
- #define GFILE_NEED_NOAUTOMOUNT FALSE
+ #define GFILE_NEED_NOAUTOMOUNT GFXOFF
#endif
/**
* @brief Should the filesystem be synced automatically
@@ -38,46 +38,46 @@
* himself using @p gfileSync()
* @details Not all filesystems implement the syncing feature. This feature will
* have no effect in such a case.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFILE_NEED_NOAUTOSYNC
- #define GFILE_NEED_NOAUTOSYNC FALSE
+ #define GFILE_NEED_NOAUTOSYNC GFXOFF
#endif
/**
* @brief Include printg, fprintg etc functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @pre To get the string sprintg functions you also need to define @p GFILE_NEED_STRINGS
*/
#ifndef GFILE_NEED_PRINTG
- #define GFILE_NEED_PRINTG FALSE
+ #define GFILE_NEED_PRINTG GFXOFF
#endif
/**
* @brief Include scang, fscang etc functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @pre To get the string sscang functions you also need to define @p GFILE_NEED_STRINGS
*/
#ifndef GFILE_NEED_SCANG
- #define GFILE_NEED_SCANG FALSE
+ #define GFILE_NEED_SCANG GFXOFF
#endif
/**
* @brief Include the string based file functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFILE_NEED_STRINGS
- #define GFILE_NEED_STRINGS FALSE
+ #define GFILE_NEED_STRINGS GFXOFF
#endif
/**
* @brief Map many stdio functions to their GFILE equivalent
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This replaces the functions in stdio.h with equivalents
* - Do not include stdio.h as it has different conflicting definitions.
*/
#ifndef GFILE_NEED_STDIO
- #define GFILE_NEED_STDIO FALSE
+ #define GFILE_NEED_STDIO GFXOFF
#endif
/**
* @brief Include the USER file system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note The User FS vmt strcture 'FsUSERVMT' must be defined and implemented in the user's project.
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the USER file system by prefixing
@@ -88,11 +88,11 @@
* used is not one used by the other file systems.
*/
#ifndef GFILE_NEED_USERFS
- #define GFILE_NEED_USERFS FALSE
+ #define GFILE_NEED_USERFS GFXOFF
#endif
/**
* @brief Include the ROM file system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the ROM file system by prefixing
* its name with "S|" (the letter 'S', followed by a vertical bar).
@@ -101,11 +101,11 @@
* converted to .h files using the file2c utility (using flags "-dbcs").
*/
#ifndef GFILE_NEED_ROMFS
- #define GFILE_NEED_ROMFS FALSE
+ #define GFILE_NEED_ROMFS GFXOFF
#endif
/**
* @brief Include the RAM file system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the RAM file system by prefixing
* its name with "R|" (the letter 'R', followed by a vertical bar).
@@ -113,11 +113,11 @@
* to be allocated in RAM.
*/
#ifndef GFILE_NEED_RAMFS
- #define GFILE_NEED_RAMFS FALSE
+ #define GFILE_NEED_RAMFS GFXOFF
#endif
/**
* @brief Include the FAT file system driver based on the FATFS library
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the FAT file system by prefixing
* its name with "F|" (the letter 'F', followed by a vertical bar).
@@ -126,11 +126,11 @@
* one can be used at a time. The block interfaces are also different.
*/
#ifndef GFILE_NEED_FATFS
- #define GFILE_NEED_FATFS FALSE
+ #define GFILE_NEED_FATFS GFXOFF
#endif
/**
* @brief Include the FAT file system driver based on the PETITFS library
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the FAT file system by prefixing
* its name with "F|" (the letter 'F', followed by a vertical bar).
@@ -142,11 +142,11 @@
* @note PETITFS can only have one file open at a time.
*/
#ifndef GFILE_NEED_PETITFS
- #define GFILE_NEED_PETITFS FALSE
+ #define GFILE_NEED_PETITFS GFXOFF
#endif
/**
* @brief Include the operating system's native file system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If GFILE_ALLOW_DEVICESPECIFIC is on then you can ensure that you are
* opening a file on the native file system by prefixing
* its name with "N|" (the letter 'N', followed by a vertical bar).
@@ -155,11 +155,11 @@
* If it is not defined the gfileStdOut and gfileStdErr io is discarded.
*/
#ifndef GFILE_NEED_NATIVEFS
- #define GFILE_NEED_NATIVEFS FALSE
+ #define GFILE_NEED_NATIVEFS GFXOFF
#endif
/**
* @brief Include ChibiOS BaseFileStream support
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @pre This is only relevant on the ChibiOS operating system.
* @note Use the @p gfileOpenBaseFileStream() call to open a GFILE based on a
* BaseFileStream. The BaseFileStream must already be open.
@@ -167,25 +167,25 @@
* must be pre-opened using the operating system.
*/
#ifndef GFILE_NEED_CHIBIOSFS
- #define GFILE_NEED_CHIBIOSFS FALSE
+ #define GFILE_NEED_CHIBIOSFS GFXOFF
#endif
/**
* @brief Include raw memory pointer support
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Use the @p gfileOpenMemory() call to open a GFILE based on a
* memory pointer. The GFILE opened appears to be of unlimited size.
* @note A GFile of this type cannot be opened by filename.
*/
#ifndef GFILE_NEED_MEMFS
- #define GFILE_NEED_MEMFS FALSE
+ #define GFILE_NEED_MEMFS GFXOFF
#endif
/**
* @brief Include support for file list functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Adds support for @p gfileOpenFileList(), @p gfileReadFileList() and @p gfileCloseFileList().
*/
#ifndef GFILE_NEED_FILELISTS
- #define GFILE_NEED_FILELISTS FALSE
+ #define GFILE_NEED_FILELISTS GFXOFF
#endif
/**
* @}
@@ -197,7 +197,7 @@
* @brief Add floating point support to printg/scang etc.
*/
#ifndef GFILE_ALLOW_FLOATS
- #define GFILE_ALLOW_FLOATS FALSE
+ #define GFILE_ALLOW_FLOATS GFXOFF
#endif
/**
* @brief Can the device be specified as part of the file name.
@@ -206,7 +206,7 @@
* specific device.
*/
#ifndef GFILE_ALLOW_DEVICESPECIFIC
- #define GFILE_ALLOW_DEVICESPECIFIC FALSE
+ #define GFILE_ALLOW_DEVICESPECIFIC GFXOFF
#endif
/**
* @brief The maximum number of open files
@@ -228,7 +228,7 @@
* be compatible with uGFX memory management.
*/
#ifndef GFILE_FATFS_EXTERNAL_LIB
- #define GFILE_FATFS_EXTERNAL_LIB FALSE
+ #define GFILE_FATFS_EXTERNAL_LIB GFXOFF
#endif
/**
* @brief TUse an external PETITFS library instead of the uGFX inbuilt one
@@ -238,7 +238,7 @@
* @note The users pffconf.h file still needs to be reachable when compiling uGFX.
*/
#ifndef GFILE_PETITFS_EXTERNAL_LIB
- #define GFILE_PETITFS_EXTERNAL_LIB FALSE
+ #define GFILE_PETITFS_EXTERNAL_LIB GFXOFF
#endif
/** @} */
diff --git a/src/gfx.c b/src/gfx.c
index dac9e470..67f034a1 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -11,7 +11,7 @@
*/
/* Display various warnings from gfx_rules.h */
-#define GFX_DISPLAY_RULE_WARNINGS TRUE
+#define GFX_DISPLAY_RULE_WARNINGS GFXON
#include "../gfx.h"
diff --git a/src/gfx_compilers.h b/src/gfx_compilers.h
index 6d1dae1e..8ca1f2d4 100644
--- a/src/gfx_compilers.h
+++ b/src/gfx_compilers.h
@@ -25,12 +25,12 @@
*/
/**
* @brief Should various inline ugfx functions be non-inline.
- * @details Defaults to FALSE
- * @note Generally there is no need to set this to TRUE as it will have huge performance impacts
+ * @details Defaults to GFXOFF
+ * @note Generally there is no need to set this to GFXON as it will have huge performance impacts
* in the driver level.
*/
#ifndef GFX_NO_INLINE
- #define GFX_NO_INLINE FALSE
+ #define GFX_NO_INLINE GFXOFF
#endif
// Set the no inline value
@@ -42,7 +42,7 @@
* @brief Show which compiler we detected as a compiler warning message
*/
#ifndef GFX_SHOW_COMPILER
- #define GFX_SHOW_COMPILER FALSE
+ #define GFX_SHOW_COMPILER GFXOFF
#endif
/**
@@ -371,7 +371,7 @@
#define GFX_COMPILER_VERSION_PATCH ((__CC65__)%0x10)
#elif GFX_COMPILER == GFX_COMPILER_CLANG
#define GFX_COMPILER_NAME "CLang (LLVM)"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC
#define GFX_COMPILER_VERSION_MAJOR (__clang_major__)
#define GFX_COMPILER_VERSION_MINOR (__clang_minor__)
@@ -411,7 +411,7 @@
#define GFX_COMPILER_VERSION_MINOR (_RELEASE_MINOR)
#elif GFX_COMPILER == GFX_COMPILER_CYGWIN
#define GFX_COMPILER_NAME "Cygwin"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC
#define GFX_COMPILER_VERSION_MAJOR (__GNUC__)
#define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__)
@@ -469,7 +469,7 @@
#warning "Compiler: EDG"
#endif
#define GFX_COMPILER_NAME "EDG C++"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_VERSION_MAJOR ((__EDG_VERSION__)/100)
#define GFX_COMPILER_VERSION_MINOR ((__EDG_VERSION__)%100)
#pragma diag_remark = Pe301
@@ -494,7 +494,7 @@
#define GFX_COMPILER_NAME "Fujitsu C++"
#elif GFX_COMPILER == GFX_COMPILER_GCC
#define GFX_COMPILER_NAME "GCC"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC
#define GFX_COMPILER_VERSION_MAJOR (__GNUC__)
#define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__)
@@ -535,7 +535,7 @@
#warning "Compiler: IAR"
#endif
#define GFX_COMPILER_NAME "IAR C++"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_VERSION_MAJOR ((__VER__)/100)
#define GFX_COMPILER_VERSION_MINOR ((__VER__)%100)
#pragma diag_remark = Pe301
@@ -599,7 +599,7 @@
#warning "Compiler: KEIL"
#endif
#define GFX_COMPILER_NAME "Keil"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#if defined(__ARMCC_VERSION)
#define GFX_COMPILER_VERSION_MAJOR ((__ARMCC_VERSION)/1000000)
#define GFX_COMPILER_VERSION_MINOR (((__ARMCC_VERSION)/10000)%100)
@@ -657,7 +657,7 @@
#define GFX_COMPILER_NAME "Microway NDP C"
#elif GFX_COMPILER == GFX_COMPILER_MINGW32
#define GFX_COMPILER_NAME "MingW32"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_GCC
#define GFX_COMPILER_VERSION_MAJOR (__GNUC__)
#define GFX_COMPILER_VERSION_MINOR (__GNUC_MINOR__)
@@ -848,7 +848,7 @@
#warning "Compiler: TINYC"
#endif
#define GFX_COMPILER_NAME "Tiny C"
- #define GFX_COMPILER_TESTED TRUE
+ #define GFX_COMPILER_TESTED GFXON
#elif GFX_COMPILER == GFX_COMPILER_TURBOC
#if GFX_SHOW_COMPILER && GFX_DISPLAY_RULE_WARNINGS
#warning "Compiler: TURBOC"
@@ -928,7 +928,7 @@
#endif
#ifndef GFX_COMPILER_TESTED
- #define GFX_COMPILER_TESTED FALSE
+ #define GFX_COMPILER_TESTED GFXOFF
#endif
#ifndef GFX_COMPILER_WARNING_TYPE
#define GFX_COMPILER_WARNING_TYPE GFX_COMPILER_WARNING_DIRECT
@@ -1071,7 +1071,7 @@
/************************************ Start CPU Settings *****************************/
#if GFX_CPU == GFX_CPU_X86
#undef GFX_CPU_NO_ALIGNMENT_FAULTS
- #define GFX_CPU_NO_ALIGNMENT_FAULTS TRUE
+ #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXON
#undef GFX_CPU_ENDIAN
#define GFX_CPU_ENDIAN GFX_CPU_ENDIAN_LITTLE
#elif GFX_CPU == GFX_CPU_X64
@@ -1082,16 +1082,16 @@
/**
* @brief Does this CPU automatically handle alignment faults
- * @details Defaults to FALSE
- * @note Setting this to TRUE can decrease code size and increase speed but
+ * @details Defaults to GFXOFF
+ * @note Setting this to GFXON can decrease code size and increase speed but
* it should not be turned on with a CPU that can generate
* alignment segfaults.
- * @note If you are unsure leave this as FALSE as that generates
+ * @note If you are unsure leave this as GFXOFF as that generates
* the more conservative code.
* @note For some CPU's this can be auto-detected.
*/
#ifndef GFX_CPU_NO_ALIGNMENT_FAULTS
- #define GFX_CPU_NO_ALIGNMENT_FAULTS FALSE
+ #define GFX_CPU_NO_ALIGNMENT_FAULTS GFXOFF
#endif
/**
diff --git a/src/ginput/ginput.h b/src/ginput/ginput.h
index 0aae5391..0a52e543 100644
--- a/src/ginput/ginput.h
+++ b/src/ginput/ginput.h
@@ -15,7 +15,7 @@
* @details GINPUT provides an easy and common interface to use different input devices
* such as touchscreens and mices.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/ginput/ginput_dial.h b/src/ginput/ginput_dial.h
index e0292cb6..77c1b05c 100644
--- a/src/ginput/ginput_dial.h
+++ b/src/ginput/ginput_dial.h
@@ -16,8 +16,8 @@
* @details A dial provides a powerful way to navigate through menus
* on a display.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_DIAL must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_DIAL must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/ginput/ginput_keyboard.c b/src/ginput/ginput_keyboard.c
index 141bdd2b..68f05cea 100644
--- a/src/ginput/ginput_keyboard.c
+++ b/src/ginput/ginput_keyboard.c
@@ -17,7 +17,7 @@
#if GFX_USE_GINPUT && GINPUT_NEED_KEYBOARD
-#define MICROCODE_DEBUG FALSE
+#define MICROCODE_DEBUG GFXOFF
#if MICROCODE_DEBUG
#include <stdio.h>
diff --git a/src/ginput/ginput_mouse.c b/src/ginput/ginput_mouse.c
index 58abfce2..f60faccb 100644
--- a/src/ginput/ginput_mouse.c
+++ b/src/ginput/ginput_mouse.c
@@ -23,8 +23,16 @@
#define CALIBRATION_MINPRESS_PERIOD 300 // milliseconds
#define CALIBRATION_MAXPRESS_PERIOD 5000 // milliseconds
-#define CALIBRATION_FONT "* Double"
-#define CALIBRATION_FONT2 "* Narrow"
+#ifdef GINPUT_TOUCH_CALIBRATION_FONT1
+ #define CALIBRATION_FONT1 GINPUT_TOUCH_CALIBRATION_FONT1
+#else
+ #define CALIBRATION_FONT1 "* Double"
+#endif
+#ifdef GINPUT_TOUCH_CALIBRATION_FONT2
+ #define CALIBRATION_FONT2 GINPUT_TOUCH_CALIBRATION_FONT2
+#else
+ #define CALIBRATION_FONT2 "* Narrow"
+#endif
#define CALIBRATION_BACKGROUND Blue
#define CALIBRATION_CROSS_COLOR1 White
@@ -32,13 +40,21 @@
#define CALIBRATION_CROSS_INNERGAP 2
#define CALIBRATION_CROSS_RADIUS 15
-#define CALIBRATION_TITLE "Calibration"
+#ifdef GINPUT_TOUCH_CALIBRATION_TITLE
+ #define CALIBRATION_TITLE GINPUT_TOUCH_CALIBRATION_TITLE
+#else
+ #define CALIBRATION_TITLE "Calibration"
+#endif
#define CALIBRATION_TITLE_Y 5
#define CALIBRATION_TITLE_HEIGHT 30
#define CALIBRATION_TITLE_COLOR White
#define CALIBRATION_TITLE_BACKGROUND Blue
-#define CALIBRATION_ERROR_TEXT "Calibration Failed!"
+#ifdef GINPUT_TOUCH_CALIBRATION_ERROR
+ #define CALIBRATION_ERROR_TEXT GINPUT_TOUCH_CALIBRATION_ERROR
+#else
+ #define CALIBRATION_ERROR_TEXT "Calibration Failed!"
+#endif
#define CALIBRATION_ERROR_DELAY 3000
#define CALIBRATION_ERROR_COLOR Red
#define CALIBRATION_ERROR_BACKGROUND Yellow
@@ -60,7 +76,7 @@ static GTIMER_DECL(MouseTimer);
x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx);
y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy);
-
+
pt->x = x;
pt->y = y;
}
@@ -455,7 +471,7 @@ static void MousePoll(void *param) {
#endif
#if GDISP_NEED_TEXT
- font1 = gdispOpenFont(CALIBRATION_FONT);
+ font1 = gdispOpenFont(CALIBRATION_FONT1);
if (!font1) font1 = gdispOpenFont("*");
font2 = gdispOpenFont(CALIBRATION_FONT2);
if (!font2) font2 = gdispOpenFont("*");
diff --git a/src/ginput/ginput_mouse.h b/src/ginput/ginput_mouse.h
index 24005fe6..8d8b3b9a 100644
--- a/src/ginput/ginput_mouse.h
+++ b/src/ginput/ginput_mouse.h
@@ -15,8 +15,8 @@
*
* @details Both resistive and capacitive touchscreens are supported.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_MOUSE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_MOUSE must be set to GFXON in your gfxconf.h
*
* @{
*/
@@ -160,7 +160,7 @@ extern "C" {
* @param[in] sz The size in bytes of the data to retrieve.
*
* @note This routine is provided by the user application. It is only
- * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to TRUE in the
+ * called if GINPUT_TOUCH_USER_CALIBRATION_LOAD has been set to GFXON in the
* users gfxconf.h file.
*/
bool_t LoadMouseCalibration(unsigned instance, void *data, size_t sz);
@@ -174,7 +174,7 @@ extern "C" {
* @param[in] sz The size in bytes of the data to retrieve.
*
* @note This routine is provided by the user application. It is only
- * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to TRUE in the
+ * called if GINPUT_TOUCH_USER_CALIBRATION_SAVE has been set to GFXON in the
* users gfxconf.h file.
*/
bool_t SaveMouseCalibration(unsigned instance, const void *data, size_t sz);
diff --git a/src/ginput/ginput_options.h b/src/ginput/ginput_options.h
index 9fba51f9..f02a5a09 100644
--- a/src/ginput/ginput_options.h
+++ b/src/ginput/ginput_options.h
@@ -22,43 +22,43 @@
*/
/**
* @brief Should mouse/touch functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a mouse/touch hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/touch/MCU/driver.mk
*/
#ifndef GINPUT_NEED_MOUSE
- #define GINPUT_NEED_MOUSE FALSE
+ #define GINPUT_NEED_MOUSE GFXOFF
#endif
/**
* @brief Should keyboard functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a keyboard hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/keyboard/XXXX/driver.mk
*/
#ifndef GINPUT_NEED_KEYBOARD
- #define GINPUT_NEED_KEYBOARD FALSE
+ #define GINPUT_NEED_KEYBOARD GFXOFF
#endif
/**
* @brief Should hardware toggle/switch/button functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a toggle hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/toggle/Pal/driver.mk
*/
#ifndef GINPUT_NEED_TOGGLE
- #define GINPUT_NEED_TOGGLE FALSE
+ #define GINPUT_NEED_TOGGLE GFXOFF
#endif
/**
* @brief Should analog dial functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Also add a dial hardware driver to your makefile.
* Eg.
* include $(GFXLIB)/drivers/ginput/dial/analog/driver.mk
*/
#ifndef GINPUT_NEED_DIAL
- #define GINPUT_NEED_DIAL FALSE
+ #define GINPUT_NEED_DIAL GFXOFF
#endif
/**
* @}
@@ -74,16 +74,16 @@
*/
/**
* @brief Start touch devices without loading or running calibration.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This is used if you want to manually control the initial calibration
* process. In practice this is only useful for a touch driver test program.
*/
#ifndef GINPUT_TOUCH_STARTRAW
- #define GINPUT_TOUCH_STARTRAW FALSE
+ #define GINPUT_TOUCH_STARTRAW GFXOFF
#endif
/**
* @brief Turn off the touch calibration GUI.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Turning off the calibration GUI just turns off the manual calibration
* process. Readings may still be calibrated if calibration data
* can be loaded.
@@ -91,28 +91,28 @@
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOCALIBRATE_GUI
- #define GINPUT_TOUCH_NOCALIBRATE_GUI FALSE
+ #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXOFF
#endif
/**
* @brief Turn off all touch calibration support.
- * @details Defaults to FALSE
- * @note With this set to TRUE touch readings will not be calibrated.
+ * @details Defaults to GFXOFF
+ * @note With this set to GFXON touch readings will not be calibrated.
* @note This automatically turns off the calibration GUI too!
* @note Calibration requires a lot of code. If your device doesn't require it
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOCALIBRATE
- #define GINPUT_TOUCH_NOCALIBRATE FALSE
+ #define GINPUT_TOUCH_NOCALIBRATE GFXOFF
#endif
/**
* @brief Turn off all touch support.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This automatically turns off all calibration and the calibration GUI too!
* @note Touch device handling requires a lot of code. If your device doesn't require it
* using this option can save a lot of space.
*/
#ifndef GINPUT_TOUCH_NOTOUCH
- #define GINPUT_TOUCH_NOTOUCH FALSE
+ #define GINPUT_TOUCH_NOTOUCH GFXOFF
#endif
/**
* @brief Milliseconds between mouse polls.
@@ -143,19 +143,19 @@
#endif
/**
* @brief There is a user supplied routine to load mouse calibration data
- * @details Defaults to FALSE
- * @note If TRUE the user must supply the @p LoadMouseCalibration() routine.
+ * @details Defaults to GFXOFF
+ * @note If GFXON the user must supply the @p LoadMouseCalibration() routine.
*/
#ifndef GINPUT_TOUCH_USER_CALIBRATION_LOAD
- #define GINPUT_TOUCH_USER_CALIBRATION_LOAD FALSE
+ #define GINPUT_TOUCH_USER_CALIBRATION_LOAD GFXOFF
#endif
/**
* @brief There is a user supplied routine to save mouse calibration data
- * @details Defaults to FALSE
- * @note If TRUE the user must supply the @p SaveMouseCalibration() routine.
+ * @details Defaults to GFXOFF
+ * @note If GFXON the user must supply the @p SaveMouseCalibration() routine.
*/
#ifndef GINPUT_TOUCH_USER_CALIBRATION_SAVE
- #define GINPUT_TOUCH_USER_CALIBRATION_SAVE FALSE
+ #define GINPUT_TOUCH_USER_CALIBRATION_SAVE GFXOFF
#endif
#if defined(__DOXYGEN__)
/**
@@ -198,7 +198,7 @@
* @note Turning off the layout engine just saves code if it is not needed.
*/
#ifndef GKEYBOARD_LAYOUT_OFF
- #define GKEYBOARD_LAYOUT_OFF FALSE
+ #define GKEYBOARD_LAYOUT_OFF GFXOFF
#endif
/**
* @brief Various Keyboard Layouts that can be included.
@@ -212,7 +212,7 @@
* @{
*/
#ifndef GKEYBOARD_LAYOUT_SCANCODE2_US
- #define GKEYBOARD_LAYOUT_SCANCODE2_US FALSE // US Keyboard using the ScanCode 2 set.
+ #define GKEYBOARD_LAYOUT_SCANCODE2_US GFXOFF // US Keyboard using the ScanCode 2 set.
#endif
/** @} */
/** @} */
diff --git a/src/ginput/ginput_rules.h b/src/ginput/ginput_rules.h
index 5825e2f0..d78f0c4c 100644
--- a/src/ginput/ginput_rules.h
+++ b/src/ginput/ginput_rules.h
@@ -20,35 +20,35 @@
#if !GFX_USE_GEVENT
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #warning "GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GINPUT: GFX_USE_GEVENT is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GEVENT
- #define GFX_USE_GEVENT TRUE
+ #define GFX_USE_GEVENT GFXON
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you."
+ #warning "GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GINPUT: GFX_USE_GTIMER is required if GFX_USE_GINPUT is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#endif
#if GINPUT_NEED_MOUSE
#if GINPUT_TOUCH_NOTOUCH
// No warning needed for this
#undef GINPUT_TOUCH_NOCALIBRATE
- #define GINPUT_TOUCH_NOCALIBRATE TRUE
+ #define GINPUT_TOUCH_NOCALIBRATE GFXON
#endif
#if GINPUT_TOUCH_NOCALIBRATE
// No warning needed for this
#undef GINPUT_TOUCH_NOCALIBRATE_GUI
- #define GINPUT_TOUCH_NOCALIBRATE_GUI TRUE
+ #define GINPUT_TOUCH_NOCALIBRATE_GUI GFXON
#endif
#if !GINPUT_TOUCH_NOTOUCH && GINPUT_MOUSE_CLICK_TIME > GINPUT_TOUCH_CXTCLICK_TIME
#error "GINPUT MOUSE: The GINPUT_MOUSE_CLICK_TIME must be <= GINPUT_TOUCH_CXTCLICK_TIME"
diff --git a/src/ginput/ginput_toggle.h b/src/ginput/ginput_toggle.h
index ad896bf6..7d028301 100644
--- a/src/ginput/ginput_toggle.h
+++ b/src/ginput/ginput_toggle.h
@@ -16,8 +16,8 @@
* @details GINPUT allows it to interface toggle buttons easily to your
* application.
*
- * @pre GFX_USE_GINPUT must be set to TRUE in your gfxconf.h
- * @pre GINPUT_NEED_TOGGLE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GINPUT must be set to GFXON in your gfxconf.h
+ * @pre GINPUT_NEED_TOGGLE must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gmisc/gmisc_options.h b/src/gmisc/gmisc_options.h
index 5dce4d94..0523c111 100644
--- a/src/gmisc/gmisc_options.h
+++ b/src/gmisc/gmisc_options.h
@@ -22,38 +22,38 @@
*/
/**
* @brief Include array operation functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GMISC_NEED_ARRAYOPS
- #define GMISC_NEED_ARRAYOPS FALSE
+ #define GMISC_NEED_ARRAYOPS GFXOFF
#endif
/**
* @brief Include fast floating point trig functions (fsin, fcos)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GMISC_NEED_FASTTRIG
- #define GMISC_NEED_FASTTRIG FALSE
+ #define GMISC_NEED_FASTTRIG GFXOFF
#endif
/**
* @brief Include fast fixed point trig functions (ffsin, ffcos)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GMISC_NEED_FIXEDTRIG
- #define GMISC_NEED_FIXEDTRIG FALSE
+ #define GMISC_NEED_FIXEDTRIG GFXOFF
#endif
/**
* @brief Include fast inverse square root (x^-1/2)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GMISC_NEED_INVSQRT
- #define GMISC_NEED_INVSQRT FALSE
+ #define GMISC_NEED_INVSQRT GFXOFF
#endif
/**
* @brief Include polygon hit test functions
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GMISC_NEED_HITTEST_POLY
- #define GMISC_NEED_HITTEST_POLY FALSE
+ #define GMISC_NEED_HITTEST_POLY GFXOFF
#endif
/**
* @}
@@ -75,7 +75,7 @@
* GMISC_INVSQRT_REAL_SLOW and it will do it the hard way.
*/
#ifndef GMISC_INVSQRT_MIXED_ENDIAN
- #define GMISC_INVSQRT_MIXED_ENDIAN FALSE
+ #define GMISC_INVSQRT_MIXED_ENDIAN GFXOFF
#endif
/**
* @brief Modifies the @p invsqrt() function to do things the long slow way.
@@ -84,7 +84,7 @@
* @note This makes the @p invsqrt() function very slow.
*/
#ifndef GMISC_INVSQRT_REAL_SLOW
- #define GMISC_INVSQRT_REAL_SLOW FALSE
+ #define GMISC_INVSQRT_REAL_SLOW GFXOFF
#endif
/** @} */
diff --git a/src/gos/gos.h b/src/gos/gos.h
index da09a38a..9ba12889 100644
--- a/src/gos/gos.h
+++ b/src/gos/gos.h
@@ -88,8 +88,6 @@
* @note Your platform may use slightly different definitions to these
* @{
*/
- #define FALSE 0
- #define TRUE 1
#define TIME_IMMEDIATE 0
#define TIME_INFINITE ((delaytime_t)-1)
#define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1))
@@ -193,7 +191,7 @@
* @api
*/
#ifndef GFX_EMULATE_MALLOC
- #define GFX_EMULATE_MALLOC FALSE
+ #define GFX_EMULATE_MALLOC GFXOFF
#endif
/**
diff --git a/src/gos/gos_arduino.h b/src/gos/gos_arduino.h
index 3019d271..a9b0c140 100644
--- a/src/gos/gos_arduino.h
+++ b/src/gos/gos_arduino.h
@@ -59,8 +59,8 @@ extern "C" {
/* Use the generic thread handling and heap handling */
/*===========================================================================*/
-#define GOS_NEED_X_THREADS TRUE
-#define GOS_NEED_X_HEAP TRUE
+#define GOS_NEED_X_THREADS GFXON
+#define GOS_NEED_X_HEAP GFXON
#include "gos_x_threads.h"
#include "gos_x_heap.h"
diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index aedfb492..cb683631 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -10,10 +10,13 @@
#if GFX_USE_OS_CHIBIOS
-// This shouldn't be needed but some people are complaining
-// about TRUE/FALSE redefinition so we fix it here.
-#undef TRUE
-#undef FALSE
+#if GFX_COMPAT_V2
+ // This shouldn't be needed but some people are complaining
+ // about TRUE/FALSE redefinition so we fix it here.
+ // ChibiOS will define them in its own header files.
+ #undef TRUE
+ #undef FALSE
+#endif
#include "ch.h"
#include "hal.h"
@@ -33,12 +36,6 @@
* are already defined by ChibiOS
*/
-#if !defined(FALSE)
- #define FALSE 0
-#endif
-#if !defined(TRUE)
- #define TRUE -1
-#endif
#if (CH_KERNEL_MAJOR == 3) || (CH_KERNEL_MAJOR == 4)
typedef char bool_t;
#endif
diff --git a/src/gos/gos_cmsis.h b/src/gos/gos_cmsis.h
index 85aa1362..aad4cb84 100644
--- a/src/gos/gos_cmsis.h
+++ b/src/gos/gos_cmsis.h
@@ -99,7 +99,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_
/* Use the generic heap handling */
/*===========================================================================*/
-#define GOS_NEED_X_HEAP TRUE
+#define GOS_NEED_X_HEAP GFXON
#include "gos_x_heap.h"
#endif /* GFX_USE_OS_CMSIS */
diff --git a/src/gos/gos_cmsis2.h b/src/gos/gos_cmsis2.h
index 8a54491b..1f4eab5e 100644
--- a/src/gos/gos_cmsis2.h
+++ b/src/gos/gos_cmsis2.h
@@ -61,7 +61,7 @@ extern "C" {
#define gfxExit() os_error(0)
#define gfxHalt(msg) os_error(1)
-#define gfxSystemTicks() osKernelGetSysTimerCount()
+#define gfxSystemTicks() osKernelGetTickCount()
#define gfxMillisecondsToTicks(ms) (1000*(ms)/osKernelGetTickFreq())
#define gfxSystemLock() osKernelLock()
#define gfxSystemUnlock() osKernelUnlock()
@@ -92,7 +92,7 @@ gfxThreadHandle gfxThreadCreate(void* stackarea, size_t stacksz, threadpriority_
/* Use the generic heap handling */
/*===========================================================================*/
-#define GOS_NEED_X_HEAP TRUE
+#define GOS_NEED_X_HEAP GFXON
#include "gos_x_heap.h"
#endif /* GFX_USE_OS_CMSIS */
diff --git a/src/gos/gos_ecos.c b/src/gos/gos_ecos.c
index a55773d9..a2af5dbf 100644
--- a/src/gos/gos_ecos.c
+++ b/src/gos/gos_ecos.c
@@ -12,7 +12,7 @@
void _gosInit(void)
{
#if !GFX_OS_NO_INIT
- #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
+ #error "GOS: Operating System initialization for eCos is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h"
#endif
#if !GFX_OS_INIT_NO_WARNING
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
diff --git a/src/gos/gos_ecos.h b/src/gos/gos_ecos.h
index 0e438fb0..b03243f3 100644
--- a/src/gos/gos_ecos.h
+++ b/src/gos/gos_ecos.h
@@ -27,8 +27,6 @@ typedef cyg_int32 int32_t;
typedef cyg_uint32 uint32_t;
typedef cyg_uint32 size_t;
-#define TRUE -1
-#define FALSE 0
#define TIME_IMMEDIATE 0
#define TIME_INFINITE 0xFFFFFFFF
diff --git a/src/gos/gos_freertos.h b/src/gos/gos_freertos.h
index a0f1ed18..87ef8163 100644
--- a/src/gos/gos_freertos.h
+++ b/src/gos/gos_freertos.h
@@ -42,7 +42,6 @@
* int16_t, uint16_t,
* int32_t, uint32_t,
* size_t
- * TRUE, FALSE
* are already defined by FreeRTOS
*/
#define TIME_IMMEDIATE 0
diff --git a/src/gos/gos_keil.h b/src/gos/gos_keil.h
index 863986d4..35d6e4e1 100644
--- a/src/gos/gos_keil.h
+++ b/src/gos/gos_keil.h
@@ -19,13 +19,13 @@
* Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS RTOS port
*/
-// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE."
+// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON."
#undef GFX_USE_OS_KEIL
-#define GFX_USE_OS_KEIL FALSE
+#define GFX_USE_OS_KEIL GFXOFF
// Enable generic CMSIS RTOS implementation
#undef GFX_USE_OS_CMSIS
-#define GFX_USE_OS_CMSIS TRUE
+#define GFX_USE_OS_CMSIS GFXON
#include "gos_cmsis.h"
#endif /* GFX_USE_OS_KEIL */
diff --git a/src/gos/gos_linux.c b/src/gos/gos_linux.c
index 43371443..bd4e0060 100644
--- a/src/gos/gos_linux.c
+++ b/src/gos/gos_linux.c
@@ -13,7 +13,7 @@
#if GFX_USE_OS_LINUX
// Linux seems to have deprecated pthread_yield() and now says to use sched_yield()
-#define USE_SCHED_NOT_PTHREAD_YIELD TRUE
+#define USE_SCHED_NOT_PTHREAD_YIELD GFXON
#include <stdio.h>
#include <unistd.h>
diff --git a/src/gos/gos_linux.h b/src/gos/gos_linux.h
index b9bfe82e..f1973615 100644
--- a/src/gos/gos_linux.h
+++ b/src/gos/gos_linux.h
@@ -12,7 +12,7 @@
// We don't put this in the general sys_options.h as it is Linux specific.
#ifndef GFX_USE_POSIX_SEMAPHORES
- #define GFX_USE_POSIX_SEMAPHORES TRUE
+ #define GFX_USE_POSIX_SEMAPHORES GFXON
#endif
#include <sys/types.h>
diff --git a/src/gos/gos_nios.h b/src/gos/gos_nios.h
index 4aadc45d..75bf5676 100644
--- a/src/gos/gos_nios.h
+++ b/src/gos/gos_nios.h
@@ -34,8 +34,8 @@ systemticks_t gfxMillisecondsToTicks(delaytime_t ms);
// Use the generic thread handling and heap handling
-#define GOS_NEED_X_THREADS TRUE
-#define GOS_NEED_X_HEAP TRUE
+#define GOS_NEED_X_THREADS GFXON
+#define GOS_NEED_X_HEAP GFXON
#include "gos_x_threads.h"
#include "gos_x_heap.h"
diff --git a/src/gos/gos_options.h b/src/gos/gos_options.h
index 319af5d5..3f04ca4a 100644
--- a/src/gos/gos_options.h
+++ b/src/gos/gos_options.h
@@ -22,115 +22,115 @@
*/
/**
* @brief Use ChibiOS
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_CHIBIOS
- #define GFX_USE_OS_CHIBIOS FALSE
+ #define GFX_USE_OS_CHIBIOS GFXOFF
#endif
/**
* @brief Use FreeRTOS
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_FREERTOS
- #define GFX_USE_OS_FREERTOS FALSE
+ #define GFX_USE_OS_FREERTOS GFXOFF
#endif
/**
* @brief Use Win32
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_WIN32
- #define GFX_USE_OS_WIN32 FALSE
+ #define GFX_USE_OS_WIN32 GFXOFF
#endif
/**
* @brief Use a linux based system running X11
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_LINUX
- #define GFX_USE_OS_LINUX FALSE
+ #define GFX_USE_OS_LINUX GFXOFF
#endif
/**
* @brief Use a Mac OS-X based system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_OSX
- #define GFX_USE_OS_OSX FALSE
+ #define GFX_USE_OS_OSX GFXOFF
#endif
/**
* @brief Use a Raw 32-bit CPU based system (Bare Metal)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_RAW32
- #define GFX_USE_OS_RAW32 FALSE
+ #define GFX_USE_OS_RAW32 GFXOFF
#endif
/**
* @brief Use a eCos
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_ECOS
- #define GFX_USE_OS_ECOS FALSE
+ #define GFX_USE_OS_ECOS GFXOFF
#endif
/**
* @brief Use RAWRTOS
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_RAWRTOS
- #define GFX_USE_OS_RAWRTOS FALSE
+ #define GFX_USE_OS_RAWRTOS GFXOFF
#endif
/**
* @brief Use Arduino
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_ARDUINO
- #define GFX_USE_OS_ARDUINO FALSE
+ #define GFX_USE_OS_ARDUINO GFXOFF
#endif
/**
* @brief Use CMSIS RTOS compatible OS
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_CMSIS
- #define GFX_USE_OS_CMSIS FALSE
+ #define GFX_USE_OS_CMSIS GFXOFF
#endif
/**
* @brief Use CMSIS2 RTOS compatible OS
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_CMSIS2
- #define GFX_USE_OS_CMSIS2 FALSE
+ #define GFX_USE_OS_CMSIS2 GFXOFF
#endif
/**
* @brief Use Keil CMSIS 1.x (RTOS, RTX4)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_KEIL
- #define GFX_USE_OS_KEIL FALSE
+ #define GFX_USE_OS_KEIL GFXOFF
#endif
/**
* @brief Use Keil RTX5
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_RTX5
- #define GFX_USE_OS_RTX5 FALSE
+ #define GFX_USE_OS_RTX5 GFXOFF
#endif
/**
* @brief Use NIOS-II
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_NIOS
- #define GFX_USE_OS_NIOS FALSE
+ #define GFX_USE_OS_NIOS GFXOFF
#endif
/**
* @brief Use Zephyr
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_ZEPHYR
- #define GFX_USE_OS_ZEPHYR FALSE
+ #define GFX_USE_OS_ZEPHYR GFXOFF
#endif
/**
* @brief Use Qt
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_USE_OS_QT
- #define GFX_USE_OS_QT FALSE
+ #define GFX_USE_OS_QT GFXOFF
#endif
/**
* @}
@@ -179,7 +179,7 @@
//#define GFX_OS_EXTRA_DEINIT_FUNCTION myOSDeInitRoutine
/**
* @brief Should uGFX avoid initializing the operating system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This is not relevant to all operating systems eg Win32 never initializes the
* operating system as uGFX runs as an application outside the boot process.
* @note Operating system initialization is not necessarily implemented for all
@@ -189,21 +189,21 @@
* demo applications will not work without modification.
*/
#ifndef GFX_OS_NO_INIT
- #define GFX_OS_NO_INIT FALSE
+ #define GFX_OS_NO_INIT GFXOFF
#endif
/**
* @brief Turn off warnings about initializing the operating system
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This is only relevant where GOS cannot initialize the operating
* system automatically or the operating system initialization has been
* explicitly turned off.
*/
#ifndef GFX_OS_INIT_NO_WARNING
- #define GFX_OS_INIT_NO_WARNING FALSE
+ #define GFX_OS_INIT_NO_WARNING GFXOFF
#endif
/**
* @brief Call uGFXMain() after all initialisation
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note uGFXMain() is a function defined by the user in their project
* that contains the application main code. This is not expected to return
* and thus gfxInit() will also never return. This is required for some
@@ -213,7 +213,7 @@
* void uGFXMain(void);<br>
*/
#ifndef GFX_OS_CALL_UGFXMAIN
- #define GFX_OS_CALL_UGFXMAIN FALSE
+ #define GFX_OS_CALL_UGFXMAIN GFXOFF
#endif
/**
* @brief When uGFXMain() is started as a thread, what stack size should be used
@@ -228,10 +228,10 @@
#endif
/**
* @brief Should uGFX stuff be added to the FreeRTOS+Tracer
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GFX_FREERTOS_USE_TRACE
- #define GFX_FREERTOS_USE_TRACE FALSE
+ #define GFX_FREERTOS_USE_TRACE GFXOFF
#endif
/**
* @brief How much RAM should uGFX use for the heap when using its own internal heap allocator
@@ -250,7 +250,7 @@
#endif
/**
* @brief Enable wrappers for malloc() and free()
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note If enabled, malloc() and free() will be implemented as wrappers that call gfxAlloc() and
* gfxFree() in order to provide portability to libraries using these function.
* @note Enabling this can solve 'unresolved _sbrk' issues
@@ -258,7 +258,7 @@
* portability of uGFX applications across all platforms.
*/
#ifndef GFX_EMULATE_MALLOC
- #define GFX_EMULATE_MALLOC FALSE
+ #define GFX_EMULATE_MALLOC GFXOFF
#endif
/** @} */
diff --git a/src/gos/gos_raw32.h b/src/gos/gos_raw32.h
index 2937e52b..5ff38028 100644
--- a/src/gos/gos_raw32.h
+++ b/src/gos/gos_raw32.h
@@ -70,8 +70,8 @@ extern "C" {
/* Use the generic thread handling and heap handling */
/*===========================================================================*/
-#define GOS_NEED_X_THREADS TRUE
-#define GOS_NEED_X_HEAP TRUE
+#define GOS_NEED_X_THREADS GFXON
+#define GOS_NEED_X_HEAP GFXON
#include "gos_x_threads.h"
#include "gos_x_heap.h"
diff --git a/src/gos/gos_rawrtos.c b/src/gos/gos_rawrtos.c
index 23b0c6c1..8ff53883 100644
--- a/src/gos/gos_rawrtos.c
+++ b/src/gos/gos_rawrtos.c
@@ -25,7 +25,7 @@
void _gosInit(void)
{
#if !GFX_OS_NO_INIT
- #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to TRUE in your gfxconf.h"
+ #error "GOS: Operating System initialization for RawRTOS is not yet implemented in uGFX. Please set GFX_OS_NO_INIT to GFXON in your gfxconf.h"
#endif
#if !GFX_OS_INIT_NO_WARNING
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
diff --git a/src/gos/gos_rtx5.h b/src/gos/gos_rtx5.h
index b07a2164..9e70d8bb 100644
--- a/src/gos/gos_rtx5.h
+++ b/src/gos/gos_rtx5.h
@@ -19,13 +19,13 @@
* Keil RTX uses the CMSIS RTOS interface. Therefore, just use the CMSIS2 RTOS port
*/
-// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as TRUE."
+// Disable KEIL to avoid error: "GOS: More than one operation system has been defined as GFXON."
#undef GFX_USE_OS_RTX5
-#define GFX_USE_OS_RTX5 FALSE
+#define GFX_USE_OS_RTX5 GFXOFF
// Enable generic CMSIS RTOS implementation
#undef GFX_USE_OS_CMSIS2
-#define GFX_USE_OS_CMSIS2 TRUE
+#define GFX_USE_OS_CMSIS2 GFXON
#include "gos_cmsis2.h"
#endif /* GFX_USE_OS_RTX5 */
diff --git a/src/gos/gos_rules.h b/src/gos/gos_rules.h
index 2ea1b1b2..96b4b795 100644
--- a/src/gos/gos_rules.h
+++ b/src/gos/gos_rules.h
@@ -20,8 +20,8 @@
#error "GOS: No operating system has been defined."
#endif
-#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * TRUE
- #error "GOS: More than one operation system has been defined as TRUE."
+#if GFX_USE_OS_CHIBIOS + GFX_USE_OS_WIN32 + GFX_USE_OS_LINUX + GFX_USE_OS_OSX + GFX_USE_OS_RAW32 + GFX_USE_OS_FREERTOS + GFX_USE_OS_ECOS + GFX_USE_OS_RAWRTOS + GFX_USE_OS_ARDUINO + GFX_USE_OS_CMSIS + GFX_USE_OS_CMSIS2 + GFX_USE_OS_KEIL + GFX_USE_OS_RTX5 + GFX_USE_OS_NIOS + GFX_USE_OS_ZEPHYR + GFX_USE_OS_QT != 1 * GFXON
+ #error "GOS: More than one operation system has been defined as GFXON."
#endif
#if GFX_FREERTOS_USE_TRACE && !GFX_USE_OS_FREERTOS
@@ -43,7 +43,7 @@
#endif
#endif
#undef GFX_EMULATE_MALLOC
- #define GFX_EMULATE_MALLOC FALSE
+ #define GFX_EMULATE_MALLOC GFXOFF
#endif
#endif
diff --git a/src/gos/gos_x_threads.c b/src/gos/gos_x_threads.c
index b696ee77..52afd5c1 100644
--- a/src/gos/gos_x_threads.c
+++ b/src/gos/gos_x_threads.c
@@ -242,8 +242,8 @@ static thread mainthread; // The main thread context
*
* MACROS:
*
- * AUTO_DETECT_STACKFRAME TRUE/FALSE - TRUE to auto-detect stack frame structure
- * STACK_DIR_UP Macro/bool_t - TRUE if the stack grows up instead of down
+ * AUTO_DETECT_STACKFRAME GFXON/GFXOFF - GFXON to auto-detect stack frame structure
+ * STACK_DIR_UP Macro/bool_t - GFXON if the stack grows up instead of down
* MASK1 Macro/uint32_t - The 1st mask of jmp_buf elements that need relocation
* MASK2 Macro/uint32_t - The 2nd mask of jmp_buf elements that need relocation
* STACK_BASE Macro/size_t - The base of the stack frame relative to the local variables
@@ -252,8 +252,8 @@ static thread mainthread; // The main thread context
*/
#if GFX_COMPILER == GFX_COMPILER_MINGW32
- #define AUTO_DETECT_STACKFRAME FALSE
- #define STACK_DIR_UP FALSE
+ #define AUTO_DETECT_STACKFRAME GFXOFF
+ #define STACK_DIR_UP GFXOFF
#define MASK1 0x00000011
#define MASK2 0x00000000
#define STACK_BASE 12
@@ -263,8 +263,8 @@ static thread mainthread; // The main thread context
// Use auto-detection of the stack frame format
// Assumes all the relevant stuff to be relocated is in the first 256 bytes of the jmpbuf.
- #define AUTO_DETECT_STACKFRAME TRUE
- #define STACK_DIR_UP stackdirup // TRUE if the stack grow up instead of down
+ #define AUTO_DETECT_STACKFRAME GFXON
+ #define STACK_DIR_UP stackdirup // GFXON if the stack grow up instead of down
#define MASK1 jmpmask1 // The 1st mask of jmp_buf elements that need relocation
#define MASK2 jmpmask2 // The 2nd mask of jmp_buf elements that need relocation
#define STACK_BASE stackbase // The base of the stack frame relative to the local variables
diff --git a/src/gos/gos_x_threads_cortexm01.h b/src/gos/gos_x_threads_cortexm01.h
index 8afe1864..89a7d383 100644
--- a/src/gos/gos_x_threads_cortexm01.h
+++ b/src/gos/gos_x_threads_cortexm01.h
@@ -14,9 +14,9 @@
#if CORTEX_USE_FPU
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
+ #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead")
+ COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead")
#endif
#endif
diff --git a/src/gos/gos_x_threads_cortexm347.h b/src/gos/gos_x_threads_cortexm347.h
index 8e9ece61..489c0f14 100644
--- a/src/gos/gos_x_threads_cortexm347.h
+++ b/src/gos/gos_x_threads_cortexm347.h
@@ -15,9 +15,9 @@
#if CORTEX_USE_FPU
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
+ #warning "GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is TRUE. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead")
+ COMPILER_WARNING("GOS Threads: You have specified GFX_CPU=GFX_CPU_CORTX_M? with no hardware floating point support but CORTEX_USE_FPU is GFXON. Try using GFX_CPU_GFX_CPU_CORTEX_M?_FP instead")
#endif
#endif
diff --git a/src/gos/gos_zephyr.h b/src/gos/gos_zephyr.h
index 741e7587..0acb2c43 100644
--- a/src/gos/gos_zephyr.h
+++ b/src/gos/gos_zephyr.h
@@ -42,8 +42,6 @@
#define THREAD_RETURN(retval) return
- // #define FALSE 0
- // #define TRUE 1
#define TIME_IMMEDIATE K_NO_WAIT
#define TIME_INFINITE K_FOREVER
#define MAX_SEMAPHORE_COUNT ((semcount_t)(((unsigned long)((semcount_t)(-1))) >> 1))
diff --git a/src/gqueue/gqueue_options.h b/src/gqueue/gqueue_options.h
index a9f7302f..5b8e7bb9 100644
--- a/src/gqueue/gqueue_options.h
+++ b/src/gqueue/gqueue_options.h
@@ -22,30 +22,30 @@
*/
/**
* @brief Enable Asynchronous Queues
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GQUEUE_NEED_ASYNC
- #define GQUEUE_NEED_ASYNC FALSE
+ #define GQUEUE_NEED_ASYNC GFXOFF
#endif
/**
* @brief Enable Get-Synchronous Queues
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GQUEUE_NEED_GSYNC
- #define GQUEUE_NEED_GSYNC FALSE
+ #define GQUEUE_NEED_GSYNC GFXOFF
#endif
/**
* @brief Enable Fully Synchronous Queues
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GQUEUE_NEED_FSYNC
- #define GQUEUE_NEED_FSYNC FALSE
+ #define GQUEUE_NEED_FSYNC GFXOFF
#endif
/**
* @brief Enable Queue-able Data Buffers
*/
#ifndef GQUEUE_NEED_BUFFERS
- #define GQUEUE_NEED_BUFFERS FALSE
+ #define GQUEUE_NEED_BUFFERS GFXOFF
#endif
/**
* @}
diff --git a/src/gqueue/gqueue_rules.h b/src/gqueue/gqueue_rules.h
index ecdea7a9..0d411bc6 100644
--- a/src/gqueue/gqueue_rules.h
+++ b/src/gqueue/gqueue_rules.h
@@ -20,13 +20,13 @@
#if GQUEUE_NEED_BUFFERS && !GQUEUE_NEED_GSYNC
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is TRUE. It has been turned on for you."
+ #warning "GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GQUEUE: GQUEUE_NEED_GSYNC is required if GQUEUE_NEED_BUFFERS is GFXON. It has been turned on for you.")
#endif
#endif
#undef GQUEUE_NEED_GSYNC
- #define GQUEUE_NEED_GSYNC TRUE
+ #define GQUEUE_NEED_GSYNC GFXON
#endif
#endif
diff --git a/src/gtimer/gtimer.h b/src/gtimer/gtimer.h
index e818f3e7..cecf8e70 100644
--- a/src/gtimer/gtimer.h
+++ b/src/gtimer/gtimer.h
@@ -21,7 +21,7 @@
* This contrary to the goals of a real-time operating system. So a user-land
* (thread based) timer mechanism is also required.
*
- * @pre GFX_USE_GTIMER must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GTIMER must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h
index c3d18c31..1331a874 100644
--- a/src/gwin/gwin.h
+++ b/src/gwin/gwin.h
@@ -18,7 +18,7 @@
* will have it's own properties such as colors as well as
* it's own drawing origin.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
* @{
*/
@@ -493,7 +493,7 @@ extern "C" {
/**
* @brief Minimize, Maximize or Restore a window
- * @pre GWIN_NEED_WINDOWMANAGER must be TRUE
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
*
* @param[in] gh The window
* @param[in] minmax The new minimized/maximized state
@@ -514,7 +514,7 @@ extern "C" {
/**
* @brief Get the Minimized/Maximized state of a window
- * @pre GWIN_NEED_WINDOWMANAGER must be TRUE
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
*
* @param[in] gh The window
*
@@ -526,7 +526,7 @@ extern "C" {
/**
* @brief Raise a window to the top of the z-order
- * @pre GWIN_NEED_WINDOWMANAGER must be TRUE
+ * @pre GWIN_NEED_WINDOWMANAGER must be GFXON
*
* @param[in] gh The window
*
@@ -565,7 +565,7 @@ extern "C" {
* way every flash period (GWIN_FLASHING_PERIOD). How its appearance
* changes depends on the draw for each window/widget.
*
- * @pre Requires GWIN_NEED_FLASHING to be TRUE
+ * @pre Requires GWIN_NEED_FLASHING to be GFXON
*
* @api
*/
@@ -724,7 +724,7 @@ extern "C" {
* @note Uses the current foreground color to draw the inner circle
* @note Uses the current background color to draw the outer circle
* @note May leave GDISP clipping to this window's dimensions
- * @pre GDISP_NEED_DUALCIRCLE must be TRUE in your gfxconf.h
+ * @pre GDISP_NEED_DUALCIRCLE must be GFXON in your gfxconf.h
*
* @param[in] gh The window handle
* @param[in] x,y The center of the circle
diff --git a/src/gwin/gwin_button.h b/src/gwin/gwin_button.h
index 11af82e0..77751c04 100644
--- a/src/gwin/gwin_button.h
+++ b/src/gwin/gwin_button.h
@@ -18,8 +18,8 @@
* and check for different meta states such as: PRESSED, CLICKED,
* RELEASED etc.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_BUTTON must be set to GFXON in your gfxconf.h
* @{
*/
@@ -129,7 +129,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_ARC must be set to TRUE
+ * @pre GDISP_NEED_ARC must be set to GFXON
*
* @api
*/
@@ -143,7 +143,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_ELLIPSE must be set to TRUE
+ * @pre GDISP_NEED_ELLIPSE must be set to GFXON
*
* @api
*/
@@ -157,7 +157,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE
+ * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON
*
* @api
*/
@@ -169,7 +169,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE
+ * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON
*
* @api
*/
@@ -181,7 +181,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE
+ * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON
*
* @api
*/
@@ -193,7 +193,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* @param[in] gw The widget object (must be a button object)
* @param[in] param A parameter passed in from the user. Ignored by this function.
*
- * @pre GDISP_NEED_CONVEX_POLYGON must be set to TRUE
+ * @pre GDISP_NEED_CONVEX_POLYGON must be set to GFXON
*
* @api
*/
@@ -214,7 +214,7 @@ void gwinButtonDraw_Normal(GWidgetObject *gw, void *param);
* No checking is done to compare the size of the button to the size of the image.
* Note text is drawn on top of the image.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_checkbox.h b/src/gwin/gwin_checkbox.h
index b704dffe..b4a1c811 100644
--- a/src/gwin/gwin_checkbox.h
+++ b/src/gwin/gwin_checkbox.h
@@ -16,8 +16,8 @@
*
* @details GWIN allows it to easily create a group of checkbox buttons.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_CHECKBOX must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_CHECKBOX must be set to GFXON in your gfxconf.h
* @{
*/
diff --git a/src/gwin/gwin_console.c b/src/gwin/gwin_console.c
index ad5152f0..71d0905a 100644
--- a/src/gwin/gwin_console.c
+++ b/src/gwin/gwin_console.c
@@ -18,9 +18,9 @@
#include "gwin_class.h"
-#define GWIN_CONSOLE_USE_CLEAR_LINES TRUE // Clear each line before using it
-#define GWIN_CONSOLE_USE_FILLED_CHARS FALSE // Use filled characters instead of drawn characters
-#define GWIN_CONSOLE_BUFFER_SCROLLING TRUE // Use the history buffer to scroll when it is available
+#define GWIN_CONSOLE_USE_CLEAR_LINES GFXON // Clear each line before using it
+#define GWIN_CONSOLE_USE_FILLED_CHARS GFXOFF // Use filled characters instead of drawn characters
+#define GWIN_CONSOLE_BUFFER_SCROLLING GFXON // Use the history buffer to scroll when it is available
// Our control flags
#define GCONSOLE_FLG_NOSTORE (GWIN_FIRST_CONTROL_FLAG<<0)
diff --git a/src/gwin/gwin_console.h b/src/gwin/gwin_console.h
index 3da9df12..6b0f3fe6 100644
--- a/src/gwin/gwin_console.h
+++ b/src/gwin/gwin_console.h
@@ -17,8 +17,8 @@
* @details GWIN allows it to create a console/terminal like window.
* You can simply use chprintf() to print to the terminal.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_CONSOLE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_CONSOLE must be set to GFXON in your gfxconf.h
*
* @{
*/
@@ -99,7 +99,7 @@ GHandle gwinGConsoleCreate(GDisplay *g, GConsoleObject *gc, const GWindowInit *p
#if GWIN_CONSOLE_USE_HISTORY
/**
* @brief Assign a buffer to keep track of the content while the widget is invisible.
- * @pre GWIN_CONSOLE_USE_HISTORY must be set to TRUE in your gfxconf.h
+ * @pre GWIN_CONSOLE_USE_HISTORY must be set to GFXON in your gfxconf.h
*
* @param[in] gh The window handle (must be a console window)
* @param[in] onoff If TRUE a buffer is allocated to maintain console text
diff --git a/src/gwin/gwin_container.h b/src/gwin/gwin_container.h
index ce2ab4bd..9020c73e 100644
--- a/src/gwin/gwin_container.h
+++ b/src/gwin/gwin_container.h
@@ -16,7 +16,7 @@
* @details A Container is a GWindow that supports child windows. It is also
* a widget in its own right and therefore can accept user input directly.
*
- * @pre GFX_USE_GWIN and GWIN_NEED_CONTAINERS must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN and GWIN_NEED_CONTAINERS must be set to GFXON in your gfxconf.h
* @{
*/
@@ -173,7 +173,7 @@ void gwinContainerDraw_Transparent(GWidgetObject *gw, void *param);
* @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter
* to this function.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_frame.h b/src/gwin/gwin_frame.h
index f39d3df6..06488321 100644
--- a/src/gwin/gwin_frame.h
+++ b/src/gwin/gwin_frame.h
@@ -17,8 +17,8 @@
* @details A frame is a rectangular window that can have optional border as well as buttons to
* close, maximize and minimize it. The main purpose of this widget is to contain children.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_FRAME must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_FRAME must be set to GFXON in your gfxconf.h
* @{
*/
@@ -130,7 +130,7 @@ void gwinFrameDraw_Transparent(GWidgetObject *gw, void *param);
* @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter
* to this function.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_gl3d.h b/src/gwin/gwin_gl3d.h
index 52330029..fd1220b0 100644
--- a/src/gwin/gwin_gl3d.h
+++ b/src/gwin/gwin_gl3d.h
@@ -16,8 +16,8 @@
*
* @details 3D GWIN window based on OpenGL (or more exactly Tiny GL)
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_GL3D must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_GL3D must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gwin/gwin_graph.h b/src/gwin/gwin_graph.h
index 3f4c3181..61b411a2 100644
--- a/src/gwin/gwin_graph.h
+++ b/src/gwin/gwin_graph.h
@@ -16,8 +16,8 @@
*
* @details GWIN allows it to easily draw graphs.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_GRAPH must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_GRAPH must be set to GFXON in your gfxconf.h
*
* @{
*/
diff --git a/src/gwin/gwin_image.h b/src/gwin/gwin_image.h
index d3874f65..b45629ee 100644
--- a/src/gwin/gwin_image.h
+++ b/src/gwin/gwin_image.h
@@ -17,10 +17,10 @@
* @details GWIN allos it to create an image widget. The widget
* takes no user input.
*
- * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GDISP_NEED_IMAGE must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_IMAGE must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GDISP_NEED_IMAGE must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_IMAGE must be set to GFXON in your gfxconf.h
* @pre At least one image type must be enabled in your gfxconf.h
*
* @{
@@ -86,7 +86,7 @@ bool_t gwinImageOpenGFile(GHandle gh, GFILE *f);
/**
* @brief Sets the input routines that support reading the image from memory
* in RAM or flash.
- * @pre GFILE_NEED_MEMFS must be TRUE
+ * @pre GFILE_NEED_MEMFS must be GFXON
* @return TRUE if the IO open function succeeds
*
* @param[in] gh The widget (must be an image widget)
@@ -99,7 +99,7 @@ bool_t gwinImageOpenGFile(GHandle gh, GFILE *f);
/**
* @brief Sets the input routines that support reading the image from a BaseFileStream (eg. an SD-Card).
* @return TRUE if the IO open function succeeds
- * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be TRUE
+ * @pre GFILE_NEED_CHIBIOSFS and GFX_USE_OS_CHIBIOS must be GFXON
*
* @param[in] gh The widget (must be an image widget)
* @param[in] streamPtr A pointer to the (open) BaseFileStream object.
diff --git a/src/gwin/gwin_keyboard.h b/src/gwin/gwin_keyboard.h
index 98780485..68bf215f 100644
--- a/src/gwin/gwin_keyboard.h
+++ b/src/gwin/gwin_keyboard.h
@@ -18,8 +18,8 @@
* and check for different meta states such as: PRESSED, CLICKED,
* RELEASED etc.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_BUTTON must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_BUTTON must be set to GFXON in your gfxconf.h
* @{
*/
diff --git a/src/gwin/gwin_label.h b/src/gwin/gwin_label.h
index 1e8ba53e..66c4d97d 100644
--- a/src/gwin/gwin_label.h
+++ b/src/gwin/gwin_label.h
@@ -19,10 +19,10 @@
* dimensions of the label will change every time the text is changed
* through gwinSetText().
*
- * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_LABEL must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_LABEL must be set to GFXON in your gfxconf.h
* @pre The fonts you want to use must be enabled in your gfxconf.h
*
* @{
diff --git a/src/gwin/gwin_list.h b/src/gwin/gwin_list.h
index 81db7c34..ad64be75 100644
--- a/src/gwin/gwin_list.h
+++ b/src/gwin/gwin_list.h
@@ -16,10 +16,10 @@
*
* @details Provides advanced features such as multi-selection, smooth scrolling and item icons.
*
- * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_LIST must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_LIST must be set to GFXON in your gfxconf.h
* @pre The font you want to use must be enabled in your gfxconf.h
*
* @{
diff --git a/src/gwin/gwin_options.h b/src/gwin/gwin_options.h
index 6bf59d2a..06b7da5c 100644
--- a/src/gwin/gwin_options.h
+++ b/src/gwin/gwin_options.h
@@ -25,24 +25,24 @@
*/
/**
* @brief Should window manager support be included
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_WINDOWMANAGER
- #define GWIN_NEED_WINDOWMANAGER FALSE
+ #define GWIN_NEED_WINDOWMANAGER GFXOFF
#endif
/**
* @brief Should the widget hierarchy be included. This provides parent-child features.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_CONTAINERS
- #define GWIN_NEED_CONTAINERS FALSE
+ #define GWIN_NEED_CONTAINERS GFXOFF
#endif
/**
* @brief Should widget functions be included. Needed for any widget (eg Buttons, Sliders etc)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_WIDGET
- #define GWIN_NEED_WIDGET FALSE
+ #define GWIN_NEED_WIDGET GFXOFF
#endif
/**
* @brief The width of the rectangle that highlights a widget that is focused
@@ -53,115 +53,115 @@
#endif
/**
* @brief Should the simple container be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_CONTAINER
- #define GWIN_NEED_CONTAINER FALSE
+ #define GWIN_NEED_CONTAINER GFXOFF
#endif
/**
* @brief Should the frame widget be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_FRAME
- #define GWIN_NEED_FRAME FALSE
+ #define GWIN_NEED_FRAME GFXOFF
#endif
/**
* @brief Should console functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_CONSOLE
- #define GWIN_NEED_CONSOLE FALSE
+ #define GWIN_NEED_CONSOLE GFXOFF
#endif
/**
* @brief Should graph functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_GRAPH
- #define GWIN_NEED_GRAPH FALSE
+ #define GWIN_NEED_GRAPH GFXOFF
#endif
/**
* @brief Should gl3d functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_GL3D
- #define GWIN_NEED_GL3D FALSE
+ #define GWIN_NEED_GL3D GFXOFF
#endif
/**
* @brief Should button functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_BUTTON
- #define GWIN_NEED_BUTTON FALSE
+ #define GWIN_NEED_BUTTON GFXOFF
#endif
/**
* @brief Should progressbar functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_PROGRESSBAR
- #define GWIN_NEED_PROGRESSBAR FALSE
+ #define GWIN_NEED_PROGRESSBAR GFXOFF
#endif
/**
* @brief Should slider functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_SLIDER
- #define GWIN_NEED_SLIDER FALSE
+ #define GWIN_NEED_SLIDER GFXOFF
#endif
/**
* @brief Should checkbox functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_CHECKBOX
- #define GWIN_NEED_CHECKBOX FALSE
+ #define GWIN_NEED_CHECKBOX GFXOFF
#endif
/**
* @brief Should image functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_IMAGE
- #define GWIN_NEED_IMAGE FALSE
+ #define GWIN_NEED_IMAGE GFXOFF
#endif
/**
* @brief Should label functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_LABEL
- #define GWIN_NEED_LABEL FALSE
+ #define GWIN_NEED_LABEL GFXOFF
#endif
/**
* @brief Should radio button functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_RADIO
- #define GWIN_NEED_RADIO FALSE
+ #define GWIN_NEED_RADIO GFXOFF
#endif
/**
* @brief Should list widget functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_LIST
- #define GWIN_NEED_LIST FALSE
+ #define GWIN_NEED_LIST GFXOFF
#endif
/**
* @brief Should tabset functions be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_TABSET
- #define GWIN_NEED_TABSET FALSE
+ #define GWIN_NEED_TABSET GFXOFF
#endif
/**
* @brief Should the virtual keyboard be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_KEYBOARD
- #define GWIN_NEED_KEYBOARD FALSE
+ #define GWIN_NEED_KEYBOARD GFXOFF
#endif
/**
* @brief Should the textedit widget be included.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_TEXTEDIT
- #define GWIN_NEED_TEXTEDIT FALSE
+ #define GWIN_NEED_TEXTEDIT GFXOFF
#endif
/**
* @}
@@ -171,59 +171,59 @@
*/
/**
* @brief Add a tag to each widget
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Adds a tag member to each widget. Any events created include this tag.
* The enables switch based application logic to detect the event source.
*/
#ifndef GWIN_WIDGET_TAGS
- #define GWIN_WIDGET_TAGS FALSE
+ #define GWIN_WIDGET_TAGS GFXOFF
#endif
/**
* @brief Use flat styling for controls rather than a 3D look
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note This may appear better on color-restricted displays
* @note Flat styling is less graphics and cpu intensive (marginally) than the default 3D look.
*/
#ifndef GWIN_FLAT_STYLING
- #define GWIN_FLAT_STYLING FALSE
+ #define GWIN_FLAT_STYLING GFXOFF
#endif
/**
* @brief Don't use a timer for redrawing windows
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Normally windows and widgets are redrawn on a timer. Setting this
* option causes them to be redrawn immediately. Note that this can
* cause extended blocking times on events and saves little code.
- * @note If GWIN_NEED_WINDOWMANAGER is FALSE then this setting is ignored
+ * @note If GWIN_NEED_WINDOWMANAGER is GFXOFF then this setting is ignored
* as redrawing always occurs immediately.
*/
#ifndef GWIN_REDRAW_IMMEDIATE
- #define GWIN_REDRAW_IMMEDIATE FALSE
+ #define GWIN_REDRAW_IMMEDIATE GFXOFF
#endif
/**
* @brief Redraw all windows in a single operation
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Windows are normally redraw one per gtimer cycle.
* Setting this option causes all windows to be redrawn in
* a single gtimer cycle. Note that this can
* cause extended blocking times on the timer thread but may
* speed up redraw slightly.
- * @note This is only relevant if GWIN_REDRAW_IMMEDIATE is FALSE.
+ * @note This is only relevant if GWIN_REDRAW_IMMEDIATE is GFXOFF.
* Everything always gets redrawn in a single operation if
- * GWIN_REDRAW_IMMEDIATE is TRUE.
+ * GWIN_REDRAW_IMMEDIATE is GFXON.
*/
#ifndef GWIN_REDRAW_SINGLEOP
- #define GWIN_REDRAW_SINGLEOP FALSE
+ #define GWIN_REDRAW_SINGLEOP GFXOFF
#endif
/**
* @brief Buttons should not insist the mouse is over the button on mouse release
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_BUTTON_LAZY_RELEASE
- #define GWIN_BUTTON_LAZY_RELEASE FALSE
+ #define GWIN_BUTTON_LAZY_RELEASE GFXOFF
#endif
/**
* @brief Should the content of the console be saved for redrawing.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details If this feature is enabled, the contents of the console will be saved
* as it is written. If a redraw is required it will be redrawn from the
* history. Scrolling will also use the history buffer if it is turned on.
@@ -241,11 +241,11 @@
* @note @p gwinConsoleSetBuffer() can be used to turn the history buffer off and on.
*/
#ifndef GWIN_CONSOLE_USE_HISTORY
- #define GWIN_CONSOLE_USE_HISTORY FALSE
+ #define GWIN_CONSOLE_USE_HISTORY GFXOFF
#endif
/**
* @brief Use font width averaging for the history buffer allocation.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @details If this feature is enabled, the width one third of the way between
* the font's character width minimum and maximum will be used instead
* of the font's minimum width.
@@ -257,27 +257,27 @@
* with many characters in it.
*/
#ifndef GWIN_CONSOLE_HISTORY_AVERAGING
- #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE
+ #define GWIN_CONSOLE_HISTORY_AVERAGING GFXOFF
#endif
/**
* @brief Should the history be turned on for all console windows when they are first created.
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note @p gwinConsoleSetBuffer() can be used to turn the history buffer off and on at
* any time.
*/
#ifndef GWIN_CONSOLE_HISTORY_ATCREATE
- #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE
+ #define GWIN_CONSOLE_HISTORY_ATCREATE GFXOFF
#endif
/**
* @brief Console Windows need floating point support in @p gwinPrintf
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_CONSOLE_USE_FLOAT
- #define GWIN_CONSOLE_USE_FLOAT FALSE
+ #define GWIN_CONSOLE_USE_FLOAT GFXOFF
#endif
/**
* @brief Console windows support escape sequences to control display
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*
* @note
* Currently supported:
@@ -292,60 +292,60 @@
* ESC J Clear the window
*/
#ifndef GWIN_CONSOLE_ESCSEQ
- #define GWIN_CONSOLE_ESCSEQ FALSE
+ #define GWIN_CONSOLE_ESCSEQ GFXOFF
#endif
/**
* @brief Console Windows need BaseStreamSequential support (ChibiOS only)
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note To use the ChibiOS basestream functions such as chprintf()
* for printing in a console window you need to set this option to
- * TRUE in your gfxconf.h and include in your application source file...
+ * GFXON in your gfxconf.h and include in your application source file...
* \#include "chprintf.h"
* In your makefile, as part of your list of C source files, include
* ${CHIBIOS}/os/various/chprintf.c
*/
#ifndef GWIN_CONSOLE_USE_BASESTREAM
- #define GWIN_CONSOLE_USE_BASESTREAM FALSE
+ #define GWIN_CONSOLE_USE_BASESTREAM GFXOFF
#endif
/**
* @brief Image windows can optionally support animated images
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_IMAGE_ANIMATION
- #define GWIN_NEED_IMAGE_ANIMATION FALSE
+ #define GWIN_NEED_IMAGE_ANIMATION GFXOFF
#endif
/**
* @brief Enable the API to use attributes in the label widget
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
* @note Using this feature is discouraged. The proper (and faster as well
* as more efficient) way is to use two separate labels.
*/
#ifndef GWIN_LABEL_ATTRIBUTE
- #define GWIN_LABEL_ATTRIBUTE FALSE
+ #define GWIN_LABEL_ATTRIBUTE GFXOFF
#endif
/**
* @brief Enable the API to use images in items in the list widget
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_NEED_LIST_IMAGES
- #define GWIN_NEED_LIST_IMAGES FALSE
+ #define GWIN_NEED_LIST_IMAGES GFXOFF
#endif
/**
* @brief Enable the API to automatically increment the progressbar over time
- * @details Defaults to FALSE
+ * @details Defaults to GFXOFF
*/
#ifndef GWIN_PROGRESSBAR_AUTO
- #define GWIN_PROGRESSBAR_AUTO FALSE
+ #define GWIN_PROGRESSBAR_AUTO GFXOFF
#endif
/**
* @brief Should the slider avoid snapping to a fixed position when the mouse is released
- * @details Defaults to FALSE
- * @note If FALSE the slider will snap to the closest set-able position when the
- * mouse is released. If TRUE it will maintain the position the
+ * @details Defaults to GFXOFF
+ * @note If GFXOFF the slider will snap to the closest set-able position when the
+ * mouse is released. If GFXON it will maintain the position the
* mouse was released at, except when at the minimum and maximum slider values.
*/
#ifndef GWIN_SLIDER_NOSNAP
- #define GWIN_SLIDER_NOSNAP FALSE
+ #define GWIN_SLIDER_NOSNAP GFXOFF
#endif
/**
* @brief The number of pixels of dead-band at each end of the slider
@@ -374,11 +374,11 @@
#endif
/**
* @brief Should flashing of widgets be supported
- * @details Defaults to FALSE
- * @pre Requires GWIN_NEED_WINDOWMANAGER to be TRUE
+ * @details Defaults to GFXOFF
+ * @pre Requires GWIN_NEED_WINDOWMANAGER to be GFXON
*/
#ifndef GWIN_NEED_FLASHING
- #define GWIN_NEED_FLASHING FALSE
+ #define GWIN_NEED_FLASHING GFXOFF
#endif
/**
* @brief What is the period for the flashing timer
@@ -398,7 +398,7 @@
* @}
*
* @name GWIN Virtual Keyboard Layouts
- * @brief One or more of these may be defined. They will only be created if GWIN_NEED_KEYBOARD is TRUE.
+ * @brief One or more of these may be defined. They will only be created if GWIN_NEED_KEYBOARD is GFXON.
* @{
*/
/**
@@ -406,7 +406,7 @@
* @details Defaults to VirtualKeyboardLayout_English1
*/
#ifndef GWIN_NEED_KEYBOARD_ENGLISH1
- #define GWIN_NEED_KEYBOARD_ENGLISH1 TRUE
+ #define GWIN_NEED_KEYBOARD_ENGLISH1 GFXON
#endif
/** @} */
diff --git a/src/gwin/gwin_progressbar.h b/src/gwin/gwin_progressbar.h
index 1824a4e9..646f6954 100644
--- a/src/gwin/gwin_progressbar.h
+++ b/src/gwin/gwin_progressbar.h
@@ -14,8 +14,8 @@
*
* @brief ProgressBar widget.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_PROGRESSBAR must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_PROGRESSBAR must be set to GFXON in your gfxconf.h
* @{
*/
@@ -213,7 +213,7 @@ void gwinProgressbarDraw_Std(GWidgetObject *gw, void *param);
* and inactive areas. No checking is done to compare the dimensions of the progressbar
* to the size of the image. Note text is drawn on top of the image.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_radio.h b/src/gwin/gwin_radio.h
index 3371a9ef..161cbb19 100644
--- a/src/gwin/gwin_radio.h
+++ b/src/gwin/gwin_radio.h
@@ -17,8 +17,8 @@
* @details RadioButtons need to be grouped together. This is archived by passing a group parameter through
* @p gwinRadioCreate().
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_RADIO must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_RADIO must be set to GFXON in your gfxconf.h
* @{
*/
diff --git a/src/gwin/gwin_rules.h b/src/gwin/gwin_rules.h
index c044be66..08e2e8f0 100644
--- a/src/gwin/gwin_rules.h
+++ b/src/gwin/gwin_rules.h
@@ -19,14 +19,14 @@
#if GFX_USE_GWIN
// Sub-system rules
#if !GFX_USE_GDISP
- #error "GWIN: GFX_USE_GDISP must be TRUE when using GWIN"
+ #error "GWIN: GFX_USE_GDISP must be GFXON when using GWIN"
#endif
#if !GDISP_NEED_CLIP
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE"
+ #warning "GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is GFXOFF"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is FALSE")
+ COMPILER_WARNING("GWIN: Drawing can occur outside the defined windows as GDISP_NEED_CLIP is GFXOFF")
#endif
#endif
#endif
@@ -42,7 +42,7 @@
#endif
#endif
#undef GWIN_NEED_CONTAINERS
- #define GWIN_NEED_CONTAINERS TRUE
+ #define GWIN_NEED_CONTAINERS GFXON
#endif
#endif
#if GWIN_NEED_BUTTON || GWIN_NEED_SLIDER || GWIN_NEED_CHECKBOX || GWIN_NEED_LABEL || GWIN_NEED_RADIO || GWIN_NEED_LIST || \
@@ -56,7 +56,7 @@
#endif
#endif
#undef GWIN_NEED_WIDGET
- #define GWIN_NEED_WIDGET TRUE
+ #define GWIN_NEED_WIDGET GFXON
#endif
#endif
@@ -71,100 +71,100 @@
#endif
#endif
#undef GWIN_NEED_WIDGET
- #define GWIN_NEED_WIDGET TRUE
+ #define GWIN_NEED_WIDGET GFXON
#endif
#endif
#if GWIN_NEED_WIDGET
#if !GDISP_NEED_TEXT
- #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is TRUE."
+ #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_WIDGET is GFXON."
#endif
#if !GFX_USE_GINPUT
// This test also ensures that GFX_USE_GEVENT is set
- #error "GWIN: GFX_USE_GINPUT is required if GWIN_NEED_WIDGET is TRUE"
+ #error "GWIN: GFX_USE_GINPUT is required if GWIN_NEED_WIDGET is GFXON"
#endif
#if !GWIN_NEED_WINDOWMANAGER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you."
+ #warning "GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GWIN: GWIN_NEED_WINDOWMANAGER is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you.")
#endif
#endif
#undef GWIN_NEED_WINDOWMANAGER
- #define GWIN_NEED_WINDOWMANAGER TRUE
+ #define GWIN_NEED_WINDOWMANAGER GFXON
#endif
#if !GDISP_NEED_MULTITHREAD
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you"
+ #warning "GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you"
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is TRUE. It has been turned on for you")
+ COMPILER_WARNING("GWIN: GDISP_NEED_MULTITHREAD is required if GWIN_NEED_WIDGET is GFXON. It has been turned on for you")
#endif
#endif
#undef GDISP_NEED_MULTITHREAD
- #define GDISP_NEED_MULTITHREAD TRUE
+ #define GDISP_NEED_MULTITHREAD GFXON
#endif
#endif
#if GWIN_NEED_WINDOWMANAGER
#if !GFX_USE_GQUEUE || !GQUEUE_NEED_ASYNC
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you."
+ #warning "GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GWIN: GFX_USE_GQUEUE and GQUEUE_NEED_ASYNC is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GQUEUE
#undef GQUEUE_NEED_ASYNC
- #define GFX_USE_GQUEUE TRUE
- #define GQUEUE_NEED_ASYNC TRUE
+ #define GFX_USE_GQUEUE GFXON
+ #define GQUEUE_NEED_ASYNC GFXON
#endif
#if !GFX_USE_GTIMER
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you."
+ #warning "GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is TRUE. It has been turned on for you.")
+ COMPILER_WARNING("GWIN: GFX_USE_GTIMER is required if GWIN_NEED_WINDOWMANAGER is GFXON. It has been turned on for you.")
#endif
#endif
#undef GFX_USE_GTIMER
- #define GFX_USE_GTIMER TRUE
+ #define GFX_USE_GTIMER GFXON
#endif
#endif
// Rules for individual objects
#if GWIN_NEED_LIST
#if !GDISP_NEED_TEXT
- #error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is TRUE."
+ #error "GWIN: GDISP_NEED_TEXT is required when GWIN_NEED_LIST is GFXON."
#endif
#endif
#if GWIN_NEED_RADIO
#if !GDISP_NEED_CIRCLE
#if GFX_DISPLAY_RULE_WARNINGS
#if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT
- #warning "GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets."
+ #warning "GWIN: GDISP_NEED_CIRCLE should be set to GFXON for much nicer radio button widgets."
#elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO
- COMPILER_WARNING("GWIN: GDISP_NEED_CIRCLE should be set to TRUE for much nicer radio button widgets.")
+ COMPILER_WARNING("GWIN: GDISP_NEED_CIRCLE should be set to GFXON for much nicer radio button widgets.")
#endif
#endif
#endif
#endif
#if GWIN_NEED_IMAGE
#if !GDISP_NEED_IMAGE
- #error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is TRUE."
+ #error "GWIN: GDISP_NEED_IMAGE is required when GWIN_NEED_IMAGE is GFXON."
#endif
#endif
#if GWIN_NEED_CONSOLE
#if !GDISP_NEED_TEXT
- #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is TRUE."
+ #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_CONSOLE is GFXON."
#endif
#endif
#if GWIN_NEED_TEXTEDIT
#if !GDISP_NEED_TEXT
- #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_TEXTEDIT is TRUE."
+ #error "GWIN: GDISP_NEED_TEXT is required if GWIN_NEED_TEXTEDIT is GFXON."
#endif
#if !(GINPUT_NEED_KEYBOARD || GWIN_NEED_KEYBOARD)
- #error "GWIN: GINPUT_NEED_KEYBOARD or GWIN_NEED_KEYBOARD is required if GWIN_NEED_TEXTEDIT is TRUE."
+ #error "GWIN: GINPUT_NEED_KEYBOARD or GWIN_NEED_KEYBOARD is required if GWIN_NEED_TEXTEDIT is GFXON."
#endif
#endif
#endif
diff --git a/src/gwin/gwin_slider.h b/src/gwin/gwin_slider.h
index 29cbeea0..616663be 100644
--- a/src/gwin/gwin_slider.h
+++ b/src/gwin/gwin_slider.h
@@ -16,8 +16,8 @@
*
* @details Extended events can be enabled using @p gwinSliderSendExtendedEvents().
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_SLIDER must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_SLIDER must be set to GFXON in your gfxconf.h
* @{
*/
@@ -191,7 +191,7 @@ void gwinSliderDraw_Std(GWidgetObject *gw, void *param);
* No checking is done to compare the size of the button to the size of the image.
* No text is drawn on top of the image.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_tabset.h b/src/gwin/gwin_tabset.h
index 6eaeb014..90d9eb3b 100644
--- a/src/gwin/gwin_tabset.h
+++ b/src/gwin/gwin_tabset.h
@@ -18,8 +18,8 @@
* Note: Although the tabset is implemented as a container - you don't put your controls
* directly on the tabset. Instead you create a page and put your widgets on the page.
*
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_TABSET must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_TABSET must be set to GFXON in your gfxconf.h
* @{
*/
@@ -224,7 +224,7 @@ void gwinTabsetDraw_Transparent(GWidgetObject *gw, void *param);
* @note The image must be already opened before calling @p gwinSetCustomDraw(). The handle is passed as the parameter
* to this function.
*
- * @pre GDISP_NEED_IMAGE must be set to TRUE
+ * @pre GDISP_NEED_IMAGE must be set to GFXON
*
* @api
*/
diff --git a/src/gwin/gwin_textedit.h b/src/gwin/gwin_textedit.h
index 8cf6c03e..0fdcc843 100644
--- a/src/gwin/gwin_textedit.h
+++ b/src/gwin/gwin_textedit.h
@@ -17,10 +17,10 @@
* @note Due to the modularity of the @p GINPUT module, the text input can either come from a real physical
* keyboard or from a vritual on-screen keyboard such as the @p KeyboardWidget.
*
- * @pre GFX_USE_GDISP must be set to TRUE in your gfxconf.h
- * @pre GFX_USE_GWIN must be set to TRUE in your gfxconf.h
- * @pre GDISP_NEED_TEXT must be set to TRUE in your gfxconf.h
- * @pre GWIN_NEED_TEXTEDIT must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GDISP must be set to GFXON in your gfxconf.h
+ * @pre GFX_USE_GWIN must be set to GFXON in your gfxconf.h
+ * @pre GDISP_NEED_TEXT must be set to GFXON in your gfxconf.h
+ * @pre GWIN_NEED_TEXTEDIT must be set to GFXON in your gfxconf.h
* @pre The fonts you want to use must be enabled in your gfxconf.h
*
* @{
diff --git a/src/gwin/gwin_widget.h b/src/gwin/gwin_widget.h
index ce7490cd..58c71b16 100644
--- a/src/gwin/gwin_widget.h
+++ b/src/gwin/gwin_widget.h
@@ -18,7 +18,7 @@
* via an input device such as a mouse or toggle buttons. It is the
* base class for widgets such as buttons and sliders.
*
- * @pre GFX_USE_GWIN and GWIN_NEED_WIDGET must be set to TRUE in your gfxconf.h
+ * @pre GFX_USE_GWIN and GWIN_NEED_WIDGET must be set to GFXON in your gfxconf.h
* @{
*/
@@ -234,7 +234,7 @@ const char *gwinGetText(GHandle gh);
#if (GFX_USE_GFILE && GFILE_NEED_PRINTG && GFILE_NEED_STRINGS) || defined(__DOXYGEN__)
/**
* @brief Set the text of a widget using a printf style format.
- * @pre GFX_USE_GFILE, GFILE_NEED_PRINTG and GFILE_NEED_STRINGS must all be TRUE
+ * @pre GFX_USE_GFILE, GFILE_NEED_PRINTG and GFILE_NEED_STRINGS must all be GFXON
*
* @param[in] gh The widget handle
* @param[in] fmt The format string using a printf/g syntax. See @p vsnprintg()
@@ -269,7 +269,7 @@ bool_t gwinIsWidget(GHandle gh);
*
* @note Non-widgets will ignore this call.
*
- * @pre Requires GWIN_WIDGET_TAGS to be TRUE
+ * @pre Requires GWIN_WIDGET_TAGS to be GFXON
*
* @api
*/
@@ -281,7 +281,7 @@ bool_t gwinIsWidget(GHandle gh);
*
* @param[in] gh The widget handle
*
- * @pre Requires GWIN_WIDGET_TAGS to be TRUE
+ * @pre Requires GWIN_WIDGET_TAGS to be GFXON
*
* @api
*/
diff --git a/tools/gmake_scripts/cpu_stm32m1.mk b/tools/gmake_scripts/cpu_stm32m1.mk
index 9c8246e6..777ae4f2 100644
--- a/tools/gmake_scripts/cpu_stm32m1.mk
+++ b/tools/gmake_scripts/cpu_stm32m1.mk
@@ -16,5 +16,5 @@
SRCFLAGS += -mcpu=cortex-m1 -falign-functions=16
LDFLAGS += -mcpu=cortex-m1
-DEFS += CORTEX_USE_FPU=FALSE
+DEFS += CORTEX_USE_FPU=GFXOFF
diff --git a/tools/gmake_scripts/cpu_stm32m3.mk b/tools/gmake_scripts/cpu_stm32m3.mk
index 87030aee..b430d7fd 100644
--- a/tools/gmake_scripts/cpu_stm32m3.mk
+++ b/tools/gmake_scripts/cpu_stm32m3.mk
@@ -16,5 +16,5 @@
SRCFLAGS += -mcpu=cortex-m3 -falign-functions=16
LDFLAGS += -mcpu=cortex-m3
-DEFS += CORTEX_USE_FPU=FALSE
+DEFS += CORTEX_USE_FPU=GFXOFF
diff --git a/tools/gmake_scripts/cpu_stm32m4.mk b/tools/gmake_scripts/cpu_stm32m4.mk
index 1e205eb6..db1efd07 100644
--- a/tools/gmake_scripts/cpu_stm32m4.mk
+++ b/tools/gmake_scripts/cpu_stm32m4.mk
@@ -16,9 +16,9 @@
SRCFLAGS += -mcpu=cortex-m4 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
LDFLAGS += -mcpu=cortex-m4 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-DEFS += CORTEX_USE_FPU=TRUE USE_FPU=hard
+DEFS += CORTEX_USE_FPU=GFXON USE_FPU=hard
LIBS += m
#SRCFLAGS += -mcpu=cortex-m4 -falign-functions=16
#LDFLAGS += -mcpu=cortex-m4
-#DEFS += CORTEX_USE_FPU=FALSE
+#DEFS += CORTEX_USE_FPU=GFXOFF
diff --git a/tools/gmake_scripts/cpu_stm32m7.mk b/tools/gmake_scripts/cpu_stm32m7.mk
index 78e1cc4e..c2d17b72 100644
--- a/tools/gmake_scripts/cpu_stm32m7.mk
+++ b/tools/gmake_scripts/cpu_stm32m7.mk
@@ -15,5 +15,5 @@
#
SRCFLAGS += -mcpu=cortex-m7 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
LDFLAGS += -mcpu=cortex-m7 -falign-functions=16 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -fsingle-precision-constant
-DEFS += CORTEX_USE_FPU=TRUE USE_FPU=hard
+DEFS += CORTEX_USE_FPU=GFXON USE_FPU=hard
LIBS += m \ No newline at end of file