Skip to content

Commit a132e20

Browse files
fpistmfpistm
committed
system(H7) update STM32H7xx HAL Drivers to v1.11.5
Included in STM32CubeH7 FW v1.12.1 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent aa37c03 commit a132e20

File tree

150 files changed

+10268
-3917
lines changed

Some content is hidden

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

150 files changed

+10268
-3917
lines changed

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

+74-10
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,9 @@ extern "C" {
472472
#define TYPEPROGRAMDATA_FASTBYTE FLASH_TYPEPROGRAMDATA_FASTBYTE
473473
#define TYPEPROGRAMDATA_FASTHALFWORD FLASH_TYPEPROGRAMDATA_FASTHALFWORD
474474
#define TYPEPROGRAMDATA_FASTWORD FLASH_TYPEPROGRAMDATA_FASTWORD
475+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7) && !defined(STM32H5)
475476
#define PAGESIZE FLASH_PAGE_SIZE
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 && STM32H5 */
476478
#define TYPEPROGRAM_FASTBYTE FLASH_TYPEPROGRAM_BYTE
477479
#define TYPEPROGRAM_FASTHALFWORD FLASH_TYPEPROGRAM_HALFWORD
478480
#define TYPEPROGRAM_FASTWORD FLASH_TYPEPROGRAM_WORD
@@ -601,6 +603,15 @@ extern "C" {
601603
#define HAL_SYSCFG_DisableIOAnalogSwitchVDD HAL_SYSCFG_DisableIOSwitchVDD
602604
#endif /* STM32G4 */
603605

606+
#if defined(STM32U5)
607+
608+
#define HAL_SYSCFG_EnableIOAnalogSwitchBooster HAL_SYSCFG_EnableIOAnalogBooster
609+
#define HAL_SYSCFG_DisableIOAnalogSwitchBooster HAL_SYSCFG_DisableIOAnalogBooster
610+
#define HAL_SYSCFG_EnableIOAnalogSwitchVoltageSelection HAL_SYSCFG_EnableIOAnalogVoltageSelection
611+
#define HAL_SYSCFG_DisableIOAnalogSwitchVoltageSelection HAL_SYSCFG_DisableIOAnalogVoltageSelection
612+
613+
#endif /* STM32U5 */
614+
604615
#if defined(STM32H5)
605616
#define SYSCFG_IT_FPU_IOC SBS_IT_FPU_IOC
606617
#define SYSCFG_IT_FPU_DZC SBS_IT_FPU_DZC
@@ -806,6 +817,21 @@ extern "C" {
806817
#define GPIO_AF0_S2DSTOP GPIO_AF0_SRDSTOP
807818
#define GPIO_AF11_LPGPIO GPIO_AF11_LPGPIO1
808819
#endif /* STM32U5 */
820+
821+
#if defined(STM32WBA)
822+
#define GPIO_AF11_RF_ANTSW0 GPIO_AF11_RF
823+
#define GPIO_AF11_RF_ANTSW1 GPIO_AF11_RF
824+
#define GPIO_AF11_RF_ANTSW2 GPIO_AF11_RF
825+
#define GPIO_AF11_RF_IO1 GPIO_AF11_RF
826+
#define GPIO_AF11_RF_IO2 GPIO_AF11_RF
827+
#define GPIO_AF11_RF_IO3 GPIO_AF11_RF
828+
#define GPIO_AF11_RF_IO4 GPIO_AF11_RF
829+
#define GPIO_AF11_RF_IO5 GPIO_AF11_RF
830+
#define GPIO_AF11_RF_IO6 GPIO_AF11_RF
831+
#define GPIO_AF11_RF_IO7 GPIO_AF11_RF
832+
#define GPIO_AF11_RF_IO8 GPIO_AF11_RF
833+
#define GPIO_AF11_RF_IO9 GPIO_AF11_RF
834+
#endif /* STM32WBA */
809835
/**
810836
* @}
811837
*/
@@ -860,6 +886,10 @@ extern "C" {
860886
#define __HAL_HRTIM_SetCompare __HAL_HRTIM_SETCOMPARE
861887
#define __HAL_HRTIM_GetCompare __HAL_HRTIM_GETCOMPARE
862888

889+
#if defined(STM32F3) || defined(STM32G4) || defined(STM32H7)
890+
#define HRTIMInterruptResquests HRTIMInterruptRequests
891+
#endif /* STM32F3 || STM32G4 || STM32H7 */
892+
863893
#if defined(STM32G4)
864894
#define HAL_HRTIM_ExternalEventCounterConfig HAL_HRTIM_ExtEventCounterConfig
865895
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
@@ -997,8 +1027,8 @@ extern "C" {
9971027
#define HRTIM_CALIBRATIONRATE_910 (HRTIM_DLLCR_CALRTE_0)
9981028
#define HRTIM_CALIBRATIONRATE_114 (HRTIM_DLLCR_CALRTE_1)
9991029
#define HRTIM_CALIBRATIONRATE_14 (HRTIM_DLLCR_CALRTE_1 | HRTIM_DLLCR_CALRTE_0)
1000-
10011030
#endif /* STM32F3 */
1031+
10021032
/**
10031033
* @}
10041034
*/
@@ -1249,10 +1279,10 @@ extern "C" {
12491279
#define RTC_TAMPERPIN_PA0 RTC_TAMPERPIN_POS1
12501280
#define RTC_TAMPERPIN_PI8 RTC_TAMPERPIN_POS1
12511281

1252-
#if defined(STM32H5) || defined(STM32H7RS)
1282+
#if defined(STM32H5) || defined(STM32H7RS) || defined(STM32N6)
12531283
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
12541284
#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM TAMP_DEVICESECRETS_ERASE_BKPSRAM
1255-
#endif /* STM32H5 || STM32H7RS */
1285+
#endif /* STM32H5 || STM32H7RS || STM32N6 */
12561286

12571287
#if defined(STM32WBA)
12581288
#define TAMP_SECRETDEVICE_ERASE_NONE TAMP_DEVICESECRETS_ERASE_NONE
@@ -1264,10 +1294,10 @@ extern "C" {
12641294
#define TAMP_SECRETDEVICE_ERASE_ALL TAMP_DEVICESECRETS_ERASE_ALL
12651295
#endif /* STM32WBA */
12661296

1267-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
1297+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
12681298
#define TAMP_SECRETDEVICE_ERASE_DISABLE TAMP_DEVICESECRETS_ERASE_NONE
12691299
#define TAMP_SECRETDEVICE_ERASE_ENABLE TAMP_SECRETDEVICE_ERASE_ALL
1270-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
1300+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
12711301

12721302
#if defined(STM32F7)
12731303
#define RTC_TAMPCR_TAMPXE RTC_TAMPER_ENABLE_BITS_MASK
@@ -1817,7 +1847,7 @@ extern "C" {
18171847
#define HAL_FMPI2CEx_AnalogFilter_Config HAL_FMPI2CEx_ConfigAnalogFilter
18181848
#define HAL_FMPI2CEx_DigitalFilter_Config HAL_FMPI2CEx_ConfigDigitalFilter
18191849

1820-
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) ((cmd == ENABLE)? \
1850+
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd) == ENABLE)? \
18211851
HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): \
18221852
HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
18231853

@@ -1999,12 +2029,12 @@ extern "C" {
19992029
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose
20002030
* @{
20012031
*/
2002-
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)
2032+
#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS) || defined(STM32N6)
20032033
#define HAL_RTCEx_SetBoothardwareKey HAL_RTCEx_LockBootHardwareKey
20042034
#define HAL_RTCEx_BKUPBlock_Enable HAL_RTCEx_BKUPBlock
20052035
#define HAL_RTCEx_BKUPBlock_Disable HAL_RTCEx_BKUPUnblock
20062036
#define HAL_RTCEx_Erase_SecretDev_Conf HAL_RTCEx_ConfigEraseDeviceSecrets
2007-
#endif /* STM32H5 || STM32WBA || STM32H7RS */
2037+
#endif /* STM32H5 || STM32WBA || STM32H7RS || STM32N6 */
20082038

20092039
/**
20102040
* @}
@@ -2731,6 +2761,12 @@ extern "C" {
27312761
#define __APB1_RELEASE_RESET __HAL_RCC_APB1_RELEASE_RESET
27322762
#define __APB2_FORCE_RESET __HAL_RCC_APB2_FORCE_RESET
27332763
#define __APB2_RELEASE_RESET __HAL_RCC_APB2_RELEASE_RESET
2764+
#if defined(STM32C0)
2765+
#define __HAL_RCC_APB1_FORCE_RESET __HAL_RCC_APB1_GRP1_FORCE_RESET
2766+
#define __HAL_RCC_APB1_RELEASE_RESET __HAL_RCC_APB1_GRP1_RELEASE_RESET
2767+
#define __HAL_RCC_APB2_FORCE_RESET __HAL_RCC_APB1_GRP2_FORCE_RESET
2768+
#define __HAL_RCC_APB2_RELEASE_RESET __HAL_RCC_APB1_GRP2_RELEASE_RESET
2769+
#endif /* STM32C0 */
27342770
#define __BKP_CLK_DISABLE __HAL_RCC_BKP_CLK_DISABLE
27352771
#define __BKP_CLK_ENABLE __HAL_RCC_BKP_CLK_ENABLE
27362772
#define __BKP_FORCE_RESET __HAL_RCC_BKP_FORCE_RESET
@@ -3659,7 +3695,7 @@ extern "C" {
36593695
#endif
36603696

36613697
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3662-
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
3698+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
36633699
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
36643700
#else
36653701
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3910,7 +3946,8 @@ extern "C" {
39103946
*/
39113947
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39123948
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3913-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) || defined (STM32U0)
3949+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || \
3950+
defined (STM32H7RS) || defined (STM32U0) || defined (STM32U3)
39143951
#else
39153952
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
39163953
#endif
@@ -4204,6 +4241,33 @@ extern "C" {
42044241

42054242
#define HAL_PCD_SetTxFiFo HAL_PCDEx_SetTxFiFo
42064243
#define HAL_PCD_SetRxFiFo HAL_PCDEx_SetRxFiFo
4244+
#if defined(STM32U5)
4245+
#define USB_OTG_GOTGCTL_BSESVLD USB_OTG_GOTGCTL_BSVLD
4246+
#define USB_OTG_GAHBCFG_GINT USB_OTG_GAHBCFG_GINTMSK
4247+
#define USB_OTG_GUSBCFG_PHYLPCS USB_OTG_GUSBCFG_PHYLPC
4248+
#define USB_OTG_GRSTCTL_HSRST USB_OTG_GRSTCTL_PSRST
4249+
#define USB_OTG_GINTSTS_BOUTNAKEFF USB_OTG_GINTSTS_GONAKEFF
4250+
#define USB_OTG_GINTSTS_WKUINT USB_OTG_GINTSTS_WKUPINT
4251+
#define USB_OTG_GINTMSK_PXFRM_IISOOXFRM USB_OTG_GINTMSK_IPXFRM_IISOOXFRM
4252+
#define USB_OTG_GRXSTSP_EPNUM USB_OTG_GRXSTSP_EPNUM_CHNUM
4253+
#define USB_OTG_GLPMCFG_L1ResumeOK USB_OTG_GLPMCFG_L1RSMOK
4254+
#define USB_OTG_HPTXFSIZ_PTXFD USB_OTG_HPTXFSIZ_PTXFSIZ
4255+
#define USB_OTG_HCCHAR_MC USB_OTG_HCCHAR_MCNT
4256+
#define USB_OTG_HCCHAR_MC_0 USB_OTG_HCCHAR_MCNT_0
4257+
#define USB_OTG_HCCHAR_MC_1 USB_OTG_HCCHAR_MCNT_1
4258+
#define USB_OTG_HCINTMSK_AHBERR USB_OTG_HCINTMSK_AHBERRM
4259+
#define USB_OTG_HCTSIZ_DOPING USB_OTG_HCTSIZ_DOPNG
4260+
#define USB_OTG_DOEPMSK_OPEM USB_OTG_DOEPMSK_OUTPKTERRM
4261+
#define USB_OTG_DIEPCTL_SODDFRM USB_OTG_DIEPCTL_SD1PID_SODDFRM
4262+
#define USB_OTG_DIEPTSIZ_MULCNT USB_OTG_DIEPTSIZ_MCNT
4263+
#define USB_OTG_DOEPCTL_SODDFRM USB_OTG_DOEPCTL_SD1PID_SODDFRM
4264+
#define USB_OTG_DOEPCTL_DPID USB_OTG_DOEPCTL_DPID_EONUM
4265+
#define USB_OTG_DOEPTSIZ_STUPCNT USB_OTG_DOEPTSIZ_RXDPID
4266+
#define USB_OTG_DOEPTSIZ_STUPCNT_0 USB_OTG_DOEPTSIZ_RXDPID_0
4267+
#define USB_OTG_DOEPTSIZ_STUPCNT_1 USB_OTG_DOEPTSIZ_RXDPID_1
4268+
#define USB_OTG_PCGCCTL_STOPCLK USB_OTG_PCGCCTL_STPPCLK
4269+
#define USB_OTG_PCGCCTL_GATECLK USB_OTG_PCGCCTL_GATEHCLK
4270+
#endif
42074271
/**
42084272
* @}
42094273
*/

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal.h

+6
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,14 @@ typedef enum
5959
* @{
6060
*/
6161
#define REV_ID_Y ((uint32_t)0x1003) /*!< STM32H7 rev.Y */
62+
#define REV_ID_Z ((uint32_t)0x1001) /*!< STM32H7 rev.Z */
63+
#define REV_ID_A ((uint32_t)0x1000) /*!< STM32H7 rev.A */
6264
#define REV_ID_B ((uint32_t)0x2000) /*!< STM32H7 rev.B */
65+
#if (STM32H7_DEV_ID == 0x450UL)
6366
#define REV_ID_X ((uint32_t)0x2001) /*!< STM32H7 rev.X */
67+
#else
68+
#define REV_ID_X ((uint32_t)0x1007) /*!< STM32H7 rev.X */
69+
#endif /* STM32H7_DEV_ID */
6470
#define REV_ID_V ((uint32_t)0x2003) /*!< STM32H7 rev.V */
6571

6672
/**

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_adc.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1962,7 +1962,7 @@ HAL_StatusTypeDef HAL_ADC_Start_DMA(ADC_HandleTypeDef *hadc, uint32_t *pDa
19621962
HAL_StatusTypeDef HAL_ADC_Stop_DMA(ADC_HandleTypeDef *hadc);
19631963

19641964
/* ADC retrieve conversion value intended to be used with polling or interruption */
1965-
uint32_t HAL_ADC_GetValue(ADC_HandleTypeDef *hadc);
1965+
uint32_t HAL_ADC_GetValue(const ADC_HandleTypeDef *hadc);
19661966

19671967
/* ADC IRQHandler and Callbacks used in non-blocking modes (Interruption and DMA) */
19681968
void HAL_ADC_IRQHandler(ADC_HandleTypeDef *hadc);
@@ -1990,8 +1990,8 @@ HAL_StatusTypeDef HAL_ADC_AnalogWDGConfig(ADC_HandleTypeDef *hadc, ADC_Ana
19901990
/** @addtogroup ADC_Exported_Functions_Group4
19911991
* @{
19921992
*/
1993-
uint32_t HAL_ADC_GetState(ADC_HandleTypeDef *hadc);
1994-
uint32_t HAL_ADC_GetError(ADC_HandleTypeDef *hadc);
1993+
uint32_t HAL_ADC_GetState(const ADC_HandleTypeDef *hadc);
1994+
uint32_t HAL_ADC_GetError(const ADC_HandleTypeDef *hadc);
19951995

19961996
/**
19971997
* @}

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_adc_ex.h

+78-4
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,80 @@ typedef struct
10111011
((__CHANNEL__) == ADC_CHANNEL_14) || \
10121012
((__CHANNEL__) == ADC_CHANNEL_15) )
10131013

1014+
/**
1015+
* @brief Helper macro to determine the selected channel corresponding
1016+
* negative input for ADC1.
1017+
* @param __CHANNEL__: programmed ADC channel.
1018+
* @retval return the negative input channels corresponding to the selected channel.
1019+
*/
1020+
#define ADC_CHANNEL_DIFF_NEG_INPUT_ADC1(__CHANNEL__) (((__CHANNEL__) == ADC_CHANNEL_1) ? ADC_CHANNEL_0 : \
1021+
((__CHANNEL__) == ADC_CHANNEL_2) ? ADC_CHANNEL_6 : \
1022+
((__CHANNEL__) == ADC_CHANNEL_3) ? ADC_CHANNEL_7 : \
1023+
((__CHANNEL__) == ADC_CHANNEL_4) ? ADC_CHANNEL_8 : \
1024+
((__CHANNEL__) == ADC_CHANNEL_5) ? ADC_CHANNEL_9 : \
1025+
((__CHANNEL__) == ADC_CHANNEL_10) ? ADC_CHANNEL_11 : \
1026+
((__CHANNEL__) == ADC_CHANNEL_11) ? ADC_CHANNEL_12 : \
1027+
((__CHANNEL__) == ADC_CHANNEL_12) ? ADC_CHANNEL_13 : \
1028+
((__CHANNEL__) == ADC_CHANNEL_16) ? ADC_CHANNEL_17 : \
1029+
((__CHANNEL__) == ADC_CHANNEL_18) ? ADC_CHANNEL_19 : 0UL)
1030+
1031+
/**
1032+
* @brief Helper macro to determine the selected channel corresponding
1033+
* negative input for ADC2.
1034+
* @param __CHANNEL__: programmed ADC channel.
1035+
* @retval return the negative input channels corresponding to the selected channel.
1036+
*/
1037+
#define ADC_CHANNEL_DIFF_NEG_INPUT_ADC2(__CHANNEL__) (((__CHANNEL__) == ADC_CHANNEL_1) ? ADC_CHANNEL_0 : \
1038+
((__CHANNEL__) == ADC_CHANNEL_2) ? ADC_CHANNEL_6 : \
1039+
((__CHANNEL__) == ADC_CHANNEL_3) ? ADC_CHANNEL_7 : \
1040+
((__CHANNEL__) == ADC_CHANNEL_4) ? ADC_CHANNEL_8 : \
1041+
((__CHANNEL__) == ADC_CHANNEL_5) ? ADC_CHANNEL_9 : \
1042+
((__CHANNEL__) == ADC_CHANNEL_10) ? ADC_CHANNEL_11 : \
1043+
((__CHANNEL__) == ADC_CHANNEL_11) ? ADC_CHANNEL_12 : \
1044+
((__CHANNEL__) == ADC_CHANNEL_12) ? ADC_CHANNEL_13 : \
1045+
((__CHANNEL__) == ADC_CHANNEL_18) ? ADC_CHANNEL_19 : 0UL)
1046+
1047+
#if defined(ADC_VER_V5_V90)
1048+
/**
1049+
* @brief Helper macro to determine the selected channel corresponding
1050+
* negative input for ADC3.
1051+
* @param __CHANNEL__: programmed ADC channel.
1052+
* @retval return the negative input channels corresponding to the selected channel.
1053+
*/
1054+
#define ADC_CHANNEL_DIFF_NEG_INPUT_ADC3(__CHANNEL__) (((__CHANNEL__) == ADC_CHANNEL_1) ? ADC_CHANNEL_0 : \
1055+
((__CHANNEL__) == ADC_CHANNEL_2) ? ADC_CHANNEL_6 : \
1056+
((__CHANNEL__) == ADC_CHANNEL_3) ? ADC_CHANNEL_7 : \
1057+
((__CHANNEL__) == ADC_CHANNEL_4) ? ADC_CHANNEL_8 : \
1058+
((__CHANNEL__) == ADC_CHANNEL_5) ? ADC_CHANNEL_9 : \
1059+
((__CHANNEL__) == ADC_CHANNEL_10) ? ADC_CHANNEL_11 : \
1060+
((__CHANNEL__) == ADC_CHANNEL_11) ? ADC_CHANNEL_12 : \
1061+
((__CHANNEL__) == ADC_CHANNEL_13) ? ADC_CHANNEL_14 : \
1062+
((__CHANNEL__) == ADC_CHANNEL_14) ? ADC_CHANNEL_15 : 0UL)
1063+
#endif /* ADC_VER_V5_V90 */
1064+
1065+
#if defined(ADC_VER_V5_V90)
1066+
/**
1067+
* @brief Helper macro to determine the selected channel corresponding
1068+
* negative input on the ADC instance selected.
1069+
* @param __HANDLE__ ADC handle.
1070+
* @param __CHANNEL__ This parameter can be one of the following values:
1071+
* @retval return the negative input channels corresponding to the selected channel.
1072+
*/
1073+
#define ADC_CHANNEL_DIFF_NEG_INPUT(__HANDLE__, __CHANNEL__) ((((__HANDLE__)->Instance) == ADC1) ? ADC_CHANNEL_DIFF_NEG_INPUT_ADC1(__CHANNEL__) : \
1074+
(((__HANDLE__)->Instance) == ADC2) ? ADC_CHANNEL_DIFF_NEG_INPUT_ADC2(__CHANNEL__) : \
1075+
(((__HANDLE__)->Instance) == ADC3) ? ADC_CHANNEL_DIFF_NEG_INPUT_ADC3(__CHANNEL__) : 0UL)
1076+
#else
1077+
/**
1078+
* @brief Helper macro to determine the selected channel corresponding
1079+
* negative input on the ADC instance selected.
1080+
* @param __HANDLE__ ADC handle.
1081+
* @param __CHANNEL__ This parameter can be one of the following values:
1082+
* @retval return the negative input channels corresponding to the selected channel.
1083+
*/
1084+
#define ADC_CHANNEL_DIFF_NEG_INPUT(__HANDLE__, __CHANNEL__) ((((__HANDLE__)->Instance) == ADC1) ? ADC_CHANNEL_DIFF_NEG_INPUT_ADC1(__CHANNEL__) : \
1085+
(((__HANDLE__)->Instance) == ADC2) ? ADC_CHANNEL_DIFF_NEG_INPUT_ADC2(__CHANNEL__) : 0UL)
1086+
#endif /* ADC_VER_V5_V90 */
1087+
10141088
/**
10151089
* @brief Verify the ADC single-ended input or differential mode setting.
10161090
* @param __SING_DIFF__ programmed channel setting.
@@ -1311,7 +1385,7 @@ typedef struct
13111385

13121386
/* ADC calibration */
13131387
HAL_StatusTypeDef HAL_ADCEx_Calibration_Start(ADC_HandleTypeDef *hadc, uint32_t CalibrationMode, uint32_t SingleDiff);
1314-
uint32_t HAL_ADCEx_Calibration_GetValue(ADC_HandleTypeDef *hadc, uint32_t SingleDiff);
1388+
uint32_t HAL_ADCEx_Calibration_GetValue(const ADC_HandleTypeDef *hadc, uint32_t SingleDiff);
13151389
HAL_StatusTypeDef HAL_ADCEx_LinearCalibration_GetValue(ADC_HandleTypeDef *hadc, uint32_t *LinearCalib_Buffer);
13161390
HAL_StatusTypeDef HAL_ADCEx_Calibration_SetValue(ADC_HandleTypeDef *hadc, uint32_t SingleDiff, uint32_t CalibrationFactor);
13171391
HAL_StatusTypeDef HAL_ADCEx_LinearCalibration_SetValue(ADC_HandleTypeDef *hadc, uint32_t *LinearCalib_Buffer);
@@ -1328,12 +1402,12 @@ HAL_StatusTypeDef HAL_ADCEx_InjectedStart_IT(ADC_HandleTypeDef *hadc);
13281402
HAL_StatusTypeDef HAL_ADCEx_InjectedStop_IT(ADC_HandleTypeDef *hadc);
13291403

13301404
/* ADC multimode */
1331-
HAL_StatusTypeDef HAL_ADCEx_MultiModeStart_DMA(ADC_HandleTypeDef *hadc, uint32_t *pData, uint32_t Length);
1405+
HAL_StatusTypeDef HAL_ADCEx_MultiModeStart_DMA(ADC_HandleTypeDef *hadc, const uint32_t *pData, uint32_t Length);
13321406
HAL_StatusTypeDef HAL_ADCEx_MultiModeStop_DMA(ADC_HandleTypeDef *hadc);
1333-
uint32_t HAL_ADCEx_MultiModeGetValue(ADC_HandleTypeDef *hadc);
1407+
uint32_t HAL_ADCEx_MultiModeGetValue(const ADC_HandleTypeDef *hadc);
13341408

13351409
/* ADC retrieve conversion value intended to be used with polling or interruption */
1336-
uint32_t HAL_ADCEx_InjectedGetValue(ADC_HandleTypeDef *hadc, uint32_t InjectedRank);
1410+
uint32_t HAL_ADCEx_InjectedGetValue(const ADC_HandleTypeDef *hadc, uint32_t InjectedRank);
13371411

13381412
/* ADC IRQHandler and Callbacks used in non-blocking modes (Interruption) */
13391413
void HAL_ADCEx_InjectedConvCpltCallback(ADC_HandleTypeDef *hadc);

‎system/Drivers/STM32H7xx_HAL_Driver/Inc/stm32h7xx_hal_comp.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ void HAL_COMP_IRQHandler(COMP_HandleTypeDef *hcomp);
915915
* @{
916916
*/
917917
HAL_StatusTypeDef HAL_COMP_Lock(COMP_HandleTypeDef *hcomp);
918-
uint32_t HAL_COMP_GetOutputLevel(COMP_HandleTypeDef *hcomp);
918+
uint32_t HAL_COMP_GetOutputLevel(const COMP_HandleTypeDef *hcomp);
919919
/* Callback in Interrupt mode */
920920
void HAL_COMP_TriggerCallback(COMP_HandleTypeDef *hcomp);
921921
/**
@@ -926,8 +926,8 @@ void HAL_COMP_TriggerCallback(COMP_HandleTypeDef *hcomp);
926926
/** @addtogroup COMP_Exported_Functions_Group4
927927
* @{
928928
*/
929-
HAL_COMP_StateTypeDef HAL_COMP_GetState(COMP_HandleTypeDef *hcomp);
930-
uint32_t HAL_COMP_GetError(COMP_HandleTypeDef *hcomp);
929+
HAL_COMP_StateTypeDef HAL_COMP_GetState(const COMP_HandleTypeDef *hcomp);
930+
uint32_t HAL_COMP_GetError(const COMP_HandleTypeDef *hcomp);
931931
/**
932932
* @}
933933
*/

0 commit comments

Comments
 (0)