Skip to content

Commit 14bbe2f

Browse files
authored
Merge pull request #1461 from fpistm/UpdateF3
Update STM32F3 HAL and CMSIS drivers
2 parents 2026146 + 560b804 commit 14bbe2f

File tree

102 files changed

+4424
-2781
lines changed

Some content is hidden

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

102 files changed

+4424
-2781
lines changed

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f301x8.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,15 @@ typedef struct
720720
* @{
721721
*/
722722

723+
/** @addtogroup Hardware_Constant_Definition
724+
* @{
725+
*/
726+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
727+
728+
/**
729+
* @}
730+
*/
731+
723732
/** @addtogroup Peripheral_Registers_Bits_Definition
724733
* @{
725734
*/
@@ -8566,8 +8575,8 @@ typedef struct
85668575
/* Aliases for __IRQn */
85678576
#define ADC1_2_IRQn ADC1_IRQn
85688577
#define COMP1_2_IRQn COMP2_IRQn
8569-
#define COMP1_2_3_IRQn COMP2_IRQn
85708578
#define COMP_IRQn COMP2_IRQn
8579+
#define COMP1_2_3_IRQn COMP2_IRQn
85718580
#define COMP4_5_6_IRQn COMP4_6_IRQn
85728581
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
85738582
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -8581,8 +8590,8 @@ typedef struct
85818590
/* Aliases for __IRQHandler */
85828591
#define ADC1_2_IRQHandler ADC1_IRQHandler
85838592
#define COMP1_2_IRQHandler COMP2_IRQHandler
8584-
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
85858593
#define COMP_IRQHandler COMP2_IRQHandler
8594+
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
85868595
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
85878596
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
85888597
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302x8.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -829,6 +829,15 @@ typedef struct
829829
* @{
830830
*/
831831

832+
/** @addtogroup Hardware_Constant_Definition
833+
* @{
834+
*/
835+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
836+
837+
/**
838+
* @}
839+
*/
840+
832841
/** @addtogroup Peripheral_Registers_Bits_Definition
833842
* @{
834843
*/
@@ -12331,8 +12340,8 @@ typedef struct
1233112340
/* Aliases for __IRQn */
1233212341
#define ADC1_2_IRQn ADC1_IRQn
1233312342
#define COMP1_2_3_IRQn COMP2_IRQn
12334-
#define COMP1_2_IRQn COMP2_IRQn
1233512343
#define COMP_IRQn COMP2_IRQn
12344+
#define COMP1_2_IRQn COMP2_IRQn
1233612345
#define COMP4_5_6_IRQn COMP4_6_IRQn
1233712346
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
1233812347
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -12350,8 +12359,8 @@ typedef struct
1235012359
/* Aliases for __IRQHandler */
1235112360
#define ADC1_2_IRQHandler ADC1_IRQHandler
1235212361
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
12353-
#define COMP1_2_IRQHandler COMP2_IRQHandler
1235412362
#define COMP_IRQHandler COMP2_IRQHandler
12363+
#define COMP1_2_IRQHandler COMP2_IRQHandler
1235512364
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1235612365
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
1235712366
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302xc.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,15 @@ typedef struct
864864
* @{
865865
*/
866866

867+
/** @addtogroup Hardware_Constant_Definition
868+
* @{
869+
*/
870+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
871+
872+
/**
873+
* @}
874+
*/
875+
867876
/** @addtogroup Peripheral_Registers_Bits_Definition
868877
* @{
869878
*/
@@ -12677,9 +12686,9 @@ typedef struct
1267712686

1267812687
/* Aliases for __IRQn */
1267912688
#define ADC1_IRQn ADC1_2_IRQn
12680-
#define COMP2_IRQn COMP1_2_IRQn
1268112689
#define COMP_IRQn COMP1_2_IRQn
1268212690
#define COMP1_2_3_IRQn COMP1_2_IRQn
12691+
#define COMP2_IRQn COMP1_2_IRQn
1268312692
#define COMP4_5_6_IRQn COMP4_6_IRQn
1268412693
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
1268512694
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
@@ -12694,9 +12703,9 @@ typedef struct
1269412703

1269512704
/* Aliases for __IRQHandler */
1269612705
#define ADC1_IRQHandler ADC1_2_IRQHandler
12697-
#define COMP2_IRQHandler COMP1_2_IRQHandler
1269812706
#define COMP_IRQHandler COMP1_2_IRQHandler
1269912707
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
12708+
#define COMP2_IRQHandler COMP1_2_IRQHandler
1270012709
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1270112710
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
1270212711
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302xe.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,15 @@ typedef struct
955955
* @{
956956
*/
957957

958+
/** @addtogroup Hardware_Constant_Definition
959+
* @{
960+
*/
961+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
962+
963+
/**
964+
* @}
965+
*/
966+
958967
/** @addtogroup Peripheral_Registers_Bits_Definition
959968
* @{
960969
*/
@@ -14417,8 +14426,8 @@ typedef struct
1441714426

1441814427
/* Aliases for __IRQn */
1441914428
#define ADC1_IRQn ADC1_2_IRQn
14420-
#define COMP1_2_3_IRQn COMP1_2_IRQn
1442114429
#define COMP_IRQn COMP1_2_IRQn
14430+
#define COMP1_2_3_IRQn COMP1_2_IRQn
1442214431
#define COMP2_IRQn COMP1_2_IRQn
1442314432
#define COMP4_5_6_IRQn COMP4_6_IRQn
1442414433
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
@@ -14436,8 +14445,8 @@ typedef struct
1443614445

1443714446
/* Aliases for __IRQHandler */
1443814447
#define ADC1_IRQHandler ADC1_2_IRQHandler
14439-
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
1444014448
#define COMP_IRQHandler COMP1_2_IRQHandler
14449+
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
1444114450
#define COMP2_IRQHandler COMP1_2_IRQHandler
1444214451
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1444314452
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303x8.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,15 @@ typedef struct
781781
* @{
782782
*/
783783

784+
/** @addtogroup Hardware_Constant_Definition
785+
* @{
786+
*/
787+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
788+
789+
/**
790+
* @}
791+
*/
792+
784793
/** @addtogroup Peripheral_Registers_Bits_Definition
785794
* @{
786795
*/
@@ -12092,8 +12101,8 @@ typedef struct
1209212101
#define ADC1_IRQn ADC1_2_IRQn
1209312102
#define USB_LP_CAN_RX0_IRQn CAN_RX0_IRQn
1209412103
#define USB_HP_CAN_TX_IRQn CAN_TX_IRQn
12095-
#define COMP_IRQn COMP2_IRQn
1209612104
#define COMP1_2_IRQn COMP2_IRQn
12105+
#define COMP_IRQn COMP2_IRQn
1209712106
#define COMP1_2_3_IRQn COMP2_IRQn
1209812107
#define COMP4_5_6_IRQn COMP4_6_IRQn
1209912108
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
@@ -12108,8 +12117,8 @@ typedef struct
1210812117
#define ADC1_IRQHandler ADC1_2_IRQHandler
1210912118
#define USB_LP_CAN_RX0_IRQHandler CAN_RX0_IRQHandler
1211012119
#define USB_HP_CAN_TX_IRQHandler CAN_TX_IRQHandler
12111-
#define COMP_IRQHandler COMP2_IRQHandler
1211212120
#define COMP1_2_IRQHandler COMP2_IRQHandler
12121+
#define COMP_IRQHandler COMP2_IRQHandler
1211312122
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
1211412123
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1211512124
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xc.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -896,6 +896,15 @@ typedef struct
896896
* @{
897897
*/
898898

899+
/** @addtogroup Hardware_Constant_Definition
900+
* @{
901+
*/
902+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
903+
904+
/**
905+
* @}
906+
*/
907+
899908
/** @addtogroup Peripheral_Registers_Bits_Definition
900909
* @{
901910
*/

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xe.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,6 +1007,15 @@ typedef struct
10071007
* @{
10081008
*/
10091009

1010+
/** @addtogroup Hardware_Constant_Definition
1011+
* @{
1012+
*/
1013+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
1014+
1015+
/**
1016+
* @}
1017+
*/
1018+
10101019
/** @addtogroup Peripheral_Registers_Bits_Definition
10111020
* @{
10121021
*/

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f318xx.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -721,6 +721,15 @@ typedef struct
721721
* @{
722722
*/
723723

724+
/** @addtogroup Hardware_Constant_Definition
725+
* @{
726+
*/
727+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
728+
729+
/**
730+
* @}
731+
*/
732+
724733
/** @addtogroup Peripheral_Registers_Bits_Definition
725734
* @{
726735
*/
@@ -8553,8 +8562,8 @@ typedef struct
85538562
/* Aliases for __IRQn */
85548563
#define ADC1_2_IRQn ADC1_IRQn
85558564
#define COMP_IRQn COMP2_IRQn
8556-
#define COMP1_2_IRQn COMP2_IRQn
85578565
#define COMP1_2_3_IRQn COMP2_IRQn
8566+
#define COMP1_2_IRQn COMP2_IRQn
85588567
#define COMP4_5_6_IRQn COMP4_6_IRQn
85598568
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
85608569
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -8568,8 +8577,8 @@ typedef struct
85688577
/* Aliases for __IRQHandler */
85698578
#define ADC1_2_IRQHandler ADC1_IRQHandler
85708579
#define COMP_IRQHandler COMP2_IRQHandler
8571-
#define COMP1_2_IRQHandler COMP2_IRQHandler
85728580
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
8581+
#define COMP1_2_IRQHandler COMP2_IRQHandler
85738582
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
85748583
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
85758584
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f328xx.h

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,15 @@ typedef struct
780780
* @{
781781
*/
782782

783+
/** @addtogroup Hardware_Constant_Definition
784+
* @{
785+
*/
786+
#define LSI_STARTUP_TIME 85U /*!< LSI Maximum startup time in us */
787+
788+
/**
789+
* @}
790+
*/
791+
783792
/** @addtogroup Peripheral_Registers_Bits_Definition
784793
* @{
785794
*/
@@ -12062,9 +12071,9 @@ typedef struct
1206212071
#define ADC1_IRQn ADC1_2_IRQn
1206312072
#define USB_LP_CAN_RX0_IRQn CAN_RX0_IRQn
1206412073
#define USB_HP_CAN_TX_IRQn CAN_TX_IRQn
12074+
#define COMP1_2_IRQn COMP2_IRQn
1206512075
#define COMP_IRQn COMP2_IRQn
1206612076
#define COMP1_2_3_IRQn COMP2_IRQn
12067-
#define COMP1_2_IRQn COMP2_IRQn
1206812077
#define COMP4_5_6_IRQn COMP4_6_IRQn
1206912078
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
1207012079
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
@@ -12078,9 +12087,9 @@ typedef struct
1207812087
#define ADC1_IRQHandler ADC1_2_IRQHandler
1207912088
#define USB_LP_CAN_RX0_IRQHandler CAN_RX0_IRQHandler
1208012089
#define USB_HP_CAN_TX_IRQHandler CAN_TX_IRQHandler
12090+
#define COMP1_2_IRQHandler COMP2_IRQHandler
1208112091
#define COMP_IRQHandler COMP2_IRQHandler
1208212092
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
12083-
#define COMP1_2_IRQHandler COMP2_IRQHandler
1208412093
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1208512094
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
1208612095
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler

0 commit comments

Comments
 (0)