From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 27 Feb 2018 17:44:21 +1000 Subject: First set of V3 macro changes --- drivers/gadc/AT91SAM7/gadc_lld_config.h | 4 ++-- drivers/gaudio/Win32/gaudio_play_config.h | 4 ++-- drivers/gaudio/Win32/gaudio_record_config.h | 4 ++-- drivers/gaudio/gadc/gaudio_record_board_template.h | 2 +- drivers/gaudio/gadc/gaudio_record_gadc.c | 2 +- drivers/gaudio/pwm/gaudio_play_config.h | 2 +- drivers/gaudio/vs1053/gaudio_play_config.h | 6 ++--- drivers/gaudio/vs1053/gaudio_play_vs1053.c | 2 +- drivers/gaudio/vs1053/readme.txt | 2 +- drivers/gdisp/AlteraFramereader/gdisp_lld_config.h | 8 +++---- drivers/gdisp/AlteraFramereader/readme.txt | 2 +- drivers/gdisp/ED060SC4/board_ED060SC4_template.h | 2 +- drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c | 2 +- drivers/gdisp/ED060SC4/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ED060SC4/readme.txt | 2 +- drivers/gdisp/Fb24bpp/board_fb24bpp_template.h | 2 +- drivers/gdisp/Fb24bpp/gdisp_lld_config.h | 6 ++--- drivers/gdisp/Fb24bpp/readme.txt | 2 +- drivers/gdisp/HX8347D/gdisp_lld_config.h | 4 ++-- drivers/gdisp/ILI9225/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ILI9320/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ILI9325/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ILI9341/gdisp_lld_config.h | 6 ++--- drivers/gdisp/ILI9342/gdisp_lld_config.h | 4 ++-- drivers/gdisp/ILI93xx/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ILI9481/gdisp_lld_config.h | 6 ++--- drivers/gdisp/ILI9488/gdisp_lld_config.h | 6 ++--- drivers/gdisp/KS0108/board_KS0108_example.h | 10 ++++----- drivers/gdisp/KS0108/gdisp_lld_config.h | 2 +- drivers/gdisp/LGDP4532/gdisp_lld_config.h | 8 +++---- drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h | 4 ++-- .../gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c | 4 ++-- drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h | 14 ++++++------ drivers/gdisp/PCD8544/gdisp_lld_config.h | 8 +++---- drivers/gdisp/PCF8812/gdisp_lld_config.h | 8 +++---- drivers/gdisp/QImage/gdisp_lld_config.h | 4 ++-- drivers/gdisp/R61505U/gdisp_lld_config.h | 8 +++---- drivers/gdisp/RA6963/board_RA6963.h | 10 ++++----- drivers/gdisp/RA6963/gdisp_lld_RA6963.c | 26 +++++++++++----------- drivers/gdisp/RA6963/gdisp_lld_config.h | 10 ++++----- drivers/gdisp/RA8875/gdisp_lld_config.h | 8 +++---- drivers/gdisp/S6D1121/gdisp_lld_config.h | 8 +++---- drivers/gdisp/SPFD54124B/gdisp_lld_config.h | 4 ++-- drivers/gdisp/SSD1289/board_SSD1289_template.h | 6 ++--- drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c | 4 ++-- drivers/gdisp/SSD1289/gdisp_lld_config.h | 12 +++++----- drivers/gdisp/SSD1306/gdisp_lld_config.h | 10 ++++----- drivers/gdisp/SSD1306/readme.txt | 2 +- drivers/gdisp/SSD1322/board_SSD1322_template.h | 2 +- drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c | 2 +- drivers/gdisp/SSD1322/gdisp_lld_config.h | 8 +++---- drivers/gdisp/SSD1322/readme.txt | 2 +- drivers/gdisp/SSD1331/gdisp_lld_config.h | 8 +++---- drivers/gdisp/SSD1351/gdisp_lld_config.h | 6 ++--- drivers/gdisp/SSD1848/gdisp_lld_config.h | 12 +++++----- drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c | 4 ++-- drivers/gdisp/SSD1963/gdisp_lld_config.h | 4 ++-- drivers/gdisp/SSD1963/readme.txt | 2 +- drivers/gdisp/SSD2119/board_SSD2119_template.h | 6 ++--- drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c | 4 ++-- drivers/gdisp/SSD2119/gdisp_lld_config.h | 12 +++++----- drivers/gdisp/ST7565/gdisp_lld_config.h | 8 +++---- drivers/gdisp/ST7735/gdisp_lld_ST7735.c | 6 ++--- drivers/gdisp/ST7735/gdisp_lld_config.h | 6 ++--- drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h | 2 +- drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c | 8 +++---- drivers/gdisp/STM32LTDC/gdisp_lld_config.h | 12 +++++----- drivers/gdisp/STM32LTDC/readme.txt | 2 +- drivers/gdisp/TLS8204/gdisp_lld_config.h | 8 +++---- drivers/gdisp/TestStub/gdisp_lld_config.h | 4 ++-- drivers/gdisp/UC1601s/gdisp_lld_config.h | 10 ++++----- drivers/gdisp/UC1610/gdisp_lld_config.h | 6 ++--- drivers/gdisp/UC8173/board_UC8173_template.h | 8 +++---- drivers/gdisp/UC8173/gdisp_lld_UC8173.c | 14 ++++++------ drivers/gdisp/UC8173/gdisp_lld_config.h | 10 ++++----- .../gdisp/framebuffer/board_framebuffer_template.h | 2 +- drivers/gdisp/framebuffer/gdisp_lld_config.h | 6 ++--- drivers/gdisp/framebuffer/readme.txt | 2 +- .../dial/GADC/ginput_lld_dial_board_template.h | 2 +- drivers/ginput/dial/GADC/readme.txt | 6 ++--- drivers/ginput/toggle/Pal/readme.txt | 4 ++-- .../FT5336/gmouse_lld_FT5336_board_template.h | 4 ++-- .../FT5x06/gmouse_lld_FT5x06_board_template.h | 4 ++-- .../FT6x06/gmouse_lld_FT6x06_board_template.h | 4 ++-- .../gmouse_lld_linux_event_board_template.h | 6 ++--- .../ginput/touch/STMPE610/gmouse_lld_STMPE610.c | 6 ++--- .../STMPE610/gmouse_lld_STMPE610_board_template.h | 16 ++++++------- drivers/ginput/touch/STMPE610/readme.txt | 6 ++--- .../ginput/touch/STMPE811/gmouse_lld_STMPE811.c | 6 ++--- .../STMPE811/gmouse_lld_STMPE811_board_template.h | 16 ++++++------- drivers/ginput/touch/STMPE811/readme.txt | 6 ++--- drivers/multiple/SDL/gdisp_lld_SDL.c | 2 +- drivers/multiple/SDL/gdisp_lld_config.h | 12 +++++----- drivers/multiple/SDL/readme.txt | 6 ++--- drivers/multiple/Win32/gdisp_lld_Win32.c | 24 ++++++++++---------- drivers/multiple/Win32/gdisp_lld_config.h | 22 +++++++++--------- drivers/multiple/Win32/readme.txt | 8 +++---- drivers/multiple/X/gdisp_lld_X.c | 16 ++++++------- drivers/multiple/X/gdisp_lld_config.h | 12 +++++----- drivers/multiple/X/readme.txt | 6 ++--- drivers/multiple/uGFXnet/gdisp_lld_config.h | 14 ++++++------ drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 8 +++---- drivers/multiple/uGFXnet/ginput_lld_mouse_config.h | 10 ++++----- drivers/multiple/uGFXnet/readme.txt | 14 ++++++------ drivers/multiple/uGFXnetESP8266/gdisp_lld_config.h | 14 ++++++------ .../uGFXnetESP8266/gdisp_lld_uGFXnetESP8266.cpp | 2 +- .../uGFXnetESP8266/ginput_lld_mouse_config.h | 10 ++++----- drivers/multiple/uGFXnetESP8266/readme.txt | 8 +++---- 108 files changed, 375 insertions(+), 375 deletions(-) (limited to 'drivers') 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.
- * #define EINK_BLINKCLEAR TRUE + * #define EINK_BLINKCLEAR GFXON * * @note Number of passes to use when clearing the display
* #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 5d97df48..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 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 -- cgit v1.2.3