Skip to content

Commit 792cc60

Browse files
committed
system(H7) update STM32H7xx HAL Drivers to v1.11.1
Included in STM32CubeH7 FW v1.11.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 9adabec commit 792cc60

File tree

130 files changed

+8461
-7034
lines changed

Some content is hidden

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

130 files changed

+8461
-7034
lines changed

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

+66-134
Large diffs are not rendered by default.

system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal.h

+48-5
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* @attention
99
*
1010
* Copyright (c) 2017 STMicroelectronics.
11-
* All rights reserved.</center></h2>
11+
* All rights reserved.
1212
*
1313
* This software is licensed under terms that can be found in the LICENSE file
1414
* in the root directory of this software component.
@@ -52,7 +52,9 @@ typedef enum
5252
*/
5353

5454
/* Exported constants --------------------------------------------------------*/
55-
55+
/** @defgroup HAL_Exported_Constants HAL Exported Constants
56+
* @{
57+
*/
5658
/** @defgroup REV_ID device revision ID
5759
* @{
5860
*/
@@ -65,6 +67,10 @@ typedef enum
6567
* @}
6668
*/
6769

70+
/** @defgroup SYSCFG_Exported_Constants SYSCFG Exported Constants
71+
* @{
72+
*/
73+
6874
/** @defgroup SYSCFG_VREFBUF_VoltageScale VREFBUF Voltage Scale
6975
* @{
7076
*/
@@ -230,7 +236,9 @@ typedef enum
230236
* @}
231237
*/
232238

233-
239+
/**
240+
* @}
241+
*/
234242

235243

236244
/** @defgroup EXTI_Event_Input_Config Event Input Config
@@ -696,9 +704,14 @@ typedef enum
696704
/**
697705
* @}
698706
*/
699-
707+
/**
708+
* @}
709+
*/
700710

701711
/* Exported macro ------------------------------------------------------------*/
712+
/** @defgroup HAL_Exported_Macros HAL Exported Macros
713+
* @{
714+
*/
702715
#if defined(DUAL_CORE)
703716
/** @defgroup ART_Exported_Macros ART Exported Macros
704717
* @{
@@ -835,6 +848,10 @@ typedef enum
835848
* @}
836849
*/
837850

851+
/** @defgroup DBG_Exported_Macros DBG Exported Macros
852+
* @{
853+
*/
854+
838855
/** @brief Freeze/Unfreeze Peripherals in Debug mode
839856
*/
840857
#define __HAL_DBGMCU_FREEZE_WWDG1() (DBGMCU->APB3FZ1 |= (DBGMCU_APB3FZ1_DBG_WWDG1))
@@ -1002,6 +1019,12 @@ typedef enum
10021019
#define __HAL_DBGMCU_UnFreeze2_IWDG1() (DBGMCU->APB4FZ2 &= ~ (DBGMCU_APB4FZ2_DBG_IWDG1))
10031020

10041021
#endif /*DUAL_CORE*/
1022+
/**
1023+
* @}
1024+
*/
1025+
/**
1026+
* @}
1027+
*/
10051028

10061029
/** @defgroup HAL_Private_Macros HAL Private Macros
10071030
* @{
@@ -1026,15 +1049,27 @@ extern HAL_TickFreqTypeDef uwTickFreq;
10261049
*/
10271050

10281051
/* Exported functions --------------------------------------------------------*/
1029-
1052+
/** @defgroup HAL_Exported_Functions HAL Exported Functions
1053+
* @{
1054+
*/
10301055
/* Initialization and de-initialization functions ******************************/
1056+
/** @defgroup HAL_Group1 Initialization and de-initialization Functions
1057+
* @{
1058+
*/
10311059
HAL_StatusTypeDef HAL_Init(void);
10321060
HAL_StatusTypeDef HAL_DeInit(void);
10331061
void HAL_MspInit(void);
10341062
void HAL_MspDeInit(void);
10351063
HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority);
10361064

1065+
/**
1066+
* @}
1067+
*/
1068+
10371069
/* Peripheral Control functions ************************************************/
1070+
/** @defgroup HAL_Group2 HAL Control functions
1071+
*
1072+
*/
10381073
void HAL_IncTick(void);
10391074
void HAL_Delay(uint32_t Delay);
10401075
uint32_t HAL_GetTick(void);
@@ -1125,6 +1160,14 @@ void HAL_SYSCFG_ADC2ALT_Rout0Config(uint32_t Adc2AltRout0);
11251160
void HAL_SYSCFG_ADC2ALT_Rout1Config(uint32_t Adc2AltRout1);
11261161
#endif /*SYSCFG_ADC2ALT_ADC2_ROUT1*/
11271162

1163+
/**
1164+
* @}
1165+
*/
1166+
1167+
/**
1168+
* @}
1169+
*/
1170+
11281171
/**
11291172
* @}
11301173
*/

system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_adc.h

+13-12
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ typedef struct
256256

257257
uint32_t Offset; /*!< Define the offset to be subtracted from the raw converted data.
258258
Offset value must be a positive number.
259-
Depending of ADC resolution selected (16, 14, 12, 10, 8 bits), this parameter must be a number between Min_Data = 0x0000 and Max_Data = 0xFFFF,
260-
0x3FFF, 0xFFF, 0x3FF or 0xFF respectively.
259+
Maximum value depends on ADC resolution and oversampling ratio (in case of oversampling used).
260+
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0x3FFFC00 (corresponding to resolution 16 bit and oversampling ratio 1024).
261261
Note: This parameter must be modified when no conversion is on going on both regular and injected groups (ADC disabled, or ADC enabled
262262
without continuous mode or external trigger that could launch a conversion). */
263263

