Skip to content

Commit 01d0d55

Browse files
fpistmfpistm
committed
[F4] Update STM32F4xx HAL Drivers to v1.7.11
Included in STM32CubeF4 FW v1.26.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 01a1aa3 commit 01d0d55

File tree

115 files changed

+8491
-4671
lines changed

Some content is hidden

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

115 files changed

+8491
-4671
lines changed

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 98 additions & 118 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
/* Includes ------------------------------------------------------------------*/
2929
#include "stm32f4xx_hal_def.h"
3030

31+
/* Include low level driver */
32+
#include "stm32f4xx_ll_adc.h"
33+
3134
/** @addtogroup STM32F4xx_HAL_Driver
3235
* @{
3336
*/

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_adc_ex.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ typedef struct
219219
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE || STM32F410xx || STM32F412Zx ||
220220
STM32F412Vx || STM32F412Rx || STM32F412Cx */
221221

222-
#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) || \
222+
#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) ||\
223223
defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
224224
#define ADC_CHANNEL_DIFFERENCIATION_TEMPSENSOR_VBAT 0x10000000U /* Dummy bit for driver internal usage, not used in ADC channel setting registers CR1 or SQRx */
225225
#define ADC_CHANNEL_TEMPSENSOR ((uint32_t)ADC_CHANNEL_18 | ADC_CHANNEL_DIFFERENCIATION_TEMPSENSOR_VBAT)
@@ -307,11 +307,12 @@ HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(ADC_HandleTypeDef* hadc, ADC_
307307
defined(STM32F410Rx) || defined(STM32F412Zx) || defined(STM32F412Vx) || defined(STM32F412Rx) || \
308308
defined(STM32F412Cx)
309309
#define IS_ADC_CHANNEL(CHANNEL) ((CHANNEL) <= ADC_CHANNEL_18)
310-
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE || STM32F410xx || STM32F412Zx ||
311-
STM32F412Vx || STM32F412Rx || STM32F412Cx */
310+
#endif /* STM32F405xx || STM32F415xx || STM32F407xx || STM32F417xx || STM32F401xC || STM32F401xE ||
311+
STM32F410xx || STM32F412Zx || STM32F412Vx || STM32F412Rx || STM32F412Cx */
312312

313-
#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || defined(STM32F437xx) || \
314-
defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F446xx) || defined(STM32F469xx) || defined(STM32F479xx)
313+
#if defined(STM32F411xE) || defined(STM32F413xx) || defined(STM32F423xx) || defined(STM32F427xx) || \
314+
defined(STM32F437xx) || defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F446xx) || \
315+
defined(STM32F469xx) || defined(STM32F479xx)
315316
#define IS_ADC_CHANNEL(CHANNEL) (((CHANNEL) <= ADC_CHANNEL_18) || \
316317
((CHANNEL) == ADC_CHANNEL_TEMPSENSOR))
317318
#endif /* STM32F411xE || STM32F413xx || STM32F423xx || STM32F427xx || STM32F437xx || STM32F429xx || STM32F439xx || STM32F446xx || STM32F469xx || STM32F479xx */

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_can.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ typedef enum
255255
HAL_CAN_RX_FIFO1_MSG_PENDING_CB_ID = 0x08U, /*!< CAN Rx FIFO 1 message pending callback ID */
256256
HAL_CAN_RX_FIFO1_FULL_CB_ID = 0x09U, /*!< CAN Rx FIFO 1 full callback ID */
257257
HAL_CAN_SLEEP_CB_ID = 0x0AU, /*!< CAN Sleep callback ID */
258-
HAL_CAN_WAKEUP_FROM_RX_MSG_CB_ID = 0x0BU, /*!< CAN Wake Up fropm Rx msg callback ID */
258+
HAL_CAN_WAKEUP_FROM_RX_MSG_CB_ID = 0x0BU, /*!< CAN Wake Up from Rx msg callback ID */
259259
HAL_CAN_ERROR_CB_ID = 0x0CU, /*!< CAN Error callback ID */
260260

