From e9a330584e496ef5e9e35616b2c19072a08d71d0 Mon Sep 17 00:00:00 2001
From: Andrei <andrei.home@gmail.com>
Date: Mon, 1 May 2017 22:24:19 +0300
Subject: [PATCH] STM32F407xx-define (and small clean-up) pull request

---
 firmware/config/boards/ST_STM32F4/board.h          | 2 ++
 firmware/config/boards/ST_STM32F4/board.mk         | 2 +-
 firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c    | 3 +++
 firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c | 3 +++
 firmware/svnversion.h                              | 4 ++--
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/firmware/config/boards/ST_STM32F4/board.h b/firmware/config/boards/ST_STM32F4/board.h
index abff6dfcad..96b9532001 100644
--- a/firmware/config/boards/ST_STM32F4/board.h
+++ b/firmware/config/boards/ST_STM32F4/board.h
@@ -57,7 +57,9 @@
  *
  * See also STM32F4xx_MCUCONF is defined in mcuconf.h
  */
+#ifndef STM32F407xx
 #define STM32F407xx
+#endif
 
 /*
  * IO pins assignments.
diff --git a/firmware/config/boards/ST_STM32F4/board.mk b/firmware/config/boards/ST_STM32F4/board.mk
index e3be9cd995..3f6f71c3a6 100644
--- a/firmware/config/boards/ST_STM32F4/board.mk
+++ b/firmware/config/boards/ST_STM32F4/board.mk
@@ -5,4 +5,4 @@ BOARDSRC = $(PROJECT_DIR)/config/boards/ST_STM32F4/board.c
 BOARDINC = $(PROJECT_DIR)/config/boards/ST_STM32F4
 
 # MCU defines
-DDEFS += -DSTM32F407xx -DSTM32F40_41xxx
+DDEFS += -DSTM32F407xx
diff --git a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
index a58a7d7353..bd2b159f58 100644
--- a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
+++ b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash.c
@@ -93,6 +93,9 @@
   */ 
 
 /* Includes ------------------------------------------------------------------*/
+#ifdef STM32F407xx
+#define STM32F40_41xxx
+#endif
 #define assert_param(expr) ((void)0)
 
 //#include "stm32f4xx_hal.h"
diff --git a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
index f95e561152..9a53d9324d 100644
--- a/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
+++ b/firmware/hw_layer/stm32f4/stm32f4xx_hal_flash_ex.c
@@ -80,6 +80,9 @@
 
 /* Includes ------------------------------------------------------------------*/
 
+#ifdef STM32F407xx
+#define STM32F40_41xxx
+#endif
 #define assert_param(expr) ((void)0)
 
 #define HAL_FLASH_MODULE_ENABLED
diff --git a/firmware/svnversion.h b/firmware/svnversion.h
index 9d3c30f097..15c0cd07a5 100644
--- a/firmware/svnversion.h
+++ b/firmware/svnversion.h
@@ -1,5 +1,5 @@
 // This file was generated by Version2Header
-// Sat Apr 22 01:25:51 EEST 2017
+// Mon May 01 22:16:55 EEST 2017
 #ifndef VCS_VERSION
-#define VCS_VERSION "13886"
+#define VCS_VERSION "13950"
 #endif