Browse Source

First set of V3 macro changes

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

2
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

4
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)
{

16
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 */

2
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

14
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)

2
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

2
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

2
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

6
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 */

2
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

2
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

2
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

2
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

4
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 = {

2
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

14
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)

2
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

2
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

2
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

2
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

2
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

2
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

2
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

2
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 */

2
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

2
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

2
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,

14
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

2
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

2
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.

2
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

2
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

4
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)

2
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

2
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

2
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

4
changelog.txt

@ -11,6 +11,10 @@ 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 ***

44
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 */

76
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 */

4
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

114
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 */

12
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 */

34
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 */

20
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 */

2
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

82
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 */

2
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

45
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 */

2
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

2
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 =

40
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 */

28
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 */

24
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 */

24
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 */

24
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 */

14
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 */

14
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 */