Skip to content

Commit 1fb6ce3

Browse files
gautierg-stgautierg-st
committed
stm32cube: update stm32g4 to cube version V1.6.1
Update Cube version for STM32G4xx series on https://github.com/STMicroelectronics from version v1.6.0 to version v1.6.1 Signed-off-by: Guillaume Gautier <[email protected]>
1 parent d5fb525 commit 1fb6ce3

Some content is hidden

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

64 files changed

+27556
-3683
lines changed

‎stm32cube/stm32g4xx/README‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Origin:
66
http://www.st.com/en/embedded-software/stm32cubeg4.html
77

88
Status:
9-
version v1.6.0
9+
version v1.6.1
1010

1111
Purpose:
1212
ST Microelectronics official MCU package for STM32G4 series.
@@ -23,7 +23,7 @@ URL:
2323
https://github.com/STMicroelectronics/STM32CubeG4
2424

2525
Commit:
26-
98f52ec7cdbbbfe1650b351bde2efb037815886d
26+
1e6984e6cdeb9e5c01f5badbfd18e5cf4345d02f
2727

2828
Maintained-by:
2929
External
@@ -44,4 +44,8 @@ Patch List:
4444
-Added stm32cube/stm32g4xx/drivers/include/stm32_assert.h
4545
-Removed unused stm32cube/stm32g4xx/drivers/include/stm32_assert_template.h
4646

47+
*Fix to remove PAGESIZE definition which conflicts with POSIX
48+
Impacted files:
49+
drivers/include/Legacy/stm32_hal_legacy.h
50+
4751
See release_note.html from STM32Cube

‎stm32cube/stm32g4xx/drivers/include/Legacy/stm32_hal_legacy.h‎

