diff options
Diffstat (limited to 'drivers/gdisp')
69 files changed, 229 insertions, 229 deletions
diff --git a/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h b/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h index 637f4f4e..e147c159 100644 --- a/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h +++ b/drivers/gdisp/AlteraFramereader/gdisp_lld_config.h @@ -10,10 +10,10 @@ #if GFX_USE_GDISP -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 diff --git a/drivers/gdisp/AlteraFramereader/readme.txt b/drivers/gdisp/AlteraFramereader/readme.txt index 87777be4..d56ee27e 100644 --- a/drivers/gdisp/AlteraFramereader/readme.txt +++ b/drivers/gdisp/AlteraFramereader/readme.txt @@ -17,7 +17,7 @@ as swap the framebuffer pointers for the default GDisplay to draw to the other f To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON 2. To your makefile add the following lines: include $(GFXLIB)/gfx.mk diff --git a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h index 20e2088d..ad261b44 100644 --- a/drivers/gdisp/ED060SC4/board_ED060SC4_template.h +++ b/drivers/gdisp/ED060SC4/board_ED060SC4_template.h @@ -37,7 +37,7 @@ * * @note Do a "blinking" clear, i.e. clear to opposite polarity first. * This reduces the image persistence.<br> - * #define EINK_BLINKCLEAR TRUE + * #define EINK_BLINKCLEAR GFXON * * @note Number of passes to use when clearing the display<br> * #define EINK_CLEARCOUNT 10 diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c index cd54155c..8291cdcc 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c +++ b/drivers/gdisp/ED060SC4/gdisp_lld_ED060SC4.c @@ -59,7 +59,7 @@ /* Do a "blinking" clear, i.e. clear to opposite polarity first. * This reduces the image persistence. */ #ifndef EINK_BLINKCLEAR - #define EINK_BLINKCLEAR TRUE + #define EINK_BLINKCLEAR GFXON #endif /* Number of passes to use when clearing the display */ diff --git a/drivers/gdisp/ED060SC4/gdisp_lld_config.h b/drivers/gdisp/ED060SC4/gdisp_lld_config.h index 47e84779..8b485622 100644 --- a/drivers/gdisp/ED060SC4/gdisp_lld_config.h +++ b/drivers/gdisp/ED060SC4/gdisp_lld_config.h @@ -12,10 +12,10 @@ #if GFX_USE_GDISP -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_CLEARS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_CLEARS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO diff --git a/drivers/gdisp/ED060SC4/readme.txt b/drivers/gdisp/ED060SC4/readme.txt index 852a0010..2cdfbdda 100644 --- a/drivers/gdisp/ED060SC4/readme.txt +++ b/drivers/gdisp/ED060SC4/readme.txt @@ -54,7 +54,7 @@ Instead, it uses reverse engineered waveforms that are mostly functional. The following #defines control the waveforms: -#define EINK_BLINKCLEAR TRUE // Clear to opposite color first +#define EINK_BLINKCLEAR GFXON // Clear to opposite color first #define EINK_CLEARCOUNT 10 // Number of sweeps to clear the display #define EINK_WRITECOUNT 4 // Number of sweeps when writing to display diff --git a/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h b/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h index a8c669c9..ec129abe 100644 --- a/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h +++ b/drivers/gdisp/Fb24bpp/board_fb24bpp_template.h @@ -11,7 +11,7 @@ #endif // Uncomment this if your frame buffer device requires flushing -//#define GDISP_HARDWARE_FLUSH TRUE +//#define GDISP_HARDWARE_FLUSH GFXON #ifdef GDISP_DRIVER_VMT diff --git a/drivers/gdisp/Fb24bpp/gdisp_lld_config.h b/drivers/gdisp/Fb24bpp/gdisp_lld_config.h index 40798ea9..f6eed742 100644 --- a/drivers/gdisp/Fb24bpp/gdisp_lld_config.h +++ b/drivers/gdisp/Fb24bpp/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Any other support comes from the board file #include "board_fb24bpp.h" diff --git a/drivers/gdisp/Fb24bpp/readme.txt b/drivers/gdisp/Fb24bpp/readme.txt index 83e7f56b..9c738444 100644 --- a/drivers/gdisp/Fb24bpp/readme.txt +++ b/drivers/gdisp/Fb24bpp/readme.txt @@ -1,7 +1,7 @@ To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON 2. To your makefile add the following lines: include $(GFXLIB)/gfx.mk diff --git a/drivers/gdisp/HX8347D/gdisp_lld_config.h b/drivers/gdisp/HX8347D/gdisp_lld_config.h index 0602ca0e..f1b8cc1f 100644 --- a/drivers/gdisp/HX8347D/gdisp_lld_config.h +++ b/drivers/gdisp/HX8347D/gdisp_lld_config.h @@ -14,8 +14,8 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9225/gdisp_lld_config.h b/drivers/gdisp/ILI9225/gdisp_lld_config.h index 1bad8632..aaf99a9f 100644 --- a/drivers/gdisp/ILI9225/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9225/gdisp_lld_config.h @@ -12,10 +12,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_FILLS GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI9320/gdisp_lld_config.h b/drivers/gdisp/ILI9320/gdisp_lld_config.h index 04834079..09e99f0d 100644 --- a/drivers/gdisp/ILI9320/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9320/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -//#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +//#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI9325/gdisp_lld_config.h b/drivers/gdisp/ILI9325/gdisp_lld_config.h index 95bd2937..78c1b983 100644 --- a/drivers/gdisp/ILI9325/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9325/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/ILI9341/gdisp_lld_config.h b/drivers/gdisp/ILI9341/gdisp_lld_config.h index d3625d70..f5beef27 100644 --- a/drivers/gdisp/ILI9341/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9341/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -//#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +//#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI9342/gdisp_lld_config.h b/drivers/gdisp/ILI9342/gdisp_lld_config.h index 7dfd0627..963940af 100644 --- a/drivers/gdisp/ILI9342/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9342/gdisp_lld_config.h @@ -14,8 +14,8 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI93xx/gdisp_lld_config.h b/drivers/gdisp/ILI93xx/gdisp_lld_config.h index 0fd5ffac..6bd75c73 100644 --- a/drivers/gdisp/ILI93xx/gdisp_lld_config.h +++ b/drivers/gdisp/ILI93xx/gdisp_lld_config.h @@ -10,10 +10,10 @@ #if GFX_USE_GDISP -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI9481/gdisp_lld_config.h b/drivers/gdisp/ILI9481/gdisp_lld_config.h index ba48718a..4a9140e4 100644 --- a/drivers/gdisp/ILI9481/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9481/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/ILI9488/gdisp_lld_config.h b/drivers/gdisp/ILI9488/gdisp_lld_config.h index dd128d28..251b28c3 100644 --- a/drivers/gdisp/ILI9488/gdisp_lld_config.h +++ b/drivers/gdisp/ILI9488/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/KS0108/board_KS0108_example.h b/drivers/gdisp/KS0108/board_KS0108_example.h index 86541f73..ffc6e9c2 100644 --- a/drivers/gdisp/KS0108/board_KS0108_example.h +++ b/drivers/gdisp/KS0108/board_KS0108_example.h @@ -38,11 +38,11 @@ // My Settings #define GDISP_SCREEN_HEIGHT 64 #define GDISP_SCREEN_WIDTH 128 -#define KS0108_NEED_READ FALSE -#define KS0108_HAS_RESET FALSE -#define KS0108_NEED_BACKLIGHT FALSE -#define KS0108_NEED_PWMBACKLIGHT FALSE -#define KS0108_NOP_DLY TRUE //doesn't work for me without! +#define KS0108_NEED_READ GFXOFF +#define KS0108_HAS_RESET GFXOFF +#define KS0108_NEED_BACKLIGHT GFXOFF +#define KS0108_NEED_PWMBACKLIGHT GFXOFF +#define KS0108_NOP_DLY GFXON //doesn't work for me without! #define LINE_D0 PAL_LINE(GPIOB, 0U) #define LINE_D1 PAL_LINE(GPIOB, 1U) diff --git a/drivers/gdisp/KS0108/gdisp_lld_config.h b/drivers/gdisp/KS0108/gdisp_lld_config.h index a153e224..6aa50672 100644 --- a/drivers/gdisp/KS0108/gdisp_lld_config.h +++ b/drivers/gdisp/KS0108/gdisp_lld_config.h @@ -12,7 +12,7 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_DRAWPIXEL TRUE +#define GDISP_HARDWARE_DRAWPIXEL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO #endif /* _GDISP_LLD_CONFIG_H */ diff --git a/drivers/gdisp/LGDP4532/gdisp_lld_config.h b/drivers/gdisp/LGDP4532/gdisp_lld_config.h index 3f11ecc3..a8a4014a 100644 --- a/drivers/gdisp/LGDP4532/gdisp_lld_config.h +++ b/drivers/gdisp/LGDP4532/gdisp_lld_config.h @@ -10,10 +10,10 @@ #if GFX_USE_GDISP -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h index 3f29f611..424cc43b 100644 --- a/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h +++ b/drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h @@ -14,8 +14,8 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_STREAM_WRITE TRUE +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_STREAM_WRITE GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB444
diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c index 8488d732..1eea9e58 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_Nokia6610GE8.c @@ -34,7 +34,7 @@ * * Some of the more modern controllers have a broken command set. If you have one of these * you will recognise it by the colors being off on anything drawn after an odd (as opposed to - * even) pixel count area being drawn. If so then set GDISP_GE8_BROKEN_CONTROLLER to TRUE + * even) pixel count area being drawn. If so then set GDISP_GE8_BROKEN_CONTROLLER to GFXON * on your gdisp_lld_board.h file. The price is that streaming calls that are completed * without exactly the window size write operations and where the number of write operations * is odd (rather than even), it will draw an extra pixel. If this is important to you, turn on @@ -67,7 +67,7 @@ // Set parameters if they are not already set #ifndef GDISP_GE8_BROKEN_CONTROLLER - #define GDISP_GE8_BROKEN_CONTROLLER TRUE + #define GDISP_GE8_BROKEN_CONTROLLER GFXON #endif #ifndef GDISP_SCREEN_HEIGHT #define GDISP_SCREEN_HEIGHT 130 diff --git a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h index 83b2d629..1735088f 100644 --- a/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h +++ b/drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h @@ -20,17 +20,17 @@ * define GDISP_NOKIA_ORIENTATION as false in your gfxconf.h. */ #ifndef GDISP_NOKIA_ORIENTATION - #define GDISP_NOKIA_ORIENTATION TRUE + #define GDISP_NOKIA_ORIENTATION GFXON #endif #if GDISP_NOKIA_ORIENTATION && GDISP_NEED_CONTROL - #define GDISP_HARDWARE_CONTROL TRUE - #define GDISP_HARDWARE_DRAWPIXEL TRUE - #define GDISP_HARDWARE_FILLS TRUE - #define GDISP_HARDWARE_BITFILLS TRUE + #define GDISP_HARDWARE_CONTROL GFXON + #define GDISP_HARDWARE_DRAWPIXEL GFXON + #define GDISP_HARDWARE_FILLS GFXON + #define GDISP_HARDWARE_BITFILLS GFXON #else - #define GDISP_HARDWARE_CONTROL TRUE - #define GDISP_HARDWARE_STREAM_WRITE TRUE + #define GDISP_HARDWARE_CONTROL GFXON + #define GDISP_HARDWARE_STREAM_WRITE GFXON #endif #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB444 diff --git a/drivers/gdisp/PCD8544/gdisp_lld_config.h b/drivers/gdisp/PCD8544/gdisp_lld_config.h index 253b2aaf..9771b2ab 100644 --- a/drivers/gdisp/PCD8544/gdisp_lld_config.h +++ b/drivers/gdisp/PCD8544/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Set this to your frame buffer pixel format. #ifndef GDISP_LLD_PIXELFORMAT diff --git a/drivers/gdisp/PCF8812/gdisp_lld_config.h b/drivers/gdisp/PCF8812/gdisp_lld_config.h index 253b2aaf..9771b2ab 100644 --- a/drivers/gdisp/PCF8812/gdisp_lld_config.h +++ b/drivers/gdisp/PCF8812/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Set this to your frame buffer pixel format. #ifndef GDISP_LLD_PIXELFORMAT diff --git a/drivers/gdisp/QImage/gdisp_lld_config.h b/drivers/gdisp/QImage/gdisp_lld_config.h index ae97cfcb..4d143bed 100644 --- a/drivers/gdisp/QImage/gdisp_lld_config.h +++ b/drivers/gdisp/QImage/gdisp_lld_config.h @@ -13,8 +13,8 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB888 diff --git a/drivers/gdisp/R61505U/gdisp_lld_config.h b/drivers/gdisp/R61505U/gdisp_lld_config.h index 04834079..09e99f0d 100644 --- a/drivers/gdisp/R61505U/gdisp_lld_config.h +++ b/drivers/gdisp/R61505U/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -//#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +//#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/RA6963/board_RA6963.h b/drivers/gdisp/RA6963/board_RA6963.h index a7e1426b..6d959775 100755 --- a/drivers/gdisp/RA6963/board_RA6963.h +++ b/drivers/gdisp/RA6963/board_RA6963.h @@ -26,11 +26,11 @@ #define _GDISP_LLD_BOARD_H
// My Settings
-#define RA6963_NEED_READ FALSE //works, but is very slow!
-#define RA6963_HAS_RESET FALSE
-#define RA6963_NEED_FONT_SELECT FALSE
-#define RA6963_NEED_BACKLIGHT FALSE
-#define RA6963_NEED_PWMBACKLIGHT FALSE
+#define RA6963_NEED_READ GFXOFF //works, but is very slow!
+#define RA6963_HAS_RESET GFXOFF
+#define RA6963_NEED_FONT_SELECT GFXOFF
+#define RA6963_NEED_BACKLIGHT GFXOFF
+#define RA6963_NEED_PWMBACKLIGHT GFXOFF
#define GDISP_SCREEN_HEIGHT 64
#define GDISP_SCREEN_WIDTH 128
#define GDISP_INITIAL_CONTRAST 50
diff --git a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c index 2a983a65..7cf741d6 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_RA6963.c +++ b/drivers/gdisp/RA6963/gdisp_lld_RA6963.c @@ -117,16 +117,16 @@ #define RA6963_TEXT_HOME (RA6963_GRAPHIC_HOME + RA6963_GRAPHIC_SIZE)
//#define RA6963_OFFSET_REGISTER 2
-#if (RA6963_NEED_READ == FALSE)
-#define BUFFSZ (RA6963_GRAPHIC_SIZE)
-#define RAM(g) ((uint8_t *)g->priv)
-#define POS (((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA))
+#if !RA6963_NEED_READ
+ #define BUFFSZ (RA6963_GRAPHIC_SIZE)
+ #define RAM(g) ((uint8_t *)g->priv)
+ #define POS (((g->p.x) / RA6963_FONT_WIDTH) + ((g->p.y) * RA6963_GRAPHIC_AREA))
#endif
#ifndef GDISP_INITIAL_CONTRAST
-#define GDISP_INITIAL_CONTRAST 50
+ #define GDISP_INITIAL_CONTRAST 50
#endif
#ifndef GDISP_INITIAL_BACKLIGHT
-#define GDISP_INITIAL_BACKLIGHT 100
+ #define GDISP_INITIAL_BACKLIGHT 100
#endif
@@ -142,11 +142,11 @@ /*===========================================================================*/
LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
-#if (RA6963_NEED_READ == FALSE)
+#if RA6963_NEED_READ
+ g->priv = 0;
+#else
// The private area is the display surface.
g->priv = gfxAlloc(BUFFSZ);
-#else
- g->priv = 0;
#endif
// Initialise the board interface
init_board(g);
@@ -228,10 +228,10 @@ static void set_viewport(GDisplay *g) { LLDSPEC void gdisp_lld_write_color(GDisplay *g) {
uint8_t temp;
-#if (RA6963_NEED_READ == FALSE)
- temp = RAM(g)[POS];
-#else
+#if RA6963_NEED_READ
temp = read_data(g);
+#else
+ temp = RAM(g)[POS];
#endif
if (g->p.color != White) {
@@ -242,7 +242,7 @@ LLDSPEC void gdisp_lld_write_color(GDisplay *g) { }
write_data(g, temp);
-#if (RA6963_NEED_READ == FALSE)
+#if !RA6963_NEED_READ
RAM(g)[POS] = temp;
#endif
//write_cmd(g, RA6963_DATA_WRITE_AND_INCREMENT);
diff --git a/drivers/gdisp/RA6963/gdisp_lld_config.h b/drivers/gdisp/RA6963/gdisp_lld_config.h index 15c81d70..a829f9ff 100755 --- a/drivers/gdisp/RA6963/gdisp_lld_config.h +++ b/drivers/gdisp/RA6963/gdisp_lld_config.h @@ -13,12 +13,12 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE FALSE
-#define GDISP_HARDWARE_STREAM_READ FALSE
-#define GDISP_HARDWARE_CONTROL FALSE
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
+#define GDISP_HARDWARE_STREAM_WRITE GFXOFF
+#define GDISP_HARDWARE_STREAM_READ GFXOFF
+#define GDISP_HARDWARE_CONTROL GFXOFF
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
-#define GDISP_HARDWARE_FILLS FALSE
+#define GDISP_HARDWARE_FILLS GFXOFF
#endif /* GFX_USE_GDISP */
diff --git a/drivers/gdisp/RA8875/gdisp_lld_config.h b/drivers/gdisp/RA8875/gdisp_lld_config.h index 03a58afa..1f4e0ac9 100644 --- a/drivers/gdisp/RA8875/gdisp_lld_config.h +++ b/drivers/gdisp/RA8875/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/S6D1121/gdisp_lld_config.h b/drivers/gdisp/S6D1121/gdisp_lld_config.h index 03a58afa..1f4e0ac9 100644 --- a/drivers/gdisp/S6D1121/gdisp_lld_config.h +++ b/drivers/gdisp/S6D1121/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/SPFD54124B/gdisp_lld_config.h b/drivers/gdisp/SPFD54124B/gdisp_lld_config.h index 52ac315b..335d4c70 100644 --- a/drivers/gdisp/SPFD54124B/gdisp_lld_config.h +++ b/drivers/gdisp/SPFD54124B/gdisp_lld_config.h @@ -20,8 +20,8 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_STREAM_WRITE TRUE +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_STREAM_WRITE GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/SSD1289/board_SSD1289_template.h b/drivers/gdisp/SSD1289/board_SSD1289_template.h index 86478c73..bbf8147a 100644 --- a/drivers/gdisp/SSD1289/board_SSD1289_template.h +++ b/drivers/gdisp/SSD1289/board_SSD1289_template.h @@ -58,10 +58,10 @@ static GFXINLINE uint16_t read_data(GDisplay *g) { } //Optional define if your board interface supports it -//#define GDISP_USE_DMA TRUE +//#define GDISP_USE_DMA GFXON -// Optional define - valid only when GDISP_USE_DMA is TRUE -//#define GDISP_NO_DMA_FROM_STACK FALSE +// Optional define - valid only when GDISP_USE_DMA is GFXON +//#define GDISP_NO_DMA_FROM_STACK GFXOFF #if defined(GDISP_USE_DMA) && GDISP_USE_DMA diff --git a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c index 722a71b3..e88798aa 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c +++ b/drivers/gdisp/SSD1289/gdisp_lld_SSD1289.c @@ -32,10 +32,10 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif #ifndef GDISP_USE_DMA - #define GDISP_USE_DMA FALSE + #define GDISP_USE_DMA GFXOFF #endif #ifndef GDISP_NO_DMA_FROM_STACK - #define GDISP_NO_DMA_FROM_STACK FALSE + #define GDISP_NO_DMA_FROM_STACK GFXOFF #endif /*===========================================================================*/ diff --git a/drivers/gdisp/SSD1289/gdisp_lld_config.h b/drivers/gdisp/SSD1289/gdisp_lld_config.h index 4b882df1..3aab39a6 100644 --- a/drivers/gdisp/SSD1289/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1289/gdisp_lld_config.h @@ -14,16 +14,16 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #if defined(GDISP_USE_DMA) && GDISP_USE_DMA
- #define GDISP_HARDWARE_FILLS TRUE + #define GDISP_HARDWARE_FILLS GFXON #if !defined(GDISP_PIXELFORMAT) || GDISP_PIXELFORMAT == 0x2565 // Hardware BitBlts are only supported in native pixel format on this controller
- #define GDISP_HARDWARE_BITFILLS TRUE + #define GDISP_HARDWARE_BITFILLS GFXON #endif #endif
diff --git a/drivers/gdisp/SSD1306/gdisp_lld_config.h b/drivers/gdisp/SSD1306/gdisp_lld_config.h index 2d8b6602..10cb8a71 100644 --- a/drivers/gdisp/SSD1306/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1306/gdisp_lld_config.h @@ -14,11 +14,11 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing
-#define GDISP_HARDWARE_DRAWPIXEL TRUE
-#define GDISP_HARDWARE_PIXELREAD TRUE
-#define GDISP_HARDWARE_CONTROL TRUE
-#define GDISP_HARDWARE_FILLS TRUE
+#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing
+#define GDISP_HARDWARE_DRAWPIXEL GFXON
+#define GDISP_HARDWARE_PIXELREAD GFXON
+#define GDISP_HARDWARE_CONTROL GFXON
+#define GDISP_HARDWARE_FILLS GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO
diff --git a/drivers/gdisp/SSD1306/readme.txt b/drivers/gdisp/SSD1306/readme.txt index 6f0220be..6454ad22 100644 --- a/drivers/gdisp/SSD1306/readme.txt +++ b/drivers/gdisp/SSD1306/readme.txt @@ -10,7 +10,7 @@ Know restictions: To use this driver:
1. Add in your gfxconf.h:
- a) #define GFX_USE_GDISP TRUE
+ a) #define GFX_USE_GDISP GFXON
b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD
diff --git a/drivers/gdisp/SSD1322/board_SSD1322_template.h b/drivers/gdisp/SSD1322/board_SSD1322_template.h index 11759a95..cb3a4740 100644 --- a/drivers/gdisp/SSD1322/board_SSD1322_template.h +++ b/drivers/gdisp/SSD1322/board_SSD1322_template.h @@ -12,7 +12,7 @@ //#define SSD1322_USE_DMA #ifndef SSD1322_USE_DMA - #define SSD1322_USE_DMA FALSE + #define SSD1322_USE_DMA GFXOFF #endif static GFXINLINE void init_board(GDisplay *g) { diff --git a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c index 38c711a8..961c22f0 100644 --- a/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c +++ b/drivers/gdisp/SSD1322/gdisp_lld_SSD1322.c @@ -33,7 +33,7 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif #ifndef SSD1322_USE_DMA - #define SSD1322_USE_DMA FALSE + #define SSD1322_USE_DMA GFXOFF #endif #define SSD1322_ROW_WIDTH (GDISP_SCREEN_WIDTH/2) diff --git a/drivers/gdisp/SSD1322/gdisp_lld_config.h b/drivers/gdisp/SSD1322/gdisp_lld_config.h index 8ede4bc6..8b8a9525 100644 --- a/drivers/gdisp/SSD1322/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1322/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY16 diff --git a/drivers/gdisp/SSD1322/readme.txt b/drivers/gdisp/SSD1322/readme.txt index 571dcd62..29dc6025 100644 --- a/drivers/gdisp/SSD1322/readme.txt +++ b/drivers/gdisp/SSD1322/readme.txt @@ -10,7 +10,7 @@ Know restictions: To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON b) Any optional high level driver defines (see gdisp.h) eg: GDISP_NEED_MULTITHREAD diff --git a/drivers/gdisp/SSD1331/gdisp_lld_config.h b/drivers/gdisp/SSD1331/gdisp_lld_config.h index dbbb3501..a5eb3f75 100644 --- a/drivers/gdisp/SSD1331/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1331/gdisp_lld_config.h @@ -15,10 +15,10 @@ /*===========================================================================*/ // This controller supports some optimized drawing routines - but no read (at least with SPI interfacing) -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_FILLS TRUE -#define GDISP_HARDWARE_SCROLL TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_FILLS GFXON +#define GDISP_HARDWARE_SCROLL GFXON +#define GDISP_HARDWARE_CONTROL GFXON // This driver supports 4 pixel formats - pick the one you want. #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/SSD1351/gdisp_lld_config.h b/drivers/gdisp/SSD1351/gdisp_lld_config.h index def94f44..33edcfd3 100644 --- a/drivers/gdisp/SSD1351/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1351/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -//#define GDISP_HARDWARE_STREAM_READ TRUE -//#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +//#define GDISP_HARDWARE_STREAM_READ GFXON +//#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/SSD1848/gdisp_lld_config.h b/drivers/gdisp/SSD1848/gdisp_lld_config.h index c7e7d906..020d323d 100644 --- a/drivers/gdisp/SSD1848/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1848/gdisp_lld_config.h @@ -14,12 +14,12 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE /* This controller requires flushing */ -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS TRUE -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CLEARS TRUE -#define GDISP_HARDWARE_BITFILLS TRUE +#define GDISP_HARDWARE_FLUSH GFXON /* This controller requires flushing */ +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXON +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CLEARS GFXON +#define GDISP_HARDWARE_BITFILLS GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO diff --git a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c index 98436040..35df624f 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c +++ b/drivers/gdisp/SSD1963/gdisp_lld_SSD1963.c @@ -56,7 +56,7 @@ typedef struct LCD_Parameters { /*===========================================================================*/ #ifndef GDISP_SSD1963_NO_INIT - #define GDISP_SSD1963_NO_INIT FALSE + #define GDISP_SSD1963_NO_INIT GFXOFF #endif #ifndef GDISP_INITIAL_CONTRAST #define GDISP_INITIAL_CONTRAST 50 @@ -154,7 +154,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { /* * Some displays (e.g. Displaytech) have an on-board setup process which just requires that we don't touch anything for a time after power up. - * For this type of display define GDISP_SSD1963_NO_INIT as TRUE, and implement an appropriate delay in the board file. + * For this type of display define GDISP_SSD1963_NO_INIT as GFXON, and implement an appropriate delay in the board file. * With such displays we can skip most of the initialisation. We also skip pulsing the reset pin, since it * will introduce an extra second or so of display to the startup time. */ diff --git a/drivers/gdisp/SSD1963/gdisp_lld_config.h b/drivers/gdisp/SSD1963/gdisp_lld_config.h index 7dfd0627..963940af 100644 --- a/drivers/gdisp/SSD1963/gdisp_lld_config.h +++ b/drivers/gdisp/SSD1963/gdisp_lld_config.h @@ -14,8 +14,8 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/SSD1963/readme.txt b/drivers/gdisp/SSD1963/readme.txt index 4eda17db..982fb1b6 100644 --- a/drivers/gdisp/SSD1963/readme.txt +++ b/drivers/gdisp/SSD1963/readme.txt @@ -2,6 +2,6 @@ SSD1963 driver modified to handle Displaytech INTXXX displays, which self-initia To use this mode, add: -#define GDISP_SSD1963_NO_INIT TRUE +#define GDISP_SSD1963_NO_INIT GFXON ...either in the board-specific header file, or in gfxconf.h diff --git a/drivers/gdisp/SSD2119/board_SSD2119_template.h b/drivers/gdisp/SSD2119/board_SSD2119_template.h index 86478c73..bbf8147a 100644 --- a/drivers/gdisp/SSD2119/board_SSD2119_template.h +++ b/drivers/gdisp/SSD2119/board_SSD2119_template.h @@ -58,10 +58,10 @@ static GFXINLINE uint16_t read_data(GDisplay *g) { } //Optional define if your board interface supports it -//#define GDISP_USE_DMA TRUE +//#define GDISP_USE_DMA GFXON -// Optional define - valid only when GDISP_USE_DMA is TRUE -//#define GDISP_NO_DMA_FROM_STACK FALSE +// Optional define - valid only when GDISP_USE_DMA is GFXON +//#define GDISP_NO_DMA_FROM_STACK GFXOFF #if defined(GDISP_USE_DMA) && GDISP_USE_DMA diff --git a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c index 5ae25b1c..6426f508 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c +++ b/drivers/gdisp/SSD2119/gdisp_lld_SSD2119.c @@ -32,10 +32,10 @@ #define GDISP_INITIAL_BACKLIGHT 100 #endif #ifndef GDISP_USE_DMA - #define GDISP_USE_DMA FALSE + #define GDISP_USE_DMA GFXOFF #endif #ifndef GDISP_NO_DMA_FROM_STACK - #define GDISP_NO_DMA_FROM_STACK FALSE + #define GDISP_NO_DMA_FROM_STACK GFXOFF #endif #include "ssd2119.h" diff --git a/drivers/gdisp/SSD2119/gdisp_lld_config.h b/drivers/gdisp/SSD2119/gdisp_lld_config.h index 671c7f79..19b040a9 100644 --- a/drivers/gdisp/SSD2119/gdisp_lld_config.h +++ b/drivers/gdisp/SSD2119/gdisp_lld_config.h @@ -14,16 +14,16 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_STREAM_READ TRUE -#define GDISP_HARDWARE_STREAM_POS TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_STREAM_READ GFXON +#define GDISP_HARDWARE_STREAM_POS GFXON +#define GDISP_HARDWARE_CONTROL GFXON #if defined(GDISP_USE_DMA) && GDISP_USE_DMA - #define GDISP_HARDWARE_FILLS TRUE + #define GDISP_HARDWARE_FILLS GFXON #if !defined(GDISP_PIXELFORMAT) || GDISP_PIXELFORMAT == 0x2565 // Hardware BitBlts are only supported in native pixel format on this controller - #define GDISP_HARDWARE_BITFILLS TRUE + #define GDISP_HARDWARE_BITFILLS GFXON #endif #endif diff --git a/drivers/gdisp/ST7565/gdisp_lld_config.h b/drivers/gdisp/ST7565/gdisp_lld_config.h index 48587b9e..4bb291f6 100644 --- a/drivers/gdisp/ST7565/gdisp_lld_config.h +++ b/drivers/gdisp/ST7565/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO diff --git a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c index c0bf2164..ea1966a5 100644 --- a/drivers/gdisp/ST7735/gdisp_lld_ST7735.c +++ b/drivers/gdisp/ST7735/gdisp_lld_ST7735.c @@ -43,19 +43,19 @@ // Define one of supported type, if not defined yet #if !defined(ST7735_TYPE_R) && !defined(ST7735_TYPE_B) // It seems all modern boards is 7735R - #define ST7735_TYPE_R TRUE + #define ST7735_TYPE_R GFXON #endif // Define one of supported color packing, if not defined yet #if !defined(ST7735_COLOR_RGB) && !defined(ST7735_COLOR_BRG) // It seems all modern boards is RGB - #define ST7735_COLOR_RGB TRUE + #define ST7735_COLOR_RGB GFXON #endif // Strange boars with shifted coords #if !defined (ST7735_SHIFTED_COORDS) - #define ST7735_SHIFTED_COORDS FALSE + #define ST7735_SHIFTED_COORDS GFXOFF #endif @@ -193,12 +193,12 @@ static const unsigned char ST7735_NORON , DELAY, // 3: Normal display on, no args, w/delay 10, // 10 ms delay ST7735_DISPON , DELAY, // 4: Main screen turn on, no args w/delay - 100 + 100 }; // 100 ms delay #endif -static void execute_cmds (const uint8_t *addr) { +static void execute_cmds(GDisplay *g, const uint8_t *addr) { unsigned int cmds = *addr++; while (cmds--) { @@ -211,7 +211,7 @@ static void execute_cmds (const uint8_t *addr) { if (ms) { ms = *addr++; gfxSleepMilliseconds(ms==255?500:ms); - } + } } } @@ -231,7 +231,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { // Get the bus for the following initialisation commands acquire_bus(g); - execute_cmds (init_cmds); + execute_cmds(g, init_cmds); release_bus(g); // Finish Init @@ -252,7 +252,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { static void set_viewport(GDisplay *g) { write_cmd (g, ST7735_CASET); - write_data (g, g->p.x+ST7735_COL_SHIFT); + write_data (g, g->p.x+ST7735_COL_SHIFT); write_data (g, g->p.x+g->p.cx-1+ST7735_COL_SHIFT); write_cmd (g, ST7735_RASET); write_data (g, g->p.y+ST7735_ROW_SHIFT); diff --git a/drivers/gdisp/ST7735/gdisp_lld_config.h b/drivers/gdisp/ST7735/gdisp_lld_config.h index 5c76924e..b910e3d1 100644 --- a/drivers/gdisp/ST7735/gdisp_lld_config.h +++ b/drivers/gdisp/ST7735/gdisp_lld_config.h @@ -12,9 +12,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_STREAM_WRITE TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS TRUE +#define GDISP_HARDWARE_STREAM_WRITE GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565 diff --git a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h index 8164c166..5635b27c 100644 --- a/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h +++ b/drivers/gdisp/STM32LTDC/board_STM32LTDC_template.h @@ -8,7 +8,7 @@ #ifndef _GDISP_LLD_BOARD_H #define _GDISP_LLD_BOARD_H -#define ALLOW_2ND_LAYER TRUE +#define ALLOW_2ND_LAYER GFXON static const ltdcConfig driverCfg = { 480, 272, // Width, Height (pixels) diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c index 4e232999..4bc231d9 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_STM32LTDC.c @@ -24,13 +24,13 @@ #endif
#ifndef LTDC_USE_DMA2D
- #define LTDC_USE_DMA2D FALSE
+ #define LTDC_USE_DMA2D GFXOFF
#endif
#ifndef LTDC_NO_CLOCK_INIT
- #define LTDC_NO_CLOCK_INIT FALSE
+ #define LTDC_NO_CLOCK_INIT GFXOFF
#endif
#ifndef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH FALSE
+ #define LTDC_DMA_CACHE_FLUSH GFXOFF
#endif
#include "stm32_ltdc.h"
@@ -40,7 +40,7 @@ #if defined(STM32F7) || defined(STM32F746xx)
#undef LTDC_DMA_CACHE_FLUSH
- #define LTDC_DMA_CACHE_FLUSH TRUE
+ #define LTDC_DMA_CACHE_FLUSH GFXON
#endif
#endif
diff --git a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h index e5a66bb0..7777a1bc 100644 --- a/drivers/gdisp/STM32LTDC/gdisp_lld_config.h +++ b/drivers/gdisp/STM32LTDC/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define LTDC_USE_DMA2D TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define LTDC_USE_DMA2D GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Both these pixel formats are supported - pick one. // RGB565 obviously is faster and uses less RAM but with lower color resolution than RGB888 @@ -38,12 +38,12 @@ #if LTDC_USE_DMA2D // DMA2D supports accelerated fills - #define GDISP_HARDWARE_FILLS TRUE + #define GDISP_HARDWARE_FILLS GFXON // Accelerated bitfills are also possible but only for GDISP_ROTATE_0 // and if no color translation is required (for now) #if !GDISP_NEED_CONTROL && !defined(GDISP_PIXELFORMAT) - #define GDISP_HARDWARE_BITFILLS TRUE + #define GDISP_HARDWARE_BITFILLS GFXON #endif #endif /* GDISP_USE_DMA2D */ diff --git a/drivers/gdisp/STM32LTDC/readme.txt b/drivers/gdisp/STM32LTDC/readme.txt index 269d3cfb..dcc17d39 100644 --- a/drivers/gdisp/STM32LTDC/readme.txt +++ b/drivers/gdisp/STM32LTDC/readme.txt @@ -1,7 +1,7 @@ To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON 2. To your makefile add the following lines: include $(GFXLIB)/gfx.mk diff --git a/drivers/gdisp/TLS8204/gdisp_lld_config.h b/drivers/gdisp/TLS8204/gdisp_lld_config.h index 253b2aaf..9771b2ab 100644 --- a/drivers/gdisp/TLS8204/gdisp_lld_config.h +++ b/drivers/gdisp/TLS8204/gdisp_lld_config.h @@ -14,10 +14,10 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Set this to your frame buffer pixel format. #ifndef GDISP_LLD_PIXELFORMAT diff --git a/drivers/gdisp/TestStub/gdisp_lld_config.h b/drivers/gdisp/TestStub/gdisp_lld_config.h index 53111358..02c3d821 100644 --- a/drivers/gdisp/TestStub/gdisp_lld_config.h +++ b/drivers/gdisp/TestStub/gdisp_lld_config.h @@ -14,8 +14,8 @@ /* Driver hardware support. */
/*===========================================================================*/
-#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE
+#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON
#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_RGB565
diff --git a/drivers/gdisp/UC1601s/gdisp_lld_config.h b/drivers/gdisp/UC1601s/gdisp_lld_config.h index 14dc6375..c52cd6a3 100644 --- a/drivers/gdisp/UC1601s/gdisp_lld_config.h +++ b/drivers/gdisp/UC1601s/gdisp_lld_config.h @@ -14,11 +14,11 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE // This controller requires flushing -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS FALSE +#define GDISP_HARDWARE_FLUSH GFXON // This controller requires flushing +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXOFF #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO diff --git a/drivers/gdisp/UC1610/gdisp_lld_config.h b/drivers/gdisp/UC1610/gdisp_lld_config.h index 36e37ad5..86402a20 100644 --- a/drivers/gdisp/UC1610/gdisp_lld_config.h +++ b/drivers/gdisp/UC1610/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_FLUSH GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_CONTROL GFXON #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY4 diff --git a/drivers/gdisp/UC8173/board_UC8173_template.h b/drivers/gdisp/UC8173/board_UC8173_template.h index b5fd36fe..4a164e3a 100644 --- a/drivers/gdisp/UC8173/board_UC8173_template.h +++ b/drivers/gdisp/UC8173/board_UC8173_template.h @@ -9,11 +9,11 @@ #define _GDISP_LLD_BOARD_H // Define options for this driver -#define UC8173_REVERSEAXIS_Y FALSE -#define UC8173_REVERSEAXIS_X FALSE -#define UC8173_USE_OTP_LUT FALSE /* Use the LUT in the OTP - untested */ +#define UC8173_REVERSEAXIS_Y GFXOFF +#define UC8173_REVERSEAXIS_X GFXOFF +#define UC8173_USE_OTP_LUT GFXOFF /* Use the LUT in the OTP - untested */ #define UC8173_DEFAULT_MODE 0 /* Which entry in the mode table to start with */ -#define UC8173_CAN_READ FALSE /* Reading the controller chip is supported */ +#define UC8173_CAN_READ GFXOFF /* Reading the controller chip is supported */ #define UC8173_VCOM_VOLTAGE -2.80 /* Read this off the sticker on the back of the display or set UC8173_CAN_READ to have the chip read */ #define UC8171_BORDER 0 /* 0 = Hi-Z, 1 = Black, 2 = White */ diff --git a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c index 88e2761e..6b227ccb 100644 --- a/drivers/gdisp/UC8173/gdisp_lld_UC8173.c +++ b/drivers/gdisp/UC8173/gdisp_lld_UC8173.c @@ -35,19 +35,19 @@ typedef struct UC8173Lut { /*------------------ Default UC8173 parameters ------------------*/ #ifndef UC8173_REVERSEAXIS_Y - #define UC8173_REVERSEAXIS_Y FALSE + #define UC8173_REVERSEAXIS_Y GFXOFF #endif #ifndef UC8173_REVERSEAXIS_X - #define UC8173_REVERSEAXIS_X FALSE + #define UC8173_REVERSEAXIS_X GFXOFF #endif #ifndef UC8173_DEFAULT_MODE #define UC8173_DEFAULT_MODE 0 #endif #ifndef UC8173_USE_OTP_LUT - #define UC8173_USE_OTP_LUT FALSE + #define UC8173_USE_OTP_LUT GFXOFF #endif #ifndef UC8173_CAN_READ - #define UC8173_CAN_READ FALSE + #define UC8173_CAN_READ GFXOFF #endif #ifdef UC8173_VCOM_VOLTAGE #define UC8173_VCOM_VOLTAGEBYTE (((UC8173_VCOM_VOLTAGE) + 0.1)/-0.05) @@ -56,7 +56,7 @@ typedef struct UC8173Lut { #define UC8171_BORDER 0 /* 0 = Hi-Z, 1 = Black, 2 = White */ #endif #ifndef UC8173_INIT_REAL_LUT - #define UC8173_INIT_REAL_LUT TRUE + #define UC8173_INIT_REAL_LUT GFXON #endif #define UC8173_HEIGHT 240 #define UC8173_WIDTH 240 @@ -67,7 +67,7 @@ typedef struct UC8173Lut { #define FB_WIDTH UC8173_WIDTH #define FB_HEIGHT UC8173_HEIGHT #define FB_PAGES 1 -#define FB_PIXELORDER_MSB TRUE +#define FB_PIXELORDER_MSB GFXON /*------------------ Include Generic FB Code ------------------*/ // This FB is for 1,2 or 4 bits per pixel packed along the x-axis @@ -242,7 +242,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay* g) write_data(g, vc); } #else - #error "UC8173: Either UC8173_VCOM_VOLTAGE or UC8173_VCOM_VOLTAGEBYTE must be defined or UC8173_CAN_READ must be TRUE" + #error "UC8173: Either UC8173_VCOM_VOLTAGE or UC8173_VCOM_VOLTAGEBYTE must be defined or UC8173_CAN_READ must be GFXON" #endif // Undocumented register - Values from example code diff --git a/drivers/gdisp/UC8173/gdisp_lld_config.h b/drivers/gdisp/UC8173/gdisp_lld_config.h index 1d9146a2..4002c225 100644 --- a/drivers/gdisp/UC8173/gdisp_lld_config.h +++ b/drivers/gdisp/UC8173/gdisp_lld_config.h @@ -14,11 +14,11 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_FLUSH TRUE -#define GDISP_HARDWARE_DRAWPIXEL TRUE -//#define GDISP_HARDWARE_PIXELREAD TRUE - not implemented yet -#define GDISP_HARDWARE_CONTROL TRUE -#define GDISP_HARDWARE_FILLS FALSE +#define GDISP_HARDWARE_FLUSH GFXON +#define GDISP_HARDWARE_DRAWPIXEL GFXON +//#define GDISP_HARDWARE_PIXELREAD GFXON - not implemented yet +#define GDISP_HARDWARE_CONTROL GFXON +#define GDISP_HARDWARE_FILLS GFXOFF #define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_MONO //#define GDISP_LLD_PIXELFORMAT GDISP_PIXELFORMAT_GRAY4 diff --git a/drivers/gdisp/framebuffer/board_framebuffer_template.h b/drivers/gdisp/framebuffer/board_framebuffer_template.h index 0ee08ef2..3e74e92b 100644 --- a/drivers/gdisp/framebuffer/board_framebuffer_template.h +++ b/drivers/gdisp/framebuffer/board_framebuffer_template.h @@ -11,7 +11,7 @@ #endif // Uncomment this if your frame buffer device requires flushing -//#define GDISP_HARDWARE_FLUSH TRUE +//#define GDISP_HARDWARE_FLUSH GFXON #ifdef GDISP_DRIVER_VMT diff --git a/drivers/gdisp/framebuffer/gdisp_lld_config.h b/drivers/gdisp/framebuffer/gdisp_lld_config.h index 08dbbb39..c12fa401 100644 --- a/drivers/gdisp/framebuffer/gdisp_lld_config.h +++ b/drivers/gdisp/framebuffer/gdisp_lld_config.h @@ -14,9 +14,9 @@ /* Driver hardware support. */ /*===========================================================================*/ -#define GDISP_HARDWARE_DRAWPIXEL TRUE -#define GDISP_HARDWARE_PIXELREAD TRUE -#define GDISP_HARDWARE_CONTROL TRUE +#define GDISP_HARDWARE_DRAWPIXEL GFXON +#define GDISP_HARDWARE_PIXELREAD GFXON +#define GDISP_HARDWARE_CONTROL GFXON // Any other support comes from the board file #include "board_framebuffer.h" diff --git a/drivers/gdisp/framebuffer/readme.txt b/drivers/gdisp/framebuffer/readme.txt index e13321e4..ead74122 100644 --- a/drivers/gdisp/framebuffer/readme.txt +++ b/drivers/gdisp/framebuffer/readme.txt @@ -1,7 +1,7 @@ To use this driver: 1. Add in your gfxconf.h: - a) #define GFX_USE_GDISP TRUE + a) #define GFX_USE_GDISP GFXON 2. To your makefile add the following lines: include $(GFXLIB)/gfx.mk |