uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Hannam 2016-06-16 20:34:03 +10:00
parent 8d66f0233f
commit bb7f100804
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c
View File

@ -1,4 +1,7 @@
#include "../../../gfx.h" #include "../../../gfx.h"
#undef Red
#undef Green
#undef Blue
#include "stm32f746g_discovery_sdram.h" #include "stm32f746g_discovery_sdram.h"
#include "stm32f7xx_hal_rcc.h" #include "stm32f7xx_hal_rcc.h"
#include "stm32f7xx_hal_dma.h" #include "stm32f7xx_hal_dma.h"

3
boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c
View File

@ -1,4 +1,7 @@
#include "../../../gfx.h" #include "../../../gfx.h"
#undef Red
#undef Green
#undef Blue
#include "stm32f7xx.h" #include "stm32f7xx.h"
#if !defined (HSE_VALUE) #if !defined (HSE_VALUE)

3
boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c
View File

@ -1,4 +1,7 @@
#include "../../../gfx.h" #include "../../../gfx.h"
#undef Red
#undef Green
#undef Blue
#include "stm32f7xx_hal.h" #include "stm32f7xx_hal.h"
#if GFX_USE_OS_CHIBIOS #if GFX_USE_OS_CHIBIOS

3
boards/base/STM32F746-Discovery/stm32f7_i2c.c
View File

@ -1,4 +1,7 @@
#include "gfx.h" #include "gfx.h"
#undef Red
#undef Green
#undef Blue
#include "stm32f7_i2c.h" #include "stm32f7_i2c.h"
/* /*