Skip to content

Commit dd7b952

Browse files
fpistmfpistm
committed
system(G4) update STM32G4xx HAL Drivers to v1.2.4
Included in STM32CubeG4 FW v1.6.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent aaa8487 commit dd7b952

File tree

78 files changed

+2201
-840
lines changed

Some content is hidden

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

78 files changed

+2201
-840
lines changed

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

+477-22
Large diffs are not rendered by default.

Diff for: ‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal.h

+2
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,9 @@ void HAL_SYSCFG_DisableIOSwitchBooster(void);
601601
void HAL_SYSCFG_EnableIOSwitchVDD(void);
602602
void HAL_SYSCFG_DisableIOSwitchVDD(void);
603603

604+
#if defined(CCMSRAM_BASE)
604605
void HAL_SYSCFG_CCMSRAM_WriteProtectionEnable(uint32_t Page);
606+
#endif /* CCMSRAM_BASE */
605607

606608
/**
607609
* @}

Diff for: ‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_adc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ out-of-window sample to raise flag or interrupt */
13051305
((__REGTRIG__) == ADC_EXTERNALTRIG_T8_CC1) || \
13061306
((__REGTRIG__) == ADC_EXTERNALTRIG_EXT_IT2))) || \
13071307
((__REGTRIG__) == ADC_SOFTWARE_START) )
1308-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1308+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
13091309
#define IS_ADC_EXTTRIG(__HANDLE__, __REGTRIG__) (((__REGTRIG__) == ADC_EXTERNALTRIG_T1_TRGO) || \
13101310
((__REGTRIG__) == ADC_EXTERNALTRIG_T1_TRGO2) || \
13111311
((__REGTRIG__) == ADC_EXTERNALTRIG_T1_CC1) || \

Diff for: ‎system/Drivers/STM32G4xx_HAL_Driver/Inc/stm32g4xx_hal_adc_ex.h

+7-7
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ typedef struct
631631
: \
632632
RESET \
633633
)
634-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
634+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
635635
#define ADC_IS_INDEPENDENT(__HANDLE__) (RESET)
636636
#endif /* defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx) */
637637

@@ -790,7 +790,7 @@ typedef struct
790790
: \
791791
((__HANDLE_SLAVE__)->Instance = NULL) \
792792
)
793-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
793+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
794794
/**
795795
* @brief Set handle instance of the ADC slave associated to the ADC master.
796796
* @param __HANDLE_MASTER__ ADC master handle.
@@ -816,7 +816,7 @@ typedef struct
816816
#if defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx)
817817
#define ADC_TEMPERATURE_SENSOR_INSTANCE(__HANDLE__) \
818818
((((__HANDLE__)->Instance) == ADC1) || (((__HANDLE__)->Instance) == ADC5))
819-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
819+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
820820
#define ADC_TEMPERATURE_SENSOR_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance) == ADC1)
821821
#endif /* defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx) */
822822

@@ -828,7 +828,7 @@ typedef struct
828828
#if defined(STM32G474xx) || defined(STM32G484xx) || defined(STM32G473xx) || defined(STM32G483xx)
829829
#define ADC_BATTERY_VOLTAGE_INSTANCE(__HANDLE__) \
830830
((((__HANDLE__)->Instance) != ADC2) || (((__HANDLE__)->Instance) != ADC4))
831-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
831+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
832832
#define ADC_BATTERY_VOLTAGE_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance) != ADC2)
833833
#elif defined(STM32G491xx) || defined(STM32G4A1xx)
834834
#define ADC_BATTERY_VOLTAGE_INSTANCE(__HANDLE__) (((__HANDLE__)->Instance) == ADC1)
@@ -947,7 +947,7 @@ typedef struct
947947
((__CHANNEL__) == ADC_CHANNEL_16) || \
948948
((__CHANNEL__) == ADC_CHANNEL_VBAT) || \
949949
((__CHANNEL__) == ADC_CHANNEL_VREFINT))))
950-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
950+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
951951
#define IS_ADC_CHANNEL(__HANDLE__, __CHANNEL__) ( ( ((__CHANNEL__) == ADC_CHANNEL_0) || \
952952
((__CHANNEL__) == ADC_CHANNEL_1) || \
953953
((__CHANNEL__) == ADC_CHANNEL_2) || \
@@ -1069,7 +1069,7 @@ typedef struct
10691069
((__CHANNEL__) == ADC_CHANNEL_13))) || \
10701070
((((__HANDLE__)->Instance) == ADC3) && \
10711071
((__CHANNEL__) == ADC_CHANNEL_15))) )
1072-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1072+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
10731073
#define IS_ADC_DIFF_CHANNEL(__HANDLE__, __CHANNEL__) ( ( ((__CHANNEL__) == ADC_CHANNEL_1) || \
10741074
((__CHANNEL__) == ADC_CHANNEL_2) || \
10751075
((__CHANNEL__) == ADC_CHANNEL_3) || \
@@ -1239,7 +1239,7 @@ typedef struct
12391239
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T8_CC2) || \
12401240
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_EXT_IT3))) || \
12411241
((__INJTRIG__) == ADC_INJECTED_SOFTWARE_START) )
1242-
#elif defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1242+
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
12431243
#define IS_ADC_EXTTRIGINJEC(__HANDLE__, __INJTRIG__) (((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_TRGO) || \
12441244
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_TRGO2) || \
12451245
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_CC4) || \

0 commit comments

Comments
 (0)