Skip to content

Commit a9b27da

Browse files
author
Erwan GOURIOU
committed
[STM32F4] Update Cube FW to V1.12.0
CMSIS to V2.5.0 HAL to V1.5.0
1 parent 8e15a6c commit a9b27da

File tree

194 files changed

+77544
-68810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

194 files changed

+77544
-68810
lines changed

hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/stm32f446xx.h

Lines changed: 5438 additions & 5408 deletions
Large diffs are not rendered by default.

hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/stm32f4xx.h

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
******************************************************************************
33
* @file stm32f4xx.h
44
* @author MCD Application Team
5-
* @version V2.4.3
6-
* @date 22-January-2016
5+
* @version V2.5.0
6+
* @date 22-April-2016
77
* @brief CMSIS STM32F4xx Device Peripheral Access Layer Header File.
88
*
99
* The file is the unique include file that the application programmer
@@ -78,7 +78,8 @@
7878
!defined (STM32F427xx) && !defined (STM32F437xx) && !defined (STM32F429xx) && !defined (STM32F439xx) && \
7979
!defined (STM32F401xC) && !defined (STM32F401xE) && !defined (STM32F410Tx) && !defined (STM32F410Cx) && \
8080
!defined (STM32F410Rx) && !defined (STM32F411xE) && !defined (STM32F446xx) && !defined (STM32F469xx) && \
81-
!defined (STM32F479xx)
81+
!defined (STM32F479xx) && !defined (STM32F412Cx) && !defined (STM32F412Rx) && !defined (STM32F412Vx) && \
82+
!defined (STM32F412Zx)
8283
/* #define STM32F405xx */ /*!< STM32F405RG, STM32F405VG and STM32F405ZG Devices */
8384
/* #define STM32F415xx */ /*!< STM32F415RG, STM32F415VG and STM32F415ZG Devices */
8485
/* #define STM32F407xx */ /*!< STM32F407VG, STM32F407VE, STM32F407ZG, STM32F407ZE, STM32F407IG and STM32F407IE Devices */
@@ -101,6 +102,10 @@
101102
STM32F469NG, STM32F469AE, STM32F469IE, STM32F469BE and STM32F469NE Devices */
102103
/* #define STM32F479xx */ /*!< STM32F479AI, STM32F479II, STM32F479BI, STM32F479NI, STM32F479AG, STM32F479IG, STM32F479BG
103104
and STM32F479NG Devices */
105+
/* #define STM32F412Cx */ /*!< STM32F412CEU and STM32F412CGU Devices */
106+
/* #define STM32F412Zx */ /*!< STM32F412ZET, STM32F412ZGT, STM32F412ZEJ and STM32F412ZGJ Devices */
107+
/* #define STM32F412Vx */ /*!< STM32F412VET, STM32F412VGT, STM32F412VEH and STM32F412VGH Devices */
108+
/* #define STM32F412Rx */ /*!< STM32F412RET, STM32F412RGT, STM32F412REY and STM32F412RGY Devices */
104109
#endif
105110

106111
/* Tip: To avoid modifying this file each time you need to switch between these
@@ -116,11 +121,11 @@
116121
#endif /* USE_HAL_DRIVER */
117122

118123
/**
119-
* @brief CMSIS version number V2.4.3
124+
* @brief CMSIS version number V2.5.0
120125
*/
121126
#define __STM32F4xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
122-
#define __STM32F4xx_CMSIS_VERSION_SUB1 (0x04U) /*!< [23:16] sub1 version */
123-
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
127+
#define __STM32F4xx_CMSIS_VERSION_SUB1 (0x05U) /*!< [23:16] sub1 version */
128+
#define __STM32F4xx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
124129
#define __STM32F4xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
125130
#define __STM32F4xx_CMSIS_VERSION ((__STM32F4xx_CMSIS_VERSION_MAIN << 24)\
126131
|(__STM32F4xx_CMSIS_VERSION_SUB1 << 16)\
@@ -160,7 +165,7 @@
160165
#elif defined(STM32F410Cx)
161166
#include "stm32f410cx.h"
162167
#elif defined(STM32F410Rx)
163-
#include "stm32f410rx.h"
168+
#include "stm32f410rx.h"
164169
#elif defined(STM32F411xE)
165170
#include "stm32f411xe.h"
166171
#elif defined(STM32F446xx)
@@ -169,6 +174,14 @@
169174
#include "stm32f469xx.h"
170175
#elif defined(STM32F479xx)
171176
#include "stm32f479xx.h"
177+
#elif defined(STM32F412Cx)
178+
#include "stm32f412cx.h"
179+
#elif defined(STM32F412Zx)
180+
#include "stm32f412zx.h"
181+
#elif defined(STM32F412Rx)
182+
#include "stm32f412rx.h"
183+
#elif defined(STM32F412Vx)
184+
#include "stm32f412vx.h"
172185
#else
173186
#error "Please select first the target STM32F4xx device used in your application (in stm32f4xx.h file)"
174187
#endif

hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/system_stm32f4xx.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
******************************************************************************
33
* @file system_stm32f4xx.c
44
* @author MCD Application Team
5-
* @version V2.4.3
6-
* @date 22-January-2016
5+
* @version V2.5.0
6+
* @date 22-April-2016
77
* @brief CMSIS Cortex-M4 Device Peripheral Access Layer System Source File.
88
*
99
* This file provides two functions and one global variable to be called from
@@ -108,9 +108,10 @@
108108
/*!< Uncomment the following line if you need to use external SRAM or SDRAM as data memory */
109109
#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx) || defined(STM32F417xx)\
110110
|| defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
111-
|| defined(STM32F469xx) || defined(STM32F479xx)
111+
|| defined(STM32F469xx) || defined(STM32F479xx) || defined(STM32F412Zx) || defined(STM32F412Vx)
112112
/* #define DATA_IN_ExtSRAM */
113-
#endif /* STM32F40xxx || STM32F41xxx || STM32F42xxx || STM32F43xxx || STM32F469xx || STM32F479xx */
113+
#endif /* STM32F40xxx || STM32F41xxx || STM32F42xxx || STM32F43xxx || STM32F469xx || STM32F479xx ||\
114+
STM32F412Zx || STM32F412Vx */
114115

115116
#if defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
116117
|| defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
@@ -341,7 +342,7 @@ void SystemInit_ExtMemCtl(void)
341342
__IO uint32_t tmp = 0x00;
342343

343344
register uint32_t tmpreg = 0, timeout = 0xFFFF;
344-
register uint32_t index;
345+
register __IO uint32_t index;
345346

346347
/* Enable GPIOC, GPIOD, GPIOE, GPIOF, GPIOG, GPIOH and GPIOI interface clock */
347348
RCC->AHB1ENR |= 0x000001F8;
@@ -506,7 +507,7 @@ void SystemInit_ExtMemCtl(void)
506507
|| defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
507508
#if defined (DATA_IN_ExtSDRAM)
508509
register uint32_t tmpreg = 0, timeout = 0xFFFF;
509-
register uint32_t index;
510+
register __IO uint32_t index;
510511

511512
#if defined(STM32F446xx)
512513
/* Enable GPIOA, GPIOC, GPIOD, GPIOE, GPIOF, GPIOG interface
@@ -695,7 +696,7 @@ void SystemInit_ExtMemCtl(void)
695696

696697
#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx) || defined(STM32F417xx)\
697698
|| defined(STM32F427xx) || defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx)\
698-
|| defined(STM32F469xx) || defined(STM32F479xx)
699+
|| defined(STM32F469xx) || defined(STM32F479xx) || defined(STM32F412Zx) || defined(STM32F412Vx)
699700

700701
#if defined(DATA_IN_ExtSRAM)
701702
/*-- GPIOs Configuration -----------------------------------------------------*/
@@ -772,18 +773,19 @@ void SystemInit_ExtMemCtl(void)
772773
FMC_Bank1->BTCR[3] = 0x00110212;
773774
FMC_Bank1E->BWTR[2] = 0x0fffffff;
774775
#endif /* STM32F469xx || STM32F479xx */
775-
#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)|| defined(STM32F417xx)
776+
#if defined(STM32F405xx) || defined(STM32F415xx) || defined(STM32F407xx)|| defined(STM32F417xx)\
777+
|| defined(STM32F412Zx) || defined(STM32F412Vx)
776778
/* Delay after an RCC peripheral clock enabling */
777779
tmp = READ_BIT(RCC->AHB3ENR, RCC_AHB3ENR_FSMCEN);
778780
/* Configure and enable Bank1_SRAM2 */
779781
FSMC_Bank1->BTCR[2] = 0x00001011;
780782
FSMC_Bank1->BTCR[3] = 0x00000201;
781783
FSMC_Bank1E->BWTR[2] = 0x0FFFFFFF;
782-
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx */
784+
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F412Zx || STM32F412Vx */
783785

784786
#endif /* DATA_IN_ExtSRAM */
785787
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F427xx || STM32F437xx ||\
786-
STM32F429xx || STM32F439xx || STM32F469xx || STM32F479xx */
788+
STM32F429xx || STM32F439xx || STM32F469xx || STM32F479xx || STM32F412Zx || STM32F412Vx */
787789
(void)(tmp);
788790
}
789791
#endif /* DATA_IN_ExtSRAM && DATA_IN_ExtSDRAM */

hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/system_stm32f4xx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
******************************************************************************
33
* @file system_stm32f4xx.h
44
* @author MCD Application Team
5-
* @version V2.4.3
6-
* @date 22-January-2016
5+
* @version V2.5.0
6+
* @date 22-April-2016
77
* @brief CMSIS Cortex-M4 Device System Source File for STM32F4xx devices.
88
******************************************************************************
99
* @attention

0 commit comments

Comments
 (0)