From 91f537c91ca877f03a3634e7de9423fe451ff06a Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 3 Aug 2016 14:50:48 +0200 Subject: [PATCH] STM32F439i-Eval board file cleanup --- .../CubeHal/gmouse_lld_EXC7200_board.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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 4f8a18fb..02ca44aa 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h +++ b/boards/base/STM32F439i-Eval/CubeHal/gmouse_lld_EXC7200_board.h @@ -14,10 +14,13 @@ #ifndef _GINPUT_LLD_MOUSE_BOARD_H #define _GINPUT_LLD_MOUSE_BOARD_H -#include "stm32f4xx_hal_rcc.h" -#include "stm32f4xx_hal_dma.h" -#include "stm32f4xx_hal_gpio.h" -#include "stm32f4xx_hal_i2c.h" +// Avoid naming collisions with CubeHAL +#undef Red +#undef Green +#undef Blue + +// Include CubeHAL +#include "stm32f4xx_hal.h" // Resolution and Accuracy Settings #define GMOUSE_EXC7200_PEN_CALIBRATE_ERROR 8