Skip to content

Commit b6f6b1d

Browse files
committed
Update STM32F3xx HAL Drivers to v1.5.0
Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 087e456 commit b6f6b1d

File tree

154 files changed

+6397
-5400
lines changed

Some content is hidden

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

154 files changed

+6397
-5400
lines changed

system/Drivers/STM32F3xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 29 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@
22
******************************************************************************
33
* @file stm32_hal_legacy.h
44
* @author MCD Application Team
5-
* @version V1.4.0
6-
* @date 16-December-2016
75
* @brief This file contains aliases definition for the STM32Cube HAL constants
86
* macros and functions maintained for legacy purpose.
97
******************************************************************************
108
* @attention
119
*
12-
* <h2><center>&copy; COPYRIGHT(c) 2016 STMicroelectronics</center></h2>
10+
* <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
1311
*
1412
* Redistribution and use in source and binary forms, with or without modification,
1513
* are permitted provided that the following conditions are met:
@@ -382,7 +380,7 @@
382380
/** @defgroup LL_FMC_Aliased_Defines LL FMC Aliased Defines maintained for compatibility purpose
383381
* @{
384382
*/
385-
#if defined(STM32L4) || defined(STM32F7)
383+
#if defined(STM32L4) || defined(STM32F7) || defined(STM32H7)
386384
#define FMC_NAND_PCC_WAIT_FEATURE_DISABLE FMC_NAND_WAIT_FEATURE_DISABLE
387385
#define FMC_NAND_PCC_WAIT_FEATURE_ENABLE FMC_NAND_WAIT_FEATURE_ENABLE
388386
#define FMC_NAND_PCC_MEM_BUS_WIDTH_8 FMC_NAND_MEM_BUS_WIDTH_8
@@ -946,12 +944,9 @@
946944
#define ETH_MAC_RXFIFO_BELOW_THRESHOLD 0x00000100U /* Rx FIFO fill level: fill-level below flow-control de-activate threshold */
947945
#define ETH_MAC_RXFIFO_ABOVE_THRESHOLD 0x00000200U /* Rx FIFO fill level: fill-level above flow-control activate threshold */
948946
#define ETH_MAC_RXFIFO_FULL 0x00000300U /* Rx FIFO fill level: full */
949-
#if defined(STM32F1)
950-
#else
951947
#define ETH_MAC_READCONTROLLER_IDLE 0x00000000U /* Rx FIFO read controller IDLE state */
952948
#define ETH_MAC_READCONTROLLER_READING_DATA 0x00000020U /* Rx FIFO read controller Reading frame data */
953949
#define ETH_MAC_READCONTROLLER_READING_STATUS 0x00000040U /* Rx FIFO read controller Reading frame status (or time-stamp) */
954-
#endif
955950
#define ETH_MAC_READCONTROLLER_FLUSHING 0x00000060U /* Rx FIFO read controller Flushing the frame data and status */
956951
#define ETH_MAC_RXFIFO_WRITE_ACTIVE 0x00000010U /* Rx FIFO write controller active */
957952
#define ETH_MAC_SMALL_FIFO_NOTACTIVE 0x00000000U /* MAC small FIFO read / write controllers not active */
@@ -980,7 +975,7 @@
980975
* @}
981976
*/
982977

983-
#if defined(STM32L4xx) || defined(STM32F7) || defined(STM32F427xx) || defined(STM32F437xx) ||\
978+
#if defined(STM32L4) || defined(STM32F7) || defined(STM32F427xx) || defined(STM32F437xx) ||\
984979
defined(STM32F429xx) || defined(STM32F439xx) || defined(STM32F469xx) || defined(STM32F479xx)
985980
/** @defgroup HAL_DMA2D_Aliased_Defines HAL DMA2D Aliased Defines maintained for legacy purpose
986981
* @{
@@ -1005,7 +1000,7 @@
10051000
/**
10061001
* @}
10071002
*/
1008-
#endif /* STM32L4xx || STM32F7*/
1003+
#endif /* STM32L4 || STM32F7*/
10091004

10101005
/** @defgroup HAL_PPP_Aliased_Defines HAL PPP Aliased Defines maintained for legacy purpose
10111006
* @{
@@ -1190,6 +1185,9 @@
11901185
* @{
11911186
*/
11921187
#define HAL_LTDC_LineEvenCallback HAL_LTDC_LineEventCallback
1188+
#define HAL_LTDC_Relaod HAL_LTDC_Reload
1189+
#define HAL_LTDC_StructInitFromVideoConfig HAL_LTDCEx_StructInitFromVideoConfig
1190+
#define HAL_LTDC_StructInitFromAdaptedCommandConfig HAL_LTDCEx_StructInitFromAdaptedCommandConfig
11931191
/**
11941192
* @}
11951193
*/
@@ -1625,7 +1623,11 @@
16251623

16261624
#define __HAL_I2C_RESET_CR2 I2C_RESET_CR2
16271625
#define __HAL_I2C_GENERATE_START I2C_GENERATE_START
1626+
#if defined(STM32F1)
1627+
#define __HAL_I2C_FREQ_RANGE I2C_FREQRANGE
1628+
#else
16281629
#define __HAL_I2C_FREQ_RANGE I2C_FREQ_RANGE
1630+
#endif /* STM32F1 */
16291631
#define __HAL_I2C_RISE_TIME I2C_RISE_TIME
16301632
#define __HAL_I2C_SPEED_STANDARD I2C_SPEED_STANDARD
16311633
#define __HAL_I2C_SPEED_FAST I2C_SPEED_FAST
@@ -2792,6 +2794,15 @@
27922794
#define RCC_SWPMI1CLKSOURCE_PCLK RCC_SWPMI1CLKSOURCE_PCLK1
27932795
#define RCC_LPTIM1CLKSOURCE_PCLK RCC_LPTIM1CLKSOURCE_PCLK1
27942796
#define RCC_LPTIM2CLKSOURCE_PCLK RCC_LPTIM2CLKSOURCE_PCLK1
2797+
2798+
#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB1 RCC_DFSDM1AUDIOCLKSOURCE_I2S1
2799+
#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB2 RCC_DFSDM1AUDIOCLKSOURCE_I2S2
2800+
#define RCC_DFSDM2AUDIOCLKSOURCE_I2SAPB1 RCC_DFSDM2AUDIOCLKSOURCE_I2S1
2801+
#define RCC_DFSDM2AUDIOCLKSOURCE_I2SAPB2 RCC_DFSDM2AUDIOCLKSOURCE_I2S2
2802+
#define RCC_DFSDM1CLKSOURCE_APB2 RCC_DFSDM1CLKSOURCE_PCLK2
2803+
#define RCC_DFSDM2CLKSOURCE_APB2 RCC_DFSDM2CLKSOURCE_PCLK2
2804+
#define RCC_FMPI2C1CLKSOURCE_APB RCC_FMPI2C1CLKSOURCE_PCLK1
2805+
27952806
/**
27962807
* @}
27972808
*/
@@ -2921,6 +2932,14 @@
29212932
#define SDIO_IRQn SDMMC1_IRQn
29222933
#define SDIO_IRQHandler SDMMC1_IRQHandler
29232934
#endif
2935+
2936+
#if defined(STM32F7) || defined(STM32F4) || defined(STM32F2)
2937+
#define HAL_SD_CardCIDTypedef HAL_SD_CardCIDTypeDef
2938+
#define HAL_SD_CardCSDTypedef HAL_SD_CardCSDTypeDef
2939+
#define HAL_SD_CardStatusTypedef HAL_SD_CardStatusTypeDef
2940+
#define HAL_SD_CardStateTypedef HAL_SD_CardStateTypeDef
2941+
#endif
2942+
29242943
/**
29252944
* @}
29262945
*/
@@ -3109,6 +3128,7 @@
31093128
* @{
31103129
*/
31113130
#define __HAL_LTDC_LAYER LTDC_LAYER
3131+
#define __HAL_LTDC_RELOAD_CONFIG __HAL_LTDC_RELOAD_IMMEDIATE_CONFIG
31123132
/**
31133133
* @}
31143134
*/

system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32_assert_template.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
******************************************************************************
33
* @file stm32_assert.h
44
* @author MCD Application Team
5-
* @version V1.4.0
6-
* @date 16-December-2016
75
* @brief STM32 assert template file.
86
* This file should be copied to the application folder and renamed
97
* to stm32_assert.h.
@@ -52,15 +50,15 @@
5250
#ifdef USE_FULL_ASSERT
5351
/**
5452
* @brief The assert_param macro is used for function's parameters check.
55-
* @param expr: If expr is false, it calls assert_failed function
53+
* @param expr If expr is false, it calls assert_failed function
5654
* which reports the name of the source file and the source
5755
* line number of the call that failed.
5856
* If expr is true, it returns no value.
5957
* @retval None
6058
*/
61-
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
59+
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((char *)__FILE__, __LINE__))
6260
/* Exported functions ------------------------------------------------------- */
63-
void assert_failed(uint8_t* file, uint32_t line);
61+
void assert_failed(char* file, uint32_t line);
6462
#else
6563
#define assert_param(expr) ((void)0U)
6664
#endif /* USE_FULL_ASSERT */

0 commit comments

Comments
 (0)