diff options
author | Joel Bodenmann <joel@embedded.pro> | 2016-06-18 13:25:59 +0200 |
---|---|---|
committer | Joel Bodenmann <joel@embedded.pro> | 2016-06-18 13:25:59 +0200 |
commit | 8252747a36149f1c2e11e6a169379f53899b5acc (patch) | |
tree | c2646b99dd2100cfccab24a59d67c636fe1ba899 /boards | |
parent | 0548401d18d3eca0726b53d9b0689089fb0af500 (diff) | |
parent | bb7f100804f7f2f76fe7579dc952a6fe8fbd3d04 (diff) | |
download | uGFX-8252747a36149f1c2e11e6a169379f53899b5acc.tar.gz uGFX-8252747a36149f1c2e11e6a169379f53899b5acc.tar.bz2 uGFX-8252747a36149f1c2e11e6a169379f53899b5acc.zip |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
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" /* |