diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-03-10 20:36:12 +1000 |
| commit | 94f1cc2f0a4db0c6f1483e6d648068e031bcc094 (patch) | |
| tree | 97f50372239108ec9e6e75a3d56e808e479cb7be /boards/base/STM32F746-Discovery | |
| parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
| download | uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.gz uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.tar.bz2 uGFX-94f1cc2f0a4db0c6f1483e6d648068e031bcc094.zip | |
Change new colors to GFX_RED instead of GFXRED. Use the new color defs
Diffstat (limited to 'boards/base/STM32F746-Discovery')
| -rw-r--r-- | boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c | 8 | ||||
| -rw-r--r-- | boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c | 8 | ||||
| -rw-r--r-- | boards/base/STM32F746-Discovery/stm32f7_i2c.c | 8 |
3 files changed, 15 insertions, 9 deletions
diff --git a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c index 374f49c5..a973a0b6 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c @@ -1,7 +1,9 @@ #include "../../../gfx.h" -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm32f746g_discovery_sdram.h" #include "stm32f7xx_hal_rcc.h" #include "stm32f7xx_hal_dma.h" diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c index ae002598..f521b865 100644 --- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c +++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c @@ -1,7 +1,9 @@ #include "../../../gfx.h"
-#undef Red
-#undef Green
-#undef Blue
+#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS
+ #undef Red
+ #undef Green
+ #undef Blue
+#endif
#include "stm32f7xx_hal.h"
#if GFX_USE_OS_CHIBIOS
diff --git a/boards/base/STM32F746-Discovery/stm32f7_i2c.c b/boards/base/STM32F746-Discovery/stm32f7_i2c.c index 07a6ce30..90bb9635 100644 --- a/boards/base/STM32F746-Discovery/stm32f7_i2c.c +++ b/boards/base/STM32F746-Discovery/stm32f7_i2c.c @@ -1,7 +1,9 @@ #include "gfx.h" -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm32f7_i2c.h" /* |