diff options
| author | Aditya Naik | 2020-06-15 09:57:01 -0400 |
|---|---|---|
| committer | Aditya Naik | 2020-06-15 09:57:01 -0400 |
| commit | 7fe90ace6e5200f6d1ef9c23879b099e3a0dea91 (patch) | |
| tree | 0ab7b48b346266f79cbecdadd4ff8ca386202ac6 | |
| parent | bebd414a1999c9fab663463e54ccf1d32c6eb399 (diff) | |
| parent | 5d4809c50702adc40e98b360cc89723df30bd4bf (diff) | |
Ports merge
| -rw-r--r-- | ports/stm32f4/makefile | 7 | ||||
| -rw-r--r-- | ports/stm32f4/src/port.h | 12 | ||||
| -rw-r--r-- | ports/stm32f4/src/stm32f4xx_hal_conf.h (renamed from src/stm32f4xx_hal_conf.h) | 0 | ||||
| -rw-r--r-- | ports/stm32f4/src/stm32f4xx_hal_msp.c (renamed from src/stm32f4xx_hal_msp.c) | 0 | ||||
| -rw-r--r-- | ports/stm32f4/src/stm32f4xx_it.c (renamed from src/stm32f4xx_it.c) | 0 | ||||
| -rw-r--r-- | ports/stm32f4/src/stm32f4xx_it.h (renamed from src/stm32f4xx_it.h) | 0 | ||||
| -rw-r--r-- | ports/stm32f4/src/system_stm32f4xx.c (renamed from src/system_stm32f4xx.c) | 0 | ||||
| -rw-r--r-- | src/main.h | 2 |
8 files changed, 17 insertions, 4 deletions
diff --git a/ports/stm32f4/makefile b/ports/stm32f4/makefile index 5a32ead..c3701b9 100644 --- a/ports/stm32f4/makefile +++ b/ports/stm32f4/makefile @@ -31,11 +31,12 @@ lib/f4/stm32f4xx_hal_exti.c \ lib/f4/stm32f4xx_hal_tim.c \ lib/f4/stm32f4xx_hal_tim_ex.c \ lib/f4/stm32f4xx_hal_uart.c \ -src/stm32f4xx_it.c \ -src/stm32f4xx_hal_msp.c \ -src/system_stm32f4xx.c \ +ports/stm32f4/src/stm32f4xx_it.c \ +ports/stm32f4/src/stm32f4xx_hal_msp.c \ +ports/stm32f4/src/system_stm32f4xx.c \ C_INCLUDES += \ -Ilib/f4 \ -Ilib/f4/Legacy \ -Ilib/cmsis/f4 \ +-Iports/stm32f4/src diff --git a/ports/stm32f4/src/port.h b/ports/stm32f4/src/port.h new file mode 100644 index 0000000..ffbbe9e --- /dev/null +++ b/ports/stm32f4/src/port.h @@ -0,0 +1,12 @@ +/** + * + * @brief Port specific includes go in this file + * +*/ + +#ifndef __PORT_H +#define __PORT_H + +#include "stm32f4xx_hal.h" + +#endif diff --git a/src/stm32f4xx_hal_conf.h b/ports/stm32f4/src/stm32f4xx_hal_conf.h index e7e342a..e7e342a 100644 --- a/src/stm32f4xx_hal_conf.h +++ b/ports/stm32f4/src/stm32f4xx_hal_conf.h diff --git a/src/stm32f4xx_hal_msp.c b/ports/stm32f4/src/stm32f4xx_hal_msp.c index f379a96..f379a96 100644 --- a/src/stm32f4xx_hal_msp.c +++ b/ports/stm32f4/src/stm32f4xx_hal_msp.c diff --git a/src/stm32f4xx_it.c b/ports/stm32f4/src/stm32f4xx_it.c index caabfb4..caabfb4 100644 --- a/src/stm32f4xx_it.c +++ b/ports/stm32f4/src/stm32f4xx_it.c diff --git a/src/stm32f4xx_it.h b/ports/stm32f4/src/stm32f4xx_it.h index 0f787d0..0f787d0 100644 --- a/src/stm32f4xx_it.h +++ b/ports/stm32f4/src/stm32f4xx_it.h diff --git a/src/system_stm32f4xx.c b/ports/stm32f4/src/system_stm32f4xx.c index 7745026..7745026 100644 --- a/src/system_stm32f4xx.c +++ b/ports/stm32f4/src/system_stm32f4xx.c @@ -28,7 +28,7 @@ extern "C" { #endif
/* Includes ------------------------------------------------------------------*/
-#include "stm32f4xx_hal.h"
+#include "port.h"
/* Private includes ----------------------------------------------------------*/
/* USER CODE BEGIN Includes */
|