Skip to content

Commit c43d779

Browse files
fpistmfpistm
authored
Merge pull request #2540 from fpistm/stm32cubeG4_update
chore(g4): update to latest STM32CubeG4 v1.6.1
2 parents 417cb4f + e11bbcd commit c43d779

File tree

75 files changed

+28798
-3902
lines changed

Some content is hidden

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

75 files changed

+28798
-3902
lines changed

Diff for: ‎cores/arduino/stm32/stm32_def_build.h

+4
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,10 @@
202202
#define CMSIS_STARTUP_FILE "startup_stm32g0b1xx.s"
203203
#elif defined(STM32G0C1xx)
204204
#define CMSIS_STARTUP_FILE "startup_stm32g0c1xx.s"
205+
#elif defined(STM32G411xB)
206+
#define CMSIS_STARTUP_FILE "startup_stm32g411xb.s"
207+
#elif defined(STM32G411xC)
208+
#define CMSIS_STARTUP_FILE "startup_stm32g411xc.s"
205209
#elif defined(STM32G414xx)
206210
#define CMSIS_STARTUP_FILE "startup_stm32g414xx.s"
207211
#elif defined(STM32G431xx)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g411xb.h

+11,550
Large diffs are not rendered by default.

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g411xc.h

+11,823
Large diffs are not rendered by default.

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g414xx.h