Lines changed: 18 additions & 3 deletions
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-
/* #define PAGESIZE FLASH_PAGE_SIZE */
475+
#if !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32H7)
476+
/* define PAGESIZE FLASH_PAGE_SIZE */
477+
#endif /* STM32F2 && STM32F4 && STM32F7 && STM32H7 */
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
@@ -875,6 +886,10 @@ extern "C" {
875886
#define __HAL_HRTIM_SetCompare __HAL_HRTIM_SETCOMPARE
876887
#define __HAL_HRTIM_GetCompare __HAL_HRTIM_GETCOMPARE
877888

889+
#if defined(STM32F3) || defined(STM32G4) || defined(STM32H7)
890+
#define HRTIMInterruptResquests HRTIMInterruptRequests
891+
#endif /* STM32F3 || STM32G4 || STM32H7 */
892+
878893
#if defined(STM32G4)
879894
#define HAL_HRTIM_ExternalEventCounterConfig HAL_HRTIM_ExtEventCounterConfig
880895
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
@@ -1012,8 +1027,8 @@ extern "C" {
10121027
#define HRTIM_CALIBRATIONRATE_910 (HRTIM_DLLCR_CALRTE_0)
10131028
#define HRTIM_CALIBRATIONRATE_114 (HRTIM_DLLCR_CALRTE_1)
10141029
#define HRTIM_CALIBRATIONRATE_14 (HRTIM_DLLCR_CALRTE_1 | HRTIM_DLLCR_CALRTE_0)
1015-
10161030
#endif /* STM32F3 */
1031+
10171032
/**
10181033
* @}
10191034
*/
@@ -3680,7 +3695,7 @@ extern "C" {
36803695
#endif
36813696

36823697
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3683-
defined(STM32WL) || defined(STM32C0) || defined(STM32U0)
3698+
defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)
36843699
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
36853700
#else
36863701
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK

‎stm32cube/stm32g4xx/drivers/include/stm32g4xx_hal.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,13 @@ extern "C" {
460460
((__CONFIG__) == SYSCFG_BREAK_SRAMPARITY) || \
461461
((__CONFIG__) == SYSCFG_BREAK_LOCKUP))
462462

463-
#if (CCMSRAM_SIZE == 0x00008000UL) || (CCMSRAM_SIZE == 0x00004000UL)
463+
#if (CCMSRAM_SIZE == 0x00008000UL) /* STM32G4 devices with CCMSRAM_SIZE = 32 Kbytes */
464464
#define IS_SYSCFG_CCMSRAMWRP_PAGE(__PAGE__) ((__PAGE__) > 0U)
465-
#elif (CCMSRAM_SIZE == 0x00002800UL)
465+
#elif (CCMSRAM_SIZE == 0x00005000UL) /* STM32G4 devices with CCMSRAM_SIZE = 20 Kbytes */
466+
#define IS_SYSCFG_CCMSRAMWRP_PAGE(__PAGE__) (((__PAGE__) > 0U) && ((__PAGE__) <= 0x000FFFFFU))
467+
#elif (CCMSRAM_SIZE == 0x00004000UL) /* STM32G4 devices with CCMSRAM_SIZE = 16 Kbytes */
468+
#define IS_SYSCFG_CCMSRAMWRP_PAGE(__PAGE__) (((__PAGE__) > 0U) && ((__PAGE__) <= 0x0000FFFFU))
469+
#elif (CCMSRAM_SIZE == 0x00002800UL) /* STM32G4 devices with CCMSRAM_SIZE = 10 Kbytes */
466470
#define IS_SYSCFG_CCMSRAMWRP_PAGE(__PAGE__) (((__PAGE__) > 0U) && ((__PAGE__) <= 0x000003FFU))
467471
#endif /* CCMSRAM_SIZE */
468472

@@ -600,10 +604,7 @@ void HAL_SYSCFG_EnableIOSwitchBooster(void);
600604
void HAL_SYSCFG_DisableIOSwitchBooster(void);
601605
void HAL_SYSCFG_EnableIOSwitchVDD(void);
602606
void HAL_SYSCFG_DisableIOSwitchVDD(void);
603-
604-
#if defined(CCMSRAM_BASE)
605607
void HAL_SYSCFG_CCMSRAM_WriteProtectionEnable(uint32_t Page);
606-
#endif /* CCMSRAM_BASE */
607608

608609
/**
609610
* @}

‎stm32cube/stm32g4xx/drivers/include/stm32g4xx_hal_adc.h‎

Lines changed: 2 additions & 2 deletions
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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1308+
#elif defined(STM32G411xB) || 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) || \
@@ -1325,7 +1325,7 @@ out-of-window sample to raise flag or interrupt */
13251325
((__REGTRIG__) == ADC_EXTERNALTRIG_LPTIM_OUT) || \
13261326
((__REGTRIG__) == ADC_EXTERNALTRIG_EXT_IT11) || \
13271327
((__REGTRIG__) == ADC_SOFTWARE_START) )
1328-
#elif defined(STM32G491xx) || defined(STM32G4A1xx)
1328+
#elif defined(STM32G491xx) || defined(STM32G4A1xx) || defined(STM32G411xC)
13291329
#define IS_ADC_EXTTRIG(__HANDLE__, __REGTRIG__) (((__REGTRIG__) == ADC_EXTERNALTRIG_T1_TRGO) || \
13301330
((__REGTRIG__) == ADC_EXTERNALTRIG_T1_TRGO2) || \
13311331
((__REGTRIG__) == ADC_EXTERNALTRIG_T1_CC3) || \

‎stm32cube/stm32g4xx/drivers/include/stm32g4xx_hal_adc_ex.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -623,15 +623,15 @@ typedef struct
623623
: \
624624
RESET \
625625
)
626-
#elif defined(STM32G491xx) || defined(STM32G4A1xx)
626+
#elif defined(STM32G491xx) || defined(STM32G4A1xx) || defined(STM32G411xC)
627627
#define ADC_IS_INDEPENDENT(__HANDLE__) \
628628
( ( ( ((__HANDLE__)->Instance) == ADC3) \
629629
)? \
630630
SET \
631631
: \
632632
RESET \
633633
)
634-
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
634+
#elif defined(STM32G411xB) || 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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
793+
#elif defined(STM32G411xB) || defined(STM32G411xC) || 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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
819+
#elif defined(STM32G411xB) || defined(STM32G411xC) || 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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx) || defined(STM32G471xx)
831+
#elif defined(STM32G411xB) || defined(STM32G411xC) || 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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
950+
#elif defined(STM32G411xB) || defined(STM32G411xC) || 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) || \
@@ -1051,7 +1051,7 @@ typedef struct
10511051
(((__CHANNEL__) == ADC_CHANNEL_12) || \
10521052
((__CHANNEL__) == ADC_CHANNEL_13) || \
10531053
((__CHANNEL__) == ADC_CHANNEL_15))) )
1054-
#elif defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx)
1054+
#elif defined(STM32G471xx) || defined(STM32G491xx) || defined(STM32G4A1xx) || defined(STM32G411xC)
10551055
#define IS_ADC_DIFF_CHANNEL(__HANDLE__, __CHANNEL__) ( ( ((__CHANNEL__) == ADC_CHANNEL_1) || \
10561056
(((__CHANNEL__) == ADC_CHANNEL_2) || \
10571057
((__CHANNEL__) == ADC_CHANNEL_3) || \
@@ -1069,7 +1069,7 @@ typedef struct
10691069
((__CHANNEL__) == ADC_CHANNEL_13))) || \
10701070
((((__HANDLE__)->Instance) == ADC3) && \
10711071
((__CHANNEL__) == ADC_CHANNEL_15))) )
1072-
#elif defined(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1072+
#elif defined(STM32G411xB) || 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(STM32G414xx) || defined(STM32GBK1CB) || defined(STM32G431xx) || defined(STM32G441xx)
1242+
#elif defined(STM32G411xB) || 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) || \
@@ -1260,7 +1260,7 @@ typedef struct
12601260
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_EXT_IT15) || \
12611261
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_LPTIM_OUT) || \
12621262
((__INJTRIG__) == ADC_INJECTED_SOFTWARE_START) )
1263-
#elif defined(STM32G491xx) || defined(STM32G4A1xx)
1263+
#elif defined(STM32G491xx) || defined(STM32G4A1xx) || defined(STM32G411xC)
12641264
#define IS_ADC_EXTTRIGINJEC(__HANDLE__, __INJTRIG__) (((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_TRGO) || \
12651265
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_TRGO2) || \
12661266
((__INJTRIG__) == ADC_EXTERNALTRIGINJEC_T1_CC4) || \

0 commit comments

Comments
 (0)