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/STM32F439i-Eval/CubeHal | |
| 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/STM32F439i-Eval/CubeHal')
7 files changed, 35 insertions, 21 deletions
diff --git a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h index 7ddd554f..5b91c2df 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h +++ b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h @@ -9,9 +9,11 @@ #define _GDISP_LLD_BOARD_H // Avoid naming collisions with CubeHAL -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif // Include CubeHAL #include "stm32f4xx_hal.h" diff --git a/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h b/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h index 0f07b412..cd558d69 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h +++ b/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h @@ -15,9 +15,11 @@ #define _GINPUT_LLD_MOUSE_BOARD_H // Avoid naming collisions with CubeHAL -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif // Include CubeHAL #include "stm32f4xx_hal.h" diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.c b/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.c index 6e103a5a..65b78a76 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.c +++ b/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.c @@ -78,9 +78,11 @@ ------------------------------------------------------------------------------*/ /* Includes ------------------------------------------------------------------*/ -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm324x9i_eval_sdram.h" /** @addtogroup BSP diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.h b/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.h index d9c04044..0f572a03 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.h +++ b/boards/base/STM32F439i-Eval/CubeHal/stm324x9i_eval_sdram.h @@ -40,9 +40,11 @@ #ifndef __STM324x9I_EVAL_SDRAM_H #define __STM324x9I_EVAL_SDRAM_H -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #ifdef __cplusplus extern "C" { diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_interrupts.c b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_interrupts.c index 194d4e70..71602082 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_interrupts.c +++ b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_interrupts.c @@ -38,9 +38,11 @@ */ /* Includes ------------------------------------------------------------------*/ -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm32f4xx_hal_conf.h" #include "stm32f4xx_hal.h" diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_system.c b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_system.c index 8e33c5ce..63df499b 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_system.c +++ b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_system.c @@ -62,9 +62,11 @@ /** @addtogroup STM32F4xx_System_Private_Includes * @{ */ -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm32f4xx.h" diff --git a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c index ccfa2854..fd2dbdef 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c +++ b/boards/base/STM32F439i-Eval/CubeHal/stm32f439i_raw32_ugfx.c @@ -1,8 +1,10 @@ #include "../../../gfx.h" -#undef Red -#undef Green -#undef Blue +#if GFX_COMPAT_V2 && GFX_COMPAT_OLDCOLORS + #undef Red + #undef Green + #undef Blue +#endif #include "stm32f4xx_hal.h" |