Skip to content

Commit 5648b15

Browse files
cmonrcmonr
authored
Merge pull request #6063 from bcostm/PULL_REQUEST_CUBE_UPDATE_F7_V1.10.0
STM32F7: Update ST HAL driver with CubeF7 v1.10.0
2 parents ea411ef + 118073a commit 5648b15

File tree

195 files changed

+13371
-8654
lines changed

Some content is hidden

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

195 files changed

+13371
-8654
lines changed

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/device/stm32f746xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file stm32f746xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
75
* @brief CMSIS Cortex-M7 Device Peripheral Access Layer Header File.
86
*
97
* This file contains:

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/device/stm32f7xx.h

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22
******************************************************************************
33
* @file stm32f7xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
7-
* @brief CMSIS STM32F7xx Device Peripheral Access Layer Header File.
8-
*
5+
* @brief CMSIS STM32F7xx Device Peripheral Access Layer Header File.
6+
*
97
* The file is the unique include file that the application programmer
108
* is using in the C source code, usually in main.c. This file contains:
119
* - Configuration section that allows to select:
1210
* - The STM32F7xx device used in the target application
13-
* - To use or not the peripheral’s drivers in application code(i.e.
11+
* - To use or not the peripheral’s drivers in application code(i.e.
1412
* code will be based on direct access to peripheral’s registers
1513
* rather than drivers API), this option is controlled by
1614
* "#define USE_HAL_DRIVER"
17-
*
15+
*
1816
******************************************************************************
1917
* @attention
2018
*
@@ -52,14 +50,14 @@
5250
/** @addtogroup stm32f7xx
5351
* @{
5452
*/
55-
53+
5654
#ifndef __STM32F7xx_H
5755
#define __STM32F7xx_H
5856

5957
#ifdef __cplusplus
6058
extern "C" {
6159
#endif /* __cplusplus */
62-
60+
6361
/** @addtogroup Library_configuration_section
6462
* @{
6563
*/
@@ -72,7 +70,7 @@
7270
#endif /* STM32F7 */
7371

7472
/* Uncomment the line below according to the target STM32 device used in your
75-
application
73+
application
7674
*/
7775
#if !defined (STM32F756xx) && !defined (STM32F746xx) && !defined (STM32F745xx) && !defined (STM32F767xx) && \
7876
!defined (STM32F769xx) && !defined (STM32F777xx) && !defined (STM32F779xx) && !defined (STM32F722xx) && \
@@ -104,19 +102,19 @@
104102
#if !defined (USE_HAL_DRIVER)
105103
/**
106104
* @brief Comment the line below if you will not use the peripherals drivers.
107-
In this case, these drivers will not be included and the application code will
108-
be based on direct access to peripherals registers
105+
In this case, these drivers will not be included and the application code will
106+
be based on direct access to peripherals registers
109107
*/
110108
#define USE_HAL_DRIVER
111109
#endif /* USE_HAL_DRIVER */
112110

113111
/**
114-
* @brief CMSIS Device version number V1.2.0
112+
* @brief CMSIS Device version number V1.2.2
115113
*/
116114
#define __STM32F7_CMSIS_VERSION_MAIN (0x01) /*!< [31:24] main version */
117115
#define __STM32F7_CMSIS_VERSION_SUB1 (0x02) /*!< [23:16] sub1 version */
118-
#define __STM32F7_CMSIS_VERSION_SUB2 (0x00) /*!< [15:8] sub2 version */
119-
#define __STM32F7_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
116+
#define __STM32F7_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */
117+
#define __STM32F7_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
120118
#define __STM32F7_CMSIS_VERSION ((__STM32F7_CMSIS_VERSION_MAIN << 24)\
121119
|(__STM32F7_CMSIS_VERSION_SUB1 << 16)\
122120
|(__STM32F7_CMSIS_VERSION_SUB2 << 8 )\
@@ -135,7 +133,7 @@
135133
#elif defined(STM32F732xx)
136134
#include "stm32f732xx.h"
137135
#elif defined(STM32F733xx)
138-
#include "stm32f733xx.h"
136+
#include "stm32f733xx.h"
139137
#elif defined(STM32F756xx)
140138
#include "stm32f756xx.h"
141139
#elif defined(STM32F746xx)
@@ -151,7 +149,7 @@
151149
#elif defined(STM32F777xx)
152150
#include "stm32f777xx.h"
153151
#elif defined(STM32F779xx)
154-
#include "stm32f779xx.h"
152+
#include "stm32f779xx.h"
155153
#else
156154
#error "Please select first the target STM32F7xx device used in your application (in stm32f7xx.h file)"
157155
#endif
@@ -162,30 +160,30 @@
162160

163161
/** @addtogroup Exported_types
164162
* @{
165-
*/
166-
typedef enum
163+
*/
164+
typedef enum
167165
{
168-
RESET = 0,
166+
RESET = 0U,
169167
SET = !RESET
170168
} FlagStatus, ITStatus;
171169

172-
typedef enum
170+
typedef enum
173171
{
174-
DISABLE = 0,
172+
DISABLE = 0U,
175173
ENABLE = !DISABLE
176174
} FunctionalState;
177175
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
178176

179-
typedef enum
177+
typedef enum
180178
{
181-
ERROR = 0,
179+
ERROR = 0U,
182180
SUCCESS = !ERROR
183181
} ErrorStatus;
184182

185183
/**
186184
* @}
187185
*/
188-
186+
189187
/** @addtogroup Exported_macro
190188
* @{
191189
*/
@@ -203,14 +201,14 @@ typedef enum
203201

204202
#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
205203

206-
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
204+
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
207205

208206
/**
209207
* @}
210208
*/
211209

212210
#ifdef USE_HAL_DRIVER
213-
#include "stm32f7xx_hal.h"
211+
#include "stm32f7xx_hal.h"
214212
#endif /* USE_HAL_DRIVER */
215213

216214
#ifdef __cplusplus
@@ -223,7 +221,7 @@ typedef enum
223221
* @}
224222
*/
225223

226-
/**
224+
/**
227225
* @}
228226
*/
229227

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/device/system_stm32f7xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file system_stm32f7xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
75
* @brief CMSIS Cortex-M7 Device System Source File for STM32F7xx devices.
86
******************************************************************************
97
* @attention

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/device/stm32f756xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file stm32f756xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
75
* @brief CMSIS Cortex-M7 Device Peripheral Access Layer Header File.
86
*
97
* This file contains:

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/device/stm32f7xx.h

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,17 @@
22
******************************************************************************
33
* @file stm32f7xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
7-
* @brief CMSIS STM32F7xx Device Peripheral Access Layer Header File.
8-
*
5+
* @brief CMSIS STM32F7xx Device Peripheral Access Layer Header File.
6+
*
97
* The file is the unique include file that the application programmer
108
* is using in the C source code, usually in main.c. This file contains:
119
* - Configuration section that allows to select:
1210
* - The STM32F7xx device used in the target application
13-
* - To use or not the peripheral’s drivers in application code(i.e.
11+
* - To use or not the peripheral’s drivers in application code(i.e.
1412
* code will be based on direct access to peripheral’s registers
1513
* rather than drivers API), this option is controlled by
1614
* "#define USE_HAL_DRIVER"
17-
*
15+
*
1816
******************************************************************************
1917
* @attention
2018
*
@@ -52,14 +50,14 @@
5250
/** @addtogroup stm32f7xx
5351
* @{
5452
*/
55-
53+
5654
#ifndef __STM32F7xx_H
5755
#define __STM32F7xx_H
5856

5957
#ifdef __cplusplus
6058
extern "C" {
6159
#endif /* __cplusplus */
62-
60+
6361
/** @addtogroup Library_configuration_section
6462
* @{
6563
*/
@@ -72,7 +70,7 @@
7270
#endif /* STM32F7 */
7371

7472
/* Uncomment the line below according to the target STM32 device used in your
75-
application
73+
application
7674
*/
7775
#if !defined (STM32F756xx) && !defined (STM32F746xx) && !defined (STM32F745xx) && !defined (STM32F767xx) && \
7876
!defined (STM32F769xx) && !defined (STM32F777xx) && !defined (STM32F779xx) && !defined (STM32F722xx) && \
@@ -104,19 +102,19 @@
104102
#if !defined (USE_HAL_DRIVER)
105103
/**
106104
* @brief Comment the line below if you will not use the peripherals drivers.
107-
In this case, these drivers will not be included and the application code will
108-
be based on direct access to peripherals registers
105+
In this case, these drivers will not be included and the application code will
106+
be based on direct access to peripherals registers
109107
*/
110108
#define USE_HAL_DRIVER
111109
#endif /* USE_HAL_DRIVER */
112110

113111
/**
114-
* @brief CMSIS Device version number V1.2.0
112+
* @brief CMSIS Device version number V1.2.2
115113
*/
116114
#define __STM32F7_CMSIS_VERSION_MAIN (0x01) /*!< [31:24] main version */
117115
#define __STM32F7_CMSIS_VERSION_SUB1 (0x02) /*!< [23:16] sub1 version */
118-
#define __STM32F7_CMSIS_VERSION_SUB2 (0x00) /*!< [15:8] sub2 version */
119-
#define __STM32F7_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
116+
#define __STM32F7_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */
117+
#define __STM32F7_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
120118
#define __STM32F7_CMSIS_VERSION ((__STM32F7_CMSIS_VERSION_MAIN << 24)\
121119
|(__STM32F7_CMSIS_VERSION_SUB1 << 16)\
122120
|(__STM32F7_CMSIS_VERSION_SUB2 << 8 )\
@@ -135,7 +133,7 @@
135133
#elif defined(STM32F732xx)
136134
#include "stm32f732xx.h"
137135
#elif defined(STM32F733xx)
138-
#include "stm32f733xx.h"
136+
#include "stm32f733xx.h"
139137
#elif defined(STM32F756xx)
140138
#include "stm32f756xx.h"
141139
#elif defined(STM32F746xx)
@@ -151,7 +149,7 @@
151149
#elif defined(STM32F777xx)
152150
#include "stm32f777xx.h"
153151
#elif defined(STM32F779xx)
154-
#include "stm32f779xx.h"
152+
#include "stm32f779xx.h"
155153
#else
156154
#error "Please select first the target STM32F7xx device used in your application (in stm32f7xx.h file)"
157155
#endif
@@ -162,30 +160,30 @@
162160

163161
/** @addtogroup Exported_types
164162
* @{
165-
*/
166-
typedef enum
163+
*/
164+
typedef enum
167165
{
168-
RESET = 0,
166+
RESET = 0U,
169167
SET = !RESET
170168
} FlagStatus, ITStatus;
171169

172-
typedef enum
170+
typedef enum
173171
{
174-
DISABLE = 0,
172+
DISABLE = 0U,
175173
ENABLE = !DISABLE
176174
} FunctionalState;
177175
#define IS_FUNCTIONAL_STATE(STATE) (((STATE) == DISABLE) || ((STATE) == ENABLE))
178176

179-
typedef enum
177+
typedef enum
180178
{
181-
ERROR = 0,
179+
ERROR = 0U,
182180
SUCCESS = !ERROR
183181
} ErrorStatus;
184182

185183
/**
186184
* @}
187185
*/
188-
186+
189187
/** @addtogroup Exported_macro
190188
* @{
191189
*/
@@ -203,14 +201,14 @@ typedef enum
203201

204202
#define MODIFY_REG(REG, CLEARMASK, SETMASK) WRITE_REG((REG), (((READ_REG(REG)) & (~(CLEARMASK))) | (SETMASK)))
205203

206-
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
204+
#define POSITION_VAL(VAL) (__CLZ(__RBIT(VAL)))
207205

208206
/**
209207
* @}
210208
*/
211209

212210
#ifdef USE_HAL_DRIVER
213-
#include "stm32f7xx_hal.h"
211+
#include "stm32f7xx_hal.h"
214212
#endif /* USE_HAL_DRIVER */
215213

216214
#ifdef __cplusplus
@@ -223,7 +221,7 @@ typedef enum
223221
* @}
224222
*/
225223

226-
/**
224+
/**
227225
* @}
228226
*/
229227

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/device/system_stm32f7xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file system_stm32f7xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
75
* @brief CMSIS Cortex-M7 Device System Source File for STM32F7xx devices.
86
******************************************************************************
97
* @attention

‎targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/device/stm32f767xx.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file stm32f767xx.h
44
* @author MCD Application Team
5-
* @version V1.2.0
6-
* @date 30-December-2016
75
* @brief CMSIS Cortex-M7 Device Peripheral Access Layer Header File.
86
*
97
* This file contains:

0 commit comments

Comments
 (0)