diff options
author | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
---|---|---|
committer | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
commit | 65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch) | |
tree | 30920f0457522be32ce2b332afe0d2916d93cf66 /src/gdisp/gdisp_rules.h | |
parent | 992850bcb1992ff052d5ac2379e4675a34861723 (diff) | |
parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
download | uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2 uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip |
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
Diffstat (limited to 'src/gdisp/gdisp_rules.h')
-rw-r--r-- | src/gdisp/gdisp_rules.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gdisp/gdisp_rules.h b/src/gdisp/gdisp_rules.h index d9fb86bb..f6557d8f 100644 --- a/src/gdisp/gdisp_rules.h +++ b/src/gdisp/gdisp_rules.h @@ -26,7 +26,7 @@ #endif #endif #undef GFX_USE_GDRIVER - #define GFX_USE_GDRIVER TRUE + #define GFX_USE_GDRIVER GFXON #endif #if defined(GDISP_DRIVER_LIST) #if GDISP_TOTAL_DISPLAYS != 1 @@ -45,11 +45,11 @@ #endif #endif #undef GDISP_NEED_TIMERFLUSH - #define GDISP_NEED_TIMERFLUSH FALSE + #define GDISP_NEED_TIMERFLUSH GFXOFF #endif #if GDISP_NEED_TIMERFLUSH #if GDISP_NEED_TIMERFLUSH < 50 || GDISP_NEED_TIMERFLUSH > 1200 - #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (FALSE, 50-1200)." + #error "GDISP: GDISP_NEED_TIMERFLUSH has been set to an invalid value (GFXOFF, 50-1200)." #endif #if !GFX_USE_GTIMER #if GFX_DISPLAY_RULE_WARNINGS @@ -60,9 +60,9 @@ #endif #endif #undef GFX_USE_GTIMER - #define GFX_USE_GTIMER TRUE + #define GFX_USE_GTIMER GFXON #undef GDISP_NEED_MULTITHREAD - #define GDISP_NEED_MULTITHREAD TRUE + #define GDISP_NEED_MULTITHREAD GFXON #endif #endif #if GDISP_NEED_ANTIALIAS && !GDISP_NEED_PIXELREAD @@ -75,7 +75,7 @@ #endif #endif #undef GDISP_NEED_PIXELREAD - #define GDISP_NEED_PIXELREAD TRUE + #define GDISP_NEED_PIXELREAD GFXON #else #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT @@ -97,19 +97,19 @@ #endif #endif #undef GDISP_INCLUDE_FONT_UI2 - #define GDISP_INCLUDE_FONT_UI2 TRUE + #define GDISP_INCLUDE_FONT_UI2 GFXON #endif #if GDISP_NEED_IMAGE #if !GFX_USE_GFILE #if GFX_DISPLAY_RULE_WARNINGS #if GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_DIRECT - #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you." + #warning "GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you." #elif GFX_COMPILER_WARNING_TYPE == GFX_COMPILER_WARNING_MACRO - COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is TRUE. It has been turned on for you.") + COMPILER_WARNING("GDISP: GFX_USE_GFILE is required when GDISP_NEED_IMAGE is GFXON. It has been turned on for you.") #endif #endif #undef GFX_USE_GFILE - #define GFX_USE_GFILE TRUE + #define GFX_USE_GFILE GFXON #endif #endif #endif |