261261
HAL_CAN_MSPINIT_CB_ID = 0x0DU, /*!< CAN MspInit callback ID */
@@ -295,11 +295,11 @@ typedef void (*pCAN_CallbackTypeDef)(CAN_HandleTypeDef *hcan); /*!< pointer to
295295
#define HAL_CAN_ERROR_RX_FOV0 (0x00000200U) /*!< Rx FIFO0 overrun error */
296296
#define HAL_CAN_ERROR_RX_FOV1 (0x00000400U) /*!< Rx FIFO1 overrun error */
297297
#define HAL_CAN_ERROR_TX_ALST0 (0x00000800U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
298-
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 1 transmit failure due to tranmit error */
299-
#define HAL_CAN_ERROR_TX_ALST1 (0x00002000U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
300-
#define HAL_CAN_ERROR_TX_TERR1 (0x00004000U) /*!< TxMailbox 1 transmit failure due to tranmit error */
301-
#define HAL_CAN_ERROR_TX_ALST2 (0x00008000U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
302-
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 1 transmit failure due to tranmit error */
298+
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 0 transmit failure due to transmit error */
299+
#define HAL_CAN_ERROR_TX_ALST1 (0x00002000U) /*!< TxMailbox 1 transmit failure due to arbitration lost */
300+
#define HAL_CAN_ERROR_TX_TERR1 (0x00004000U) /*!< TxMailbox 1 transmit failure due to transmit error */
301+
#define HAL_CAN_ERROR_TX_ALST2 (0x00008000U) /*!< TxMailbox 2 transmit failure due to arbitration lost */
302+
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 2 transmit failure due to transmit error */
303303
#define HAL_CAN_ERROR_TIMEOUT (0x00020000U) /*!< Timeout error */
304304
#define HAL_CAN_ERROR_NOT_INITIALIZED (0x00040000U) /*!< Peripheral not initialized */
305305
#define HAL_CAN_ERROR_NOT_READY (0x00080000U) /*!< Peripheral not ready */

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cec.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ typedef struct
121121
* b6 Error information
122122
* 0 : No Error
123123
* 1 : Error
124-
* b5 IP initilisation status
124+
* b5 IP initialization status
125125
* 0 : Reset (IP not initialized)
126126
* 1 : Init done (IP initialized. HAL CEC Init function already called)
127127
* b4-b3 (not used)
@@ -138,7 +138,7 @@ typedef struct
138138
* RxState value coding follow below described bitmap :
139139
* b7-b6 (not used)
140140
* xx : Should be set to 00
141-
* b5 IP initilisation status
141+
* b5 IP initialization status
142142
* 0 : Reset (IP not initialized)
143143
* 1 : Init done (IP initialized)
144144
* b4-b2 (not used)

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_conf_template.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
#define HAL_PCD_MODULE_ENABLED
8080
#define HAL_HCD_MODULE_ENABLED
8181
#define HAL_FMPI2C_MODULE_ENABLED
82+
#define HAL_FMPSMBUS_MODULE_ENABLED
8283
#define HAL_SPDIFRX_MODULE_ENABLED
8384
#define HAL_DFSDM_MODULE_ENABLED
8485
#define HAL_LPTIM_MODULE_ENABLED
@@ -163,6 +164,7 @@
163164
#define USE_HAL_HCD_REGISTER_CALLBACKS 0U /* HCD register callback disabled */
164165
#define USE_HAL_I2C_REGISTER_CALLBACKS 0U /* I2C register callback disabled */
165166
#define USE_HAL_FMPI2C_REGISTER_CALLBACKS 0U /* FMPI2C register callback disabled */
167+
#define USE_HAL_FMPSMBUS_REGISTER_CALLBACKS 0U /* FMPSMBUS register callback disabled */
166168
#define USE_HAL_I2S_REGISTER_CALLBACKS 0U /* I2S register callback disabled */
167169
#define USE_HAL_IRDA_REGISTER_CALLBACKS 0U /* IRDA register callback disabled */
168170
#define USE_HAL_LPTIM_REGISTER_CALLBACKS 0U /* LPTIM register callback disabled */
@@ -451,6 +453,10 @@
451453
#include "stm32f4xx_hal_fmpi2c.h"
452454
#endif /* HAL_FMPI2C_MODULE_ENABLED */
453455

456+
#ifdef HAL_FMPSMBUS_MODULE_ENABLED
457+
#include "stm32f4xx_hal_fmpsmbus.h"
458+
#endif /* HAL_FMPSMBUS_MODULE_ENABLED */
459+
454460
#ifdef HAL_SPDIFRX_MODULE_ENABLED
455461
#include "stm32f4xx_hal_spdifrx.h"
456462
#endif /* HAL_SPDIFRX_MODULE_ENABLED */

‎system/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_cryp.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ typedef struct
6565
uint32_t HeaderSize; /*!< The size of header buffer in word */
6666
uint32_t *B0; /*!< B0 is first authentication block used only in AES CCM mode */
6767
uint32_t DataWidthUnit; /*!< Data With Unit, this parameter can be value of @ref CRYP_Data_Width_Unit*/
68+
uint32_t HeaderWidthUnit; /*!< Header Width Unit, this parameter can be value of @ref CRYP_Header_Width_Unit*/
6869
uint32_t KeyIVConfigSkip; /*!< CRYP peripheral Key and IV configuration skip, to config Key and Initialization
6970
Vector only once and to skip configuration for consecutive processings.
7071
This parameter can be a value of @ref CRYP_Configuration_Skip */
@@ -210,6 +211,17 @@ typedef void (*pCRYP_CallbackTypeDef)(CRYP_HandleTypeDef *hcryp); /*!< point
210211
#define CRYP_DATAWIDTHUNIT_WORD 0x00000000U /*!< By default, size unit is word */
211212
#define CRYP_DATAWIDTHUNIT_BYTE 0x00000001U /*!< By default, size unit is word */
212213

214+
/**
215+
* @}
216+
*/
217+
218+
/** @defgroup CRYP_Header_Width_Unit CRYP Header Width Unit
219+
* @{
220+
*/
221+
222+
#define CRYP_HEADERWIDTHUNIT_WORD 0x00000000U /*!< By default, header size unit is word */
223+
#define CRYP_HEADERWIDTHUNIT_BYTE 0x00000001U /*!< By default, header size unit is byte */
224+
213225
/**
214226
* @}
215227
*/

0 commit comments

Comments
 (0)