Skip to content

Commit 0be1cd6

Browse files
fpistmfpistm
committed
system(F3) update STM32F3xx HAL Drivers to v1.5.7
Included in STM32CubeF3 FW v1.11.4 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 343c091 commit 0be1cd6

File tree

166 files changed

+7511
-6127
lines changed

Some content is hidden

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

166 files changed

+7511
-6127
lines changed

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

+539-60
Large diffs are not rendered by default.

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/Legacy/stm32f3xx_hal_can_legacy.h

+6-10
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2016 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -147,7 +146,7 @@ typedef struct
147146

148147
uint32_t BankNumber; /*!< Select the start slave bank filter
149148
F3 devices don't support CAN2 interface (Slave). Therefore this parameter
150-
is meaningless but it has been kept for compatibility accross STM32 families */
149+
is meaningless but it has been kept for compatibility across STM32 families */
151150

152151
}CAN_FilterConfTypeDef;
153152

@@ -798,6 +797,3 @@ HAL_CAN_StateTypeDef HAL_CAN_GetState(CAN_HandleTypeDef* hcan);
798797
#endif
799798

800799
#endif /* __STM32F3xx_HAL_CAN_LEGACY_H */
801-
802-
803-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32_assert_template.h

+5-7
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
******************************************************************************
99
* @attention
1010
*
11-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
12-
* All rights reserved.</center></h2>
11+
* Copyright (c) 2016 STMicroelectronics.
12+
* All rights reserved.
1313
*
14-
* This software component is licensed by ST under BSD 3-Clause license,
15-
* the "License"; You may not use this file except in compliance with the
16-
* License. You may obtain a copy of the License at:
17-
* opensource.org/licenses/BSD-3-Clause
14+
* This software is licensed under terms that can be found in the LICENSE file
15+
* in the root directory of this software component.
16+
* If no LICENSE file comes with this software, it is provided AS-IS.
1817
*
1918
******************************************************************************
2019
*/
@@ -54,4 +53,3 @@
5453
#endif /* __STM32_ASSERT_H */
5554

5655

57-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal.h

+5-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
******************************************************************************
88
* @attention
99
*
10-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
11-
* All rights reserved.</center></h2>
10+
* Copyright (c) 2016 STMicroelectronics.
11+
* All rights reserved.
1212
*
13-
* This software component is licensed by ST under BSD 3-Clause license,
14-
* the "License"; You may not use this file except in compliance with the
15-
* License. You may obtain a copy of the License at:
16-
* opensource.org/licenses/BSD-3-Clause
13+
* This software is licensed under terms that can be found in the LICENSE file
14+
* in the root directory of this software component.
15+
* If no LICENSE file comes with this software, it is provided AS-IS.
1716
*
1817
******************************************************************************
1918
*/
@@ -942,4 +941,3 @@ void HAL_DBGMCU_DisableDBGStandbyMode(void);
942941

943942
#endif /* __STM32F3xx_HAL_H */
944943

945-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_adc.h

+5-8
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2016 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -269,5 +268,3 @@ uint32_t HAL_ADC_GetError(ADC_HandleTypeDef *hadc);
269268

270269
#endif /*__STM32F3xx_ADC_H */
271270

272-
273-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_adc_ex.h