@@ -755,14 +755,14 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
755755
/** @defgroup ADC_analog_watchdog_filtering_config ADC Analog Watchdog filtering configuration
756756
* @{
757757
*/
758-
#define ADC3_AWD_FILTERING_NONE (0x00000000UL) /*!< ADC analog wathdog no filtering, one out-of-window sample is needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
759-
#define ADC3_AWD_FILTERING_2SAMPLES ((ADC3_TR1_AWDFILT_0)) /*!< ADC analog wathdog 2 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
760-
#define ADC3_AWD_FILTERING_3SAMPLES ((ADC3_TR1_AWDFILT_1)) /*!< ADC analog wathdog 3 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
761-
#define ADC3_AWD_FILTERING_4SAMPLES ((ADC3_TR1_AWDFILT_1 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog wathdog 4 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
762-
#define ADC3_AWD_FILTERING_5SAMPLES ((ADC3_TR1_AWDFILT_2)) /*!< ADC analog wathdog 5 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
763-
#define ADC3_AWD_FILTERING_6SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog wathdog 6 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
764-
#define ADC3_AWD_FILTERING_7SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_1)) /*!< ADC analog wathdog 7 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
765-
#define ADC3_AWD_FILTERING_8SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_1 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog wathdog 8 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
758+
#define ADC3_AWD_FILTERING_NONE (0x00000000UL) /*!< ADC analog watchdog no filtering, one out-of-window sample is needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
759+
#define ADC3_AWD_FILTERING_2SAMPLES ((ADC3_TR1_AWDFILT_0)) /*!< ADC analog watchdog 2 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
760+
#define ADC3_AWD_FILTERING_3SAMPLES ((ADC3_TR1_AWDFILT_1)) /*!< ADC analog watchdog 3 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
761+
#define ADC3_AWD_FILTERING_4SAMPLES ((ADC3_TR1_AWDFILT_1 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog watchdog 4 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
762+
#define ADC3_AWD_FILTERING_5SAMPLES ((ADC3_TR1_AWDFILT_2)) /*!< ADC analog watchdog 5 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
763+
#define ADC3_AWD_FILTERING_6SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog watchdog 6 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
764+
#define ADC3_AWD_FILTERING_7SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_1)) /*!< ADC analog watchdog 7 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
765+
#define ADC3_AWD_FILTERING_8SAMPLES ((ADC3_TR1_AWDFILT_2 | ADC3_TR1_AWDFILT_1 | ADC3_TR1_AWDFILT_0)) /*!< ADC analog watchdog 8 consecutives out-of-window samples are needed to raise flag or interrupt. Applicable for ADC3 on devices STM32H72xx and STM32H73xx */
766766
/**
767767
* @}
768768
*/
@@ -910,7 +910,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
910910
#define ADC_FLAG_AWD2 ADC_ISR_AWD2 /*!< ADC Analog watchdog 2 flag (additional analog watchdog) */
911911
#define ADC_FLAG_AWD3 ADC_ISR_AWD3 /*!< ADC Analog watchdog 3 flag (additional analog watchdog) */
912912
#define ADC_FLAG_JQOVF ADC_ISR_JQOVF /*!< ADC Injected Context Queue Overflow flag */
913-
913+
#define ADC_FLAG_LDORDY ADC_ISR_LDORDY /*!< ADC LDO output voltage ready bit */
914914
/**
915915
* @}
916916
*/
@@ -1372,7 +1372,8 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
13721372
* @arg @ref ADC_FLAG_AWD1 ADC Analog watchdog 1 flag (main analog watchdog)
13731373
* @arg @ref ADC_FLAG_AWD2 ADC Analog watchdog 2 flag (additional analog watchdog)
13741374
* @arg @ref ADC_FLAG_AWD3 ADC Analog watchdog 3 flag (additional analog watchdog)
1375-
* @arg @ref ADC_FLAG_JQOVF ADC Injected Context Queue Overflow flag.
1375+
* @arg @ref ADC_FLAG_JQOVF ADC Injected Context Queue Overflow flag
1376+
* @arg @ref ADC_FLAG_LDORDY ADC LDO output voltage ready bit.
13761377
* @retval State of flag (TRUE or FALSE).
13771378
*/
13781379
#define __HAL_ADC_GET_FLAG(__HANDLE__, __FLAG__) \

system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_adc_ex.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ typedef struct
112112

113113
uint32_t InjectedOffset; /*!< Defines the offset to be subtracted from the raw converted data.
114114
Offset value must be a positive number.
115-
Depending of ADC resolution selected (12, 10, 8 or 6 bits), this parameter must be a number
116-
between Min_Data = 0x000 and Max_Data = 0xFFF, 0x3FF, 0xFF or 0x3F respectively.
115+
Maximum value depends on ADC resolution and oversampling ratio (in case of oversampling used).
116+
This parameter must be a number between Min_Data = 0x0000 and Max_Data = 0x3FFFC00 (corresponding to resolution 16 bit and oversampling ratio 1024).
117117
Note: This parameter must be modified when no conversion is on going on both regular and injected groups (ADC disabled, or ADC enabled
118118
without continuous mode or external trigger that could launch a conversion). */
119119

0 commit comments

Comments
 (0)