+23-12
Original file line numberDiff line numberDiff line change
@@ -988,18 +988,18 @@ typedef struct {
988988

989989
#define FLASH_BASE (0x08000000UL) /*!< FLASH (up to 256 kB) base address */
990990
#define SRAM1_BASE (0x20000000UL) /*!< SRAM1(up to 40 KB) base address */
991-
#define CCMSRAM_BASE (0x10000000UL) /*!< CCMSRAM(16 KB) base address */
991+
#define CCMSRAM_BASE (0x10000000UL) /*!< CCMSRAM(20 KB) base address */
992992
#define PERIPH_BASE (0x40000000UL) /*!< Peripheral base address */
993993

994994
#define SRAM1_BB_BASE (0x22000000UL) /*!< SRAM1(40 KB) base address in the bit-band region */
995-
#define CCMSRAM_BB_BASE (0x22300000UL) /*!< CCMSRAM(16 KB) base address in the bit-band region */
995+
#define CCMSRAM_BB_BASE (0x22300000UL) /*!< CCMSRAM(20 KB) base address in the bit-band region */
996996
#define PERIPH_BB_BASE (0x42000000UL) /*!< Peripheral base address in the bit-band region */
997997
/* Legacy defines */
998998
#define SRAM_BASE SRAM1_BASE
999999
#define SRAM_BB_BASE SRAM1_BB_BASE
10001000

10011001
#define SRAM1_SIZE_MAX (0x0000A000UL) /*!< maximum SRAM1 size (up to 40 KBytes) */
1002-
#define CCMSRAM_SIZE (0x00004000UL) /*!< CCMSRAM size (16 KBytes) */
1002+
#define CCMSRAM_SIZE (0x00005000UL) /*!< CCMSRAM size (20 KBytes) */
10031003

10041004
/*!< Peripheral memory map */
10051005
#define APB1PERIPH_BASE PERIPH_BASE
@@ -12720,15 +12720,15 @@ typedef struct {
1272012720
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
1272112721
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
1272212722
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
12723-
#define TAMP_CR2_TAMP1MF_Pos (16U)
12724-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
12725-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
12726-
#define TAMP_CR2_TAMP2MF_Pos (17U)
12727-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
12728-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
12729-
#define TAMP_CR2_TAMP3MF_Pos (18U)
12730-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
12731-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
12723+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
12724+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
12725+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
12726+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
12727+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
12728+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
12729+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
12730+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
12731+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
1273212732
#define TAMP_CR2_TAMP1TRG_Pos (24U)
1273312733
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
1273412734
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -12739,6 +12739,17 @@ typedef struct {
1273912739
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
1274012740
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
1274112741

12742+
/* Legacy aliases */
12743+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
12744+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
12745+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
12746+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
12747+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
12748+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
12749+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
12750+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
12751+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
12752+
1274212753
/******************** Bits definition for TAMP_FLTCR register ***************/
1274312754
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
1274412755
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g431xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -8831,15 +8831,15 @@ typedef struct
88318831
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
88328832
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
88338833
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
8834-
#define TAMP_CR2_TAMP1MF_Pos (16U)
8835-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
8836-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
8837-
#define TAMP_CR2_TAMP2MF_Pos (17U)
8838-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
8839-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
8840-
#define TAMP_CR2_TAMP3MF_Pos (18U)
8841-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
8842-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
8834+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
8835+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
8836+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
8837+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
8838+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
8839+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
8840+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
8841+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
8842+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
88438843
#define TAMP_CR2_TAMP1TRG_Pos (24U)
88448844
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
88458845
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -8850,6 +8850,17 @@ typedef struct
88508850
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
88518851
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
88528852

8853+
/* Legacy aliases */
8854+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
8855+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
8856+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
8857+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
8858+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
8859+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
8860+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
8861+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
8862+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
8863+
88538864
/******************** Bits definition for TAMP_FLTCR register ***************/
88548865
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
88558866
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g441xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -9061,15 +9061,15 @@ typedef struct
90619061
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
90629062
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
90639063
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
9064-
#define TAMP_CR2_TAMP1MF_Pos (16U)
9065-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
9066-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
9067-
#define TAMP_CR2_TAMP2MF_Pos (17U)
9068-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
9069-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
9070-
#define TAMP_CR2_TAMP3MF_Pos (18U)
9071-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
9072-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
9064+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
9065+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
9066+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
9067+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
9068+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
9069+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
9070+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
9071+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
9072+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
90739073
#define TAMP_CR2_TAMP1TRG_Pos (24U)
90749074
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
90759075
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -9080,6 +9080,17 @@ typedef struct
90809080
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
90819081
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
90829082

9083+
/* Legacy aliases */
9084+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
9085+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
9086+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
9087+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
9088+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
9089+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
9090+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
9091+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
9092+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
9093+
90839094
/******************** Bits definition for TAMP_FLTCR register ***************/
90849095
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
90859096
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g471xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -9415,15 +9415,15 @@ typedef struct
94159415
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
94169416
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
94179417
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
9418-
#define TAMP_CR2_TAMP1MF_Pos (16U)
9419-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
9420-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
9421-
#define TAMP_CR2_TAMP2MF_Pos (17U)
9422-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
9423-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
9424-
#define TAMP_CR2_TAMP3MF_Pos (18U)
9425-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
9426-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
9418+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
9419+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
9420+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
9421+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
9422+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
9423+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
9424+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
9425+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
9426+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
94279427
#define TAMP_CR2_TAMP1TRG_Pos (24U)
94289428
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
94299429
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -9434,6 +9434,17 @@ typedef struct
94349434
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
94359435
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
94369436

9437+
/* Legacy aliases */
9438+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
9439+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
9440+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
9441+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
9442+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
9443+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
9444+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
9445+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
9446+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
9447+
94379448
/******************** Bits definition for TAMP_FLTCR register ***************/
94389449
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
94399450
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g473xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -9965,15 +9965,15 @@ typedef struct
99659965
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
99669966
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
99679967
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
9968-
#define TAMP_CR2_TAMP1MF_Pos (16U)
9969-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
9970-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
9971-
#define TAMP_CR2_TAMP2MF_Pos (17U)
9972-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
9973-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
9974-
#define TAMP_CR2_TAMP3MF_Pos (18U)
9975-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
9976-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
9968+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
9969+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
9970+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
9971+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
9972+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
9973+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
9974+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
9975+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
9976+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
99779977
#define TAMP_CR2_TAMP1TRG_Pos (24U)
99789978
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
99799979
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -9984,6 +9984,17 @@ typedef struct
99849984
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
99859985
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
99869986

9987+
/* Legacy aliases */
9988+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
9989+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
9990+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
9991+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
9992+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
9993+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
9994+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
9995+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
9996+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
9997+
99879998
/******************** Bits definition for TAMP_FLTCR register ***************/
99889999
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
998910000
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g474xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -13544,15 +13544,15 @@ typedef struct {
1354413544
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
1354513545
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
1354613546
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
13547-
#define TAMP_CR2_TAMP1MF_Pos (16U)
13548-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
13549-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
13550-
#define TAMP_CR2_TAMP2MF_Pos (17U)
13551-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
13552-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
13553-
#define TAMP_CR2_TAMP3MF_Pos (18U)
13554-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
13555-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
13547+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
13548+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
13549+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
13550+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
13551+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
13552+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
13553+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
13554+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
13555+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
1355613556
#define TAMP_CR2_TAMP1TRG_Pos (24U)
1355713557
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
1355813558
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -13563,6 +13563,17 @@ typedef struct {
1356313563
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
1356413564
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
1356513565

13566+
/* Legacy aliases */
13567+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
13568+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
13569+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
13570+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
13571+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
13572+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
13573+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
13574+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
13575+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
13576+
1356613577
/******************** Bits definition for TAMP_FLTCR register ***************/
1356713578
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
1356813579
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

Diff for: ‎system/Drivers/CMSIS/Device/ST/STM32G4xx/Include/stm32g483xx.h

+20-9
Original file line numberDiff line numberDiff line change
@@ -10195,15 +10195,15 @@ typedef struct
1019510195
#define TAMP_CR2_TAMP3NOERASE_Pos (2U)
1019610196
#define TAMP_CR2_TAMP3NOERASE_Msk (0x1UL << TAMP_CR2_TAMP3NOERASE_Pos) /*!< 0x00000004 */
1019710197
#define TAMP_CR2_TAMP3NOERASE TAMP_CR2_TAMP3NOERASE_Msk
10198-
#define TAMP_CR2_TAMP1MF_Pos (16U)
10199-
#define TAMP_CR2_TAMP1MF_Msk (0x1UL << TAMP_CR2_TAMP1MF_Pos) /*!< 0x00010000 */
10200-
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MF_Msk
10201-
#define TAMP_CR2_TAMP2MF_Pos (17U)
10202-
#define TAMP_CR2_TAMP2MF_Msk (0x1UL << TAMP_CR2_TAMP2MF_Pos) /*!< 0x00020000 */
10203-
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MF_Msk
10204-
#define TAMP_CR2_TAMP3MF_Pos (18U)
10205-
#define TAMP_CR2_TAMP3MF_Msk (0x1UL << TAMP_CR2_TAMP3MF_Pos) /*!< 0x00040000 */
10206-
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MF_Msk
10198+
#define TAMP_CR2_TAMP1MSK_Pos (16U)
10199+
#define TAMP_CR2_TAMP1MSK_Msk (0x1UL << TAMP_CR2_TAMP1MSK_Pos) /*!< 0x00010000 */
10200+
#define TAMP_CR2_TAMP1MSK TAMP_CR2_TAMP1MSK_Msk
10201+
#define TAMP_CR2_TAMP2MSK_Pos (17U)
10202+
#define TAMP_CR2_TAMP2MSK_Msk (0x1UL << TAMP_CR2_TAMP2MSK_Pos) /*!< 0x00020000 */
10203+
#define TAMP_CR2_TAMP2MSK TAMP_CR2_TAMP2MSK_Msk
10204+
#define TAMP_CR2_TAMP3MSK_Pos (18U)
10205+
#define TAMP_CR2_TAMP3MSK_Msk (0x1UL << TAMP_CR2_TAMP3MSK_Pos) /*!< 0x00040000 */
10206+
#define TAMP_CR2_TAMP3MSK TAMP_CR2_TAMP3MSK_Msk
1020710207
#define TAMP_CR2_TAMP1TRG_Pos (24U)
1020810208
#define TAMP_CR2_TAMP1TRG_Msk (0x1UL << TAMP_CR2_TAMP1TRG_Pos) /*!< 0x01000000 */
1020910209
#define TAMP_CR2_TAMP1TRG TAMP_CR2_TAMP1TRG_Msk
@@ -10214,6 +10214,17 @@ typedef struct
1021410214
#define TAMP_CR2_TAMP3TRG_Msk (0x1UL << TAMP_CR2_TAMP3TRG_Pos) /*!< 0x04000000 */
1021510215
#define TAMP_CR2_TAMP3TRG TAMP_CR2_TAMP3TRG_Msk
1021610216

10217+
/* Legacy aliases */
10218+
#define TAMP_CR2_TAMP1MF_Pos TAMP_CR2_TAMP1MSK_Pos
10219+
#define TAMP_CR2_TAMP1MF_Msk TAMP_CR2_TAMP1MSK_Msk
10220+
#define TAMP_CR2_TAMP1MF TAMP_CR2_TAMP1MSK
10221+
#define TAMP_CR2_TAMP2MF_Pos TAMP_CR2_TAMP2MSK_Pos
10222+
#define TAMP_CR2_TAMP2MF_Msk TAMP_CR2_TAMP2MSK_Msk
10223+
#define TAMP_CR2_TAMP2MF TAMP_CR2_TAMP2MSK
10224+
#define TAMP_CR2_TAMP3MF_Pos TAMP_CR2_TAMP3MSK_Pos
10225+
#define TAMP_CR2_TAMP3MF_Msk TAMP_CR2_TAMP3MSK_Msk
10226+
#define TAMP_CR2_TAMP3MF TAMP_CR2_TAMP3MSK
10227+
1021710228
/******************** Bits definition for TAMP_FLTCR register ***************/
1021810229
#define TAMP_FLTCR_TAMPFREQ_0 (0x00000001UL)
1021910230
#define TAMP_FLTCR_TAMPFREQ_1 (0x00000002UL)

0 commit comments

Comments
 (0)