Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a4058ae

Browse files
fpistmfpistm
authoredOct 9, 2020
Merge pull request #1200 from fpistm/updateF1
Update STM32F1 HAL and CMSIS drivers
2 parents ac1d03e + b720ec5 commit a4058ae

File tree

76 files changed

+6386
-2867
lines changed

Some content is hidden

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

76 files changed

+6386
-2867
lines changed
 

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4880,7 +4880,6 @@ typedef struct
48804880
#define SPI_TXCRCR_TXCRC SPI_TXCRCR_TXCRC_Msk /*!< Tx CRC Register */
48814881

48824882

4883-
48844883
/******************************************************************************/
48854884
/* */
48864885
/* Inter-integrated Circuit Interface */
@@ -5718,8 +5717,6 @@ typedef struct
57185717
((INSTANCE) == TIM4) || \
57195718
((INSTANCE) == TIM15))
57205719

5721-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
5722-
57235720
#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
57245721
(((INSTANCE) == TIM1) || \
57255722
((INSTANCE) == TIM2) || \
@@ -5921,31 +5918,31 @@ typedef struct
59215918
#define ADC1_2_IRQn ADC1_IRQn
59225919
#define USBWakeUp_IRQn CEC_IRQn
59235920
#define OTG_FS_WKUP_IRQn CEC_IRQn
5924-
#define TIM9_IRQn TIM1_BRK_TIM15_IRQn
5925-
#define TIM1_BRK_IRQn TIM1_BRK_TIM15_IRQn
59265921
#define TIM1_BRK_TIM9_IRQn TIM1_BRK_TIM15_IRQn
5927-
#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_TIM17_IRQn
5922+
#define TIM1_BRK_IRQn TIM1_BRK_TIM15_IRQn
5923+
#define TIM9_IRQn TIM1_BRK_TIM15_IRQn
59285924
#define TIM1_TRG_COM_IRQn TIM1_TRG_COM_TIM17_IRQn
59295925
#define TIM11_IRQn TIM1_TRG_COM_TIM17_IRQn
5926+
#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_TIM17_IRQn
5927+
#define TIM1_UP_IRQn TIM1_UP_TIM16_IRQn
59305928
#define TIM1_UP_TIM10_IRQn TIM1_UP_TIM16_IRQn
59315929
#define TIM10_IRQn TIM1_UP_TIM16_IRQn
5932-
#define TIM1_UP_IRQn TIM1_UP_TIM16_IRQn
59335930
#define TIM6_IRQn TIM6_DAC_IRQn
59345931

59355932

59365933
/* Aliases for __IRQHandler */
59375934
#define ADC1_2_IRQHandler ADC1_IRQHandler
59385935
#define USBWakeUp_IRQHandler CEC_IRQHandler
59395936
#define OTG_FS_WKUP_IRQHandler CEC_IRQHandler
5940-
#define TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
5941-
#define TIM1_BRK_IRQHandler TIM1_BRK_TIM15_IRQHandler
59425937
#define TIM1_BRK_TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
5943-
#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
5938+
#define TIM1_BRK_IRQHandler TIM1_BRK_TIM15_IRQHandler
5939+
#define TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
59445940
#define TIM1_TRG_COM_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
59455941
#define TIM11_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
5942+
#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
5943+
#define TIM1_UP_IRQHandler TIM1_UP_TIM16_IRQHandler
59465944
#define TIM1_UP_TIM10_IRQHandler TIM1_UP_TIM16_IRQHandler
59475945
#define TIM10_IRQHandler TIM1_UP_TIM16_IRQHandler
5948-
#define TIM1_UP_IRQHandler TIM1_UP_TIM16_IRQHandler
59495946
#define TIM6_IRQHandler TIM6_DAC_IRQHandler
59505947

59515948

‎system/Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5394,7 +5394,6 @@ typedef struct
53945394
#define SPI_TXCRCR_TXCRC SPI_TXCRCR_TXCRC_Msk /*!< Tx CRC Register */
53955395

53965396

5397-
53985397
/******************************************************************************/
53995398
/* */
54005399
/* Inter-integrated Circuit Interface */
@@ -6283,8 +6282,6 @@ typedef struct
62836282
((INSTANCE) == TIM12) || \
62846283
((INSTANCE) == TIM15))
62856284

6286-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
6287-
62886285
#define IS_TIM_DMABURST_INSTANCE(INSTANCE)\
62896286
(((INSTANCE) == TIM1) || \
62906287
((INSTANCE) == TIM2) || \
@@ -6522,17 +6519,17 @@ typedef struct
65226519

65236520
/* Aliases for __IRQn */
65246521
#define ADC1_2_IRQn ADC1_IRQn
6525-
#define USBWakeUp_IRQn CEC_IRQn
65266522
#define OTG_FS_WKUP_IRQn CEC_IRQn
6523+
#define USBWakeUp_IRQn CEC_IRQn
65276524
#define TIM8_BRK_IRQn TIM12_IRQn
65286525
#define TIM8_BRK_TIM12_IRQn TIM12_IRQn
6529-
#define TIM8_UP_TIM13_IRQn TIM13_IRQn
65306526
#define TIM8_UP_IRQn TIM13_IRQn
6531-
#define TIM8_TRG_COM_IRQn TIM14_IRQn
6527+
#define TIM8_UP_TIM13_IRQn TIM13_IRQn
65326528
#define TIM8_TRG_COM_TIM14_IRQn TIM14_IRQn
6529+
#define TIM8_TRG_COM_IRQn TIM14_IRQn
65336530
#define TIM9_IRQn TIM1_BRK_TIM15_IRQn
6534-
#define TIM1_BRK_TIM9_IRQn TIM1_BRK_TIM15_IRQn
65356531
#define TIM1_BRK_IRQn TIM1_BRK_TIM15_IRQn
6532+
#define TIM1_BRK_TIM9_IRQn TIM1_BRK_TIM15_IRQn
65366533
#define TIM1_TRG_COM_TIM11_IRQn TIM1_TRG_COM_TIM17_IRQn
65376534
#define TIM1_TRG_COM_IRQn TIM1_TRG_COM_TIM17_IRQn
65386535
#define TIM11_IRQn TIM1_TRG_COM_TIM17_IRQn
@@ -6544,17 +6541,17 @@ typedef struct
65446541

65456542
/* Aliases for __IRQHandler */
65466543
#define ADC1_2_IRQHandler ADC1_IRQHandler
6547-
#define USBWakeUp_IRQHandler CEC_IRQHandler
65486544
#define OTG_FS_WKUP_IRQHandler CEC_IRQHandler
6545+
#define USBWakeUp_IRQHandler CEC_IRQHandler
65496546
#define TIM8_BRK_IRQHandler TIM12_IRQHandler
65506547
#define TIM8_BRK_TIM12_IRQHandler TIM12_IRQHandler
6551-
#define TIM8_UP_TIM13_IRQHandler TIM13_IRQHandler
65526548
#define TIM8_UP_IRQHandler TIM13_IRQHandler
6553-
#define TIM8_TRG_COM_IRQHandler TIM14_IRQHandler
6549+
#define TIM8_UP_TIM13_IRQHandler TIM13_IRQHandler
65546550
#define TIM8_TRG_COM_TIM14_IRQHandler TIM14_IRQHandler
6551+
#define TIM8_TRG_COM_IRQHandler TIM14_IRQHandler
65556552
#define TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
6556-
#define TIM1_BRK_TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
65576553
#define TIM1_BRK_IRQHandler TIM1_BRK_TIM15_IRQHandler
6554+
#define TIM1_BRK_TIM9_IRQHandler TIM1_BRK_TIM15_IRQHandler
65586555
#define TIM1_TRG_COM_TIM11_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
65596556
#define TIM1_TRG_COM_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler
65606557
#define TIM11_IRQHandler TIM1_TRG_COM_TIM17_IRQHandler

0 commit comments

Comments
 (0)