Skip to content

Commit d4f0f1e

Browse files
fpistmfpistm
committed
Update STM32F7xx HAL Drivers to v1.2.6
Included in STM32CubeF7 FW V1.12.0 Signed-off-by: Frederic.Pillon <[email protected]>
1 parent 620cdb5 commit d4f0f1e

24 files changed

+2534
-2282
lines changed

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

+5-22
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@
381381
/** @defgroup LL_FMC_Aliased_Defines LL FMC Aliased Defines maintained for compatibility purpose
382382
* @{
383383
*/
384-
#if defined(STM32L4) || defined(STM32F7) || defined(STM32H7) || defined(STM32G4)
384+
#if defined(STM32L4) || defined(STM32F7) || defined(STM32H7)
385385
#define FMC_NAND_PCC_WAIT_FEATURE_DISABLE FMC_NAND_WAIT_FEATURE_DISABLE
386386
#define FMC_NAND_PCC_WAIT_FEATURE_ENABLE FMC_NAND_WAIT_FEATURE_ENABLE
387387
#define FMC_NAND_PCC_MEM_BUS_WIDTH_8 FMC_NAND_MEM_BUS_WIDTH_8
@@ -431,12 +431,12 @@
431431
#define GPIO_AF1_LPTIM GPIO_AF1_LPTIM1
432432
#define GPIO_AF2_LPTIM GPIO_AF2_LPTIM1
433433

434-
#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7) || defined(STM32G4)
434+
#if defined(STM32L0) || defined(STM32L4) || defined(STM32F4) || defined(STM32F2) || defined(STM32F7)
435435
#define GPIO_SPEED_LOW GPIO_SPEED_FREQ_LOW
436436
#define GPIO_SPEED_MEDIUM GPIO_SPEED_FREQ_MEDIUM
437437
#define GPIO_SPEED_FAST GPIO_SPEED_FREQ_HIGH
438438
#define GPIO_SPEED_HIGH GPIO_SPEED_FREQ_VERY_HIGH
439-
#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 || STM32G4 */
439+
#endif /* STM32L0 || STM32L4 || STM32F4 || STM32F2 || STM32F7 */
440440

441441
#if defined(STM32L1)
442442
#define GPIO_SPEED_VERY_LOW GPIO_SPEED_FREQ_LOW
@@ -564,7 +564,7 @@
564564
#define I2C_NOSTRETCH_ENABLED I2C_NOSTRETCH_ENABLE
565565
#define I2C_ANALOGFILTER_ENABLED I2C_ANALOGFILTER_ENABLE
566566
#define I2C_ANALOGFILTER_DISABLED I2C_ANALOGFILTER_DISABLE
567-
#if defined(STM32F0) || defined(STM32F1) || defined(STM32F3) || defined(STM32G0) || defined(STM32L4) || defined(STM32L1) || defined(STM32F7)
567+
#if defined(STM32F0) || defined(STM32F1) || defined(STM32F3) || defined(STM32L4) || defined(STM32L1) || defined(STM32F7)
568568
#define HAL_I2C_STATE_MEM_BUSY_TX HAL_I2C_STATE_BUSY_TX
569569
#define HAL_I2C_STATE_MEM_BUSY_RX HAL_I2C_STATE_BUSY_RX
570570
#define HAL_I2C_STATE_MASTER_BUSY_TX HAL_I2C_STATE_BUSY_TX
@@ -2120,20 +2120,6 @@
21202120
#define __QSPI_FORCE_RESET __HAL_RCC_QSPI_FORCE_RESET
21212121
#define __QSPI_RELEASE_RESET __HAL_RCC_QSPI_RELEASE_RESET
21222122

2123-
#if defined(STM32WB)
2124-
#define __HAL_RCC_QSPI_CLK_DISABLE __HAL_RCC_QUADSPI_CLK_DISABLE
2125-
#define __HAL_RCC_QSPI_CLK_ENABLE __HAL_RCC_QUADSPI_CLK_ENABLE
2126-
#define __HAL_RCC_QSPI_CLK_SLEEP_DISABLE __HAL_RCC_QUADSPI_CLK_SLEEP_DISABLE
2127-
#define __HAL_RCC_QSPI_CLK_SLEEP_ENABLE __HAL_RCC_QUADSPI_CLK_SLEEP_ENABLE
2128-
#define __HAL_RCC_QSPI_FORCE_RESET __HAL_RCC_QUADSPI_FORCE_RESET
2129-
#define __HAL_RCC_QSPI_RELEASE_RESET __HAL_RCC_QUADSPI_RELEASE_RESET
2130-
#define __HAL_RCC_QSPI_IS_CLK_ENABLED __HAL_RCC_QUADSPI_IS_CLK_ENABLED
2131-
#define __HAL_RCC_QSPI_IS_CLK_DISABLED __HAL_RCC_QUADSPI_IS_CLK_DISABLED
2132-
#define __HAL_RCC_QSPI_IS_CLK_SLEEP_ENABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_ENABLED
2133-
#define __HAL_RCC_QSPI_IS_CLK_SLEEP_DISABLED __HAL_RCC_QUADSPI_IS_CLK_SLEEP_DISABLED
2134-
#define QSPI_IRQHandler QUADSPI_IRQHandler
2135-
#endif /* __HAL_RCC_QUADSPI_CLK_ENABLE */
2136-
21372123
#define __RNG_CLK_DISABLE __HAL_RCC_RNG_CLK_DISABLE
21382124
#define __RNG_CLK_ENABLE __HAL_RCC_RNG_CLK_ENABLE
21392125
#define __RNG_CLK_SLEEP_DISABLE __HAL_RCC_RNG_CLK_SLEEP_DISABLE
@@ -2804,7 +2790,6 @@
28042790

28052791
#if defined(STM32L4)
28062792
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
2807-
#elif defined(STM32WB) || defined(STM32G0)
28082793
#else
28092794
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
28102795
#endif
@@ -2932,10 +2917,8 @@
29322917
/** @defgroup HAL_RTC_Aliased_Macros HAL RTC Aliased Macros maintained for legacy purpose
29332918
* @{
29342919
*/
2935-
#if defined (STM32G0)
2936-
#else
2920+
29372921
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
2938-
#endif
29392922
#define __HAL_RTC_DISABLE_IT __HAL_RTC_EXTI_DISABLE_IT
29402923
#define __HAL_RTC_ENABLE_IT __HAL_RTC_EXTI_ENABLE_IT
29412924

‎system/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_dma_ex.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ typedef enum
9393
#define DMA_CHANNEL_7 0x0E000000U /*!< DMA Channel 7 */
9494
#if defined (STM32F722xx) || defined (STM32F723xx) || defined (STM32F732xx) || defined (STM32F733xx) ||\
9595
defined (STM32F765xx) || defined (STM32F767xx) || defined (STM32F769xx) || defined (STM32F777xx) ||\
96-
defined (STM32F779xx)
96+
defined (STM32F779xx) || defined (STM32F730xx)
9797
#define DMA_CHANNEL_8 0x10000000U /*!< DMA Channel 8 */
9898
#define DMA_CHANNEL_9 0x12000000U /*!< DMA Channel 9 */
9999
#define DMA_CHANNEL_10 0x14000000U /*!< DMA Channel 10*/
@@ -103,7 +103,7 @@ typedef enum
103103
#define DMA_CHANNEL_14 0x1C000000U /*!< DMA Channel 14*/
104104
#define DMA_CHANNEL_15 0x1E000000U /*!< DMA Channel 15*/
105105
#endif /* STM32F722xx || STM32F723xx || STM32F732xx || STM32F733xx || STM32F765xx || STM32F767xx ||
106-
STM32F769xx || STM32F777xx || STM32F779xx */
106+
STM32F769xx || STM32F777xx || STM32F779xx || STM32F730xx */
107107

108108
/**
109109
* @}
@@ -143,7 +143,7 @@ HAL_StatusTypeDef HAL_DMAEx_ChangeMemory(DMA_HandleTypeDef *hdma, uint32_t Addre
143143
*/
144144
#if defined (STM32F722xx) || defined (STM32F723xx) || defined (STM32F732xx) || defined (STM32F733xx) ||\
145145
defined (STM32F765xx) || defined (STM32F767xx) || defined (STM32F769xx) || defined (STM32F777xx) ||\
146-
defined (STM32F779xx)
146+
defined (STM32F779xx) || defined (STM32F730xx)
147147
#define IS_DMA_CHANNEL(CHANNEL) (((CHANNEL) == DMA_CHANNEL_0) || \
148148
((CHANNEL) == DMA_CHANNEL_1) || \
149149
((CHANNEL) == DMA_CHANNEL_2) || \
@@ -170,7 +170,7 @@ HAL_StatusTypeDef HAL_DMAEx_ChangeMemory(DMA_HandleTypeDef *hdma, uint32_t Addre
170170
((CHANNEL) == DMA_CHANNEL_6) || \
171171
((CHANNEL) == DMA_CHANNEL_7))
172172
#endif /* STM32F722xx || STM32F723xx || STM32F732xx || STM32F733xx || STM32F765xx || STM32F767xx ||
173-
STM32F769xx || STM32F777xx || STM32F779xx */
173+
STM32F769xx || STM32F777xx || STM32F779xx || STM32F730xx*/
174174
/**
175175
* @}
176176
*/

0 commit comments

Comments
 (0)