diff options
| author | Andrew Hannam <Andrew Hannam> | 2016-06-16 20:34:03 +1000 |
|---|---|---|
| committer | Andrew Hannam <Andrew Hannam> | 2016-06-16 20:34:03 +1000 |
| commit | bb7f100804f7f2f76fe7579dc952a6fe8fbd3d04 (patch) | |
| tree | 9fdab692cb5c5e13070a29897115a5af8da2bf1c /boards | |
| parent | 8d66f0233f11d32c60270a795e9ebfd4f26df8fa (diff) | |
| download | uGFX-bb7f100804f7f2f76fe7579dc952a6fe8fbd3d04.tar.gz uGFX-bb7f100804f7f2f76fe7579dc952a6fe8fbd3d04.tar.bz2 uGFX-bb7f100804f7f2f76fe7579dc952a6fe8fbd3d04.zip | |
Undef uGFX colors for the STM32F7 board to prevent conflicts with changed STM32 HAL header files
Diffstat (limited to 'boards')
4 files changed, 12 insertions, 0 deletions
diff --git a/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c b/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c index 9d77ee36..17dc82cb 100644 --- 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" diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c index 1ea7450a..deeaccb0 100644 --- 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) diff --git a/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c b/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c index 2f6af0dd..51e59936 100644 --- 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 diff --git a/boards/base/STM32F746-Discovery/stm32f7_i2c.c b/boards/base/STM32F746-Discovery/stm32f7_i2c.c index d1e2ed28..07a6ce30 100644 --- 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" /* |