Undef uGFX colors for the STM32F7 board to prevent conflicts with changed STM32 HAL header files

2016-06-16 20:34:03 +10:00 · 2016-06-16 20:34:03 +10:00 · bb7f100804
parent 8d66f0233f
commit bb7f100804
4 changed files with 12 additions and 0 deletions
--- a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
+++ b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
@ -1,4 +1,7 @@
 #include "../../../gfx.h"
+#undef Red
+#undef Green
+#undef Blue
 #include "stm32f746g_discovery_sdram.h"
 #include "stm32f7xx_hal_rcc.h"
 #include "stm32f7xx_hal_dma.h"
--- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
+++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
@ -1,4 +1,7 @@
 #include "../../../gfx.h"
+#undef Red
+#undef Green
+#undef Blue
 #include "stm32f7xx.h"

 #if !defined  (HSE_VALUE)
--- a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
+++ b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
@ -1,4 +1,7 @@
 #include "../../../gfx.h"
+#undef Red
+#undef Green
+#undef Blue
 #include "stm32f7xx_hal.h"

 #if GFX_USE_OS_CHIBIOS
--- a/boards/base/STM32F746-Discovery/stm32f7_i2c.c
+++ b/boards/base/STM32F746-Discovery/stm32f7_i2c.c
@ -1,4 +1,7 @@
 #include "gfx.h"
+#undef Red
+#undef Green
+#undef Blue
 #include "stm32f7_i2c.h"

 /*