+7-9
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2016 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -58,7 +57,7 @@ struct __ADC_HandleTypeDef;
5857
* - For all parameters except 'LowPowerAutoWait' and 'DMAContinuousRequests': ADC enabled without conversion on going on regular group.
5958
* - For parameters 'LowPowerAutoWait' and 'DMAContinuousRequests': ADC enabled without conversion on going on regular and injected groups.
6059
* If ADC is not in the appropriate state to modify some parameters, these parameters setting is bypassed
61-
* without error reporting (as it can be the expected behaviour in case of intended action to update another parameter (which fullfills the ADC state condition) on the fly).
60+
* without error reporting (as it can be the expected behaviour in case of intended action to update another parameter (which fulfills the ADC state condition) on the fly).
6261
*/
6362
typedef struct
6463
{
@@ -691,7 +690,7 @@ typedef struct
691690
#if defined(STM32F302xE)
692691
/* ADC external triggers specific to device STM302xE: mask to differentiate */
693692
/* standard triggers from specific timer 20U, needed for reallocation of */
694-
/* triggers common to ADC1&2 and to avoind mixing with standard */
693+
/* triggers common to ADC1&2 and to avoid mixing with standard */
695694
/* triggers without remap. */
696695
#define ADC_EXTERNALTRIGCONV_T20_MASK 0x1000
697696

@@ -3964,4 +3963,3 @@ HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(struct __ADC_HandleType
39643963
#endif /*__STM32F3xx_ADC_H */
39653964

39663965

3967-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: ‎system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_can.h

+35-30
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2016 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2016 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -103,21 +102,25 @@ typedef struct
103102
{
104103
uint32_t FilterIdHigh; /*!< Specifies the filter identification number (MSBs for a 32-bit
105104
configuration, first one for a 16-bit configuration).
106-
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. */
105+
This parameter must be a number between
106+
Min_Data = 0x0000 and Max_Data = 0xFFFF. */
107107

108108
uint32_t FilterIdLow; /*!< Specifies the filter identification number (LSBs for a 32-bit
109109
configuration, second one for a 16-bit configuration).
110-
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. */
110+
This parameter must be a number between
111+
Min_Data = 0x0000 and Max_Data = 0xFFFF. */
111112

112113
uint32_t FilterMaskIdHigh; /*!< Specifies the filter mask number or identification number,
113114
according to the mode (MSBs for a 32-bit configuration,
114115
first one for a 16-bit configuration).
115-
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. */
116+
This parameter must be a number between
117+
Min_Data = 0x0000 and Max_Data = 0xFFFF. */
116118

117119
uint32_t FilterMaskIdLow; /*!< Specifies the filter mask number or identification number,
118120
according to the mode (LSBs for a 32-bit configuration,
119121
second one for a 16-bit configuration).
120-
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF. */
122+
This parameter must be a number between
123+
Min_Data = 0x0000 and Max_Data = 0xFFFF. */
121124

122125
uint32_t FilterFIFOAssignment; /*!< Specifies the FIFO (0 or 1U) which will be assigned to the filter.
123126
This parameter can be a value of @ref CAN_filter_FIFO */
@@ -136,7 +139,7 @@ typedef struct
136139

137140
uint32_t SlaveStartFilterBank; /*!< Select the start filter bank for the slave CAN instance.
138141
STM32F3xx devices don't support slave CAN instance (dual CAN). Therefore
139-
this parameter is meaningless but it has been kept for compatibility accross
142+
this parameter is meaningless but it has been kept for compatibility across
140143
STM32 families. */
141144

142145
} CAN_FilterTypeDef;
@@ -290,11 +293,11 @@ typedef void (*pCAN_CallbackTypeDef)(CAN_HandleTypeDef *hcan); /*!< pointer to
290293
#define HAL_CAN_ERROR_RX_FOV0 (0x00000200U) /*!< Rx FIFO0 overrun error */
291294
#define HAL_CAN_ERROR_RX_FOV1 (0x00000400U) /*!< Rx FIFO1 overrun error */
292295
#define HAL_CAN_ERROR_TX_ALST0 (0x00000800U) /*!< TxMailbox 0 transmit failure due to arbitration lost */
293-
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 0 transmit failure due to transmit error */
296+
#define HAL_CAN_ERROR_TX_TERR0 (0x00001000U) /*!< TxMailbox 0 transmit failure due to transmit error */
294297
#define HAL_CAN_ERROR_TX_ALST1 (0x00002000U) /*!< TxMailbox 1 transmit failure due to arbitration lost */
295-
#define HAL_CAN_ERROR_TX_TERR1 (0x00004000U) /*!< TxMailbox 1 transmit failure due to transmit error */
298+
#define HAL_CAN_ERROR_TX_TERR1 (0x00004000U) /*!< TxMailbox 1 transmit failure due to transmit error */
296299
#define HAL_CAN_ERROR_TX_ALST2 (0x00008000U) /*!< TxMailbox 2 transmit failure due to arbitration lost */
297-
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 2 transmit failure due to transmit error */
300+
#define HAL_CAN_ERROR_TX_TERR2 (0x00010000U) /*!< TxMailbox 2 transmit failure due to transmit error */
298301
#define HAL_CAN_ERROR_TIMEOUT (0x00020000U) /*!< Timeout error */
299302
#define HAL_CAN_ERROR_NOT_INITIALIZED (0x00040000U) /*!< Peripheral not initialized */
300303
#define HAL_CAN_ERROR_NOT_READY (0x00080000U) /*!< Peripheral not ready */
@@ -325,7 +328,8 @@ typedef void (*pCAN_CallbackTypeDef)(CAN_HandleTypeDef *hcan); /*!< pointer to
325328
#define CAN_MODE_NORMAL (0x00000000U) /*!< Normal mode */
326329
#define CAN_MODE_LOOPBACK ((uint32_t)CAN_BTR_LBKM) /*!< Loopback mode */
327330
#define CAN_MODE_SILENT ((uint32_t)CAN_BTR_SILM) /*!< Silent mode */
328-
#define CAN_MODE_SILENT_LOOPBACK ((uint32_t)(CAN_BTR_LBKM | CAN_BTR_SILM)) /*!< Loopback combined with silent mode */
331+
#define CAN_MODE_SILENT_LOOPBACK ((uint32_t)(CAN_BTR_LBKM | CAN_BTR_SILM)) /*!< Loopback combined with
332+
silent mode */
329333
/**
330334
* @}
331335
*/
@@ -640,7 +644,8 @@ void HAL_CAN_MspDeInit(CAN_HandleTypeDef *hcan);
640644

641645
#if USE_HAL_CAN_REGISTER_CALLBACKS == 1
642646
/* Callbacks Register/UnRegister functions ***********************************/
643-
HAL_StatusTypeDef HAL_CAN_RegisterCallback(CAN_HandleTypeDef *hcan, HAL_CAN_CallbackIDTypeDef CallbackID, void (* pCallback)(CAN_HandleTypeDef *_hcan));
647+
HAL_StatusTypeDef HAL_CAN_RegisterCallback(CAN_HandleTypeDef *hcan, HAL_CAN_CallbackIDTypeDef CallbackID,
648+
void (* pCallback)(CAN_HandleTypeDef *_hcan));
644649
HAL_StatusTypeDef HAL_CAN_UnRegisterCallback(CAN_HandleTypeDef *hcan, HAL_CAN_CallbackIDTypeDef CallbackID);
645650

646651
#endif /* (USE_HAL_CAN_REGISTER_CALLBACKS) */
@@ -654,7 +659,7 @@ HAL_StatusTypeDef HAL_CAN_UnRegisterCallback(CAN_HandleTypeDef *hcan, HAL_CAN_Ca
654659
*/
655660

656661
/* Configuration functions ****************************************************/
657-
HAL_StatusTypeDef HAL_CAN_ConfigFilter(CAN_HandleTypeDef *hcan, CAN_FilterTypeDef *sFilterConfig);
662+
HAL_StatusTypeDef HAL_CAN_ConfigFilter(CAN_HandleTypeDef *hcan, const CAN_FilterTypeDef *sFilterConfig);
658663

659664
/**
660665
* @}
@@ -670,14 +675,16 @@ HAL_StatusTypeDef HAL_CAN_Start(CAN_HandleTypeDef *hcan);
670675
HAL_StatusTypeDef HAL_CAN_Stop(CAN_HandleTypeDef *hcan);
671676
HAL_StatusTypeDef HAL_CAN_RequestSleep(CAN_HandleTypeDef *hcan);
672677
HAL_StatusTypeDef HAL_CAN_WakeUp(CAN_HandleTypeDef *hcan);
673-
uint32_t HAL_CAN_IsSleepActive(CAN_HandleTypeDef *hcan);
674-
HAL_StatusTypeDef HAL_CAN_AddTxMessage(CAN_HandleTypeDef *hcan, CAN_TxHeaderTypeDef *pHeader, uint8_t aData[], uint32_t *pTxMailbox);
678+
uint32_t HAL_CAN_IsSleepActive(const CAN_HandleTypeDef *hcan);
679+
HAL_StatusTypeDef HAL_CAN_AddTxMessage(CAN_HandleTypeDef *hcan, const CAN_TxHeaderTypeDef *pHeader,
680+
const uint8_t aData[], uint32_t *pTxMailbox);
675681
HAL_StatusTypeDef HAL_CAN_AbortTxRequest(CAN_HandleTypeDef *hcan, uint32_t TxMailboxes);
676-
uint32_t HAL_CAN_GetTxMailboxesFreeLevel(CAN_HandleTypeDef *hcan);
677-
uint32_t HAL_CAN_IsTxMessagePending(CAN_HandleTypeDef *hcan, uint32_t TxMailboxes);
678-
uint32_t HAL_CAN_GetTxTimestamp(CAN_HandleTypeDef *hcan, uint32_t TxMailbox);
679-
HAL_StatusTypeDef HAL_CAN_GetRxMessage(CAN_HandleTypeDef *hcan, uint32_t RxFifo, CAN_RxHeaderTypeDef *pHeader, uint8_t aData[]);
680-
uint32_t HAL_CAN_GetRxFifoFillLevel(CAN_HandleTypeDef *hcan, uint32_t RxFifo);
682+
uint32_t HAL_CAN_GetTxMailboxesFreeLevel(const CAN_HandleTypeDef *hcan);
683+
uint32_t HAL_CAN_IsTxMessagePending(const CAN_HandleTypeDef *hcan, uint32_t TxMailboxes);
684+
uint32_t HAL_CAN_GetTxTimestamp(const CAN_HandleTypeDef *hcan, uint32_t TxMailbox);
685+
HAL_StatusTypeDef HAL_CAN_GetRxMessage(CAN_HandleTypeDef *hcan, uint32_t RxFifo,
686+
CAN_RxHeaderTypeDef *pHeader, uint8_t aData[]);
687+
uint32_t HAL_CAN_GetRxFifoFillLevel(const CAN_HandleTypeDef *hcan, uint32_t RxFifo);
681688

682689
/**
683690
* @}
@@ -725,8 +732,8 @@ void HAL_CAN_ErrorCallback(CAN_HandleTypeDef *hcan);
725732
* @{
726733
*/
727734
/* Peripheral State and Error functions ***************************************/
728-
HAL_CAN_StateTypeDef HAL_CAN_GetState(CAN_HandleTypeDef *hcan);
729-
uint32_t HAL_CAN_GetError(CAN_HandleTypeDef *hcan);
735+
HAL_CAN_StateTypeDef HAL_CAN_GetState(const CAN_HandleTypeDef *hcan);
736+
uint32_t HAL_CAN_GetError(const CAN_HandleTypeDef *hcan);
730737
HAL_StatusTypeDef HAL_CAN_ResetError(CAN_HandleTypeDef *hcan);
731738

732739
/**
@@ -801,7 +808,8 @@ HAL_StatusTypeDef HAL_CAN_ResetError(CAN_HandleTypeDef *hcan);
801808
#define IS_CAN_TX_MAILBOX(TRANSMITMAILBOX) (((TRANSMITMAILBOX) == CAN_TX_MAILBOX0 ) || \
802809
((TRANSMITMAILBOX) == CAN_TX_MAILBOX1 ) || \
803810
((TRANSMITMAILBOX) == CAN_TX_MAILBOX2 ))
804-
#define IS_CAN_TX_MAILBOX_LIST(TRANSMITMAILBOX) ((TRANSMITMAILBOX) <= (CAN_TX_MAILBOX0 | CAN_TX_MAILBOX1 | CAN_TX_MAILBOX2))
811+
#define IS_CAN_TX_MAILBOX_LIST(TRANSMITMAILBOX) ((TRANSMITMAILBOX) <= (CAN_TX_MAILBOX0 | CAN_TX_MAILBOX1 | \
812+
CAN_TX_MAILBOX2))
805813
#define IS_CAN_STDID(STDID) ((STDID) <= 0x7FFU)
806814
#define IS_CAN_EXTID(EXTID) ((EXTID) <= 0x1FFFFFFFU)
807815
#define IS_CAN_DLC(DLC) ((DLC) <= 8U)
@@ -837,6 +845,3 @@ HAL_StatusTypeDef HAL_CAN_ResetError(CAN_HandleTypeDef *hcan);
837845
#endif
838846

839847
#endif /* STM32F3xx_HAL_CAN_H */
840-
841-
842-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)