Skip to content

Commit e67b477

Browse files
authored
Merge pull request #1201 from fpistm/updateF2
Update STM32F2 HAL and CMSIS drivers
2 parents a4058ae + 9c1ea14 commit e67b477

File tree

75 files changed

+6029
-3345
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

+6029
-3345
lines changed

CI/utils/patch/HAL/F2/0001-F2-I2C-HAL-fix-generate-Start-only-once-Stop-is-fini.patch

-146
This file was deleted.

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f205xx.h

-3
Original file line numberDiff line numberDiff line change
@@ -13446,9 +13446,6 @@ USB_OTG_HostChannelTypeDef;
1344613446
((INSTANCE) == TIM9) || \
1344713447
((INSTANCE) == TIM12))
1344813448

13449-
/****************** TIM Instances : supporting synchronization ****************/
13450-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
13451-
1345213449
/********************** TIM Instances : 32 bit Counter ************************/
1345313450
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1345413451
((INSTANCE) == TIM5))

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f207xx.h

-3
Original file line numberDiff line numberDiff line change
@@ -14737,9 +14737,6 @@ USB_OTG_HostChannelTypeDef;
1473714737
((INSTANCE) == TIM9) || \
1473814738
((INSTANCE) == TIM12))
1473914739

14740-
/****************** TIM Instances : supporting synchronization ****************/
14741-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14742-
1474314740
/********************** TIM Instances : 32 bit Counter ************************/
1474414741
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1474514742
((INSTANCE) == TIM5))

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f215xx.h

-3
Original file line numberDiff line numberDiff line change
@@ -13701,9 +13701,6 @@ USB_OTG_HostChannelTypeDef;
1370113701
((INSTANCE) == TIM9) || \
1370213702
((INSTANCE) == TIM12))
1370313703

13704-
/****************** TIM Instances : supporting synchronization ****************/
13705-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
13706-
1370713704
/********************** TIM Instances : 32 bit Counter ************************/
1370813705
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1370913706
((INSTANCE) == TIM5))

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f217xx.h

-3
Original file line numberDiff line numberDiff line change
@@ -14992,9 +14992,6 @@ USB_OTG_HostChannelTypeDef;
1499214992
((INSTANCE) == TIM9) || \
1499314993
((INSTANCE) == TIM12))
1499414994

14995-
/****************** TIM Instances : supporting synchronization ****************/
14996-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
14997-
1499814995
/********************** TIM Instances : 32 bit Counter ************************/
1499914996
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)(((INSTANCE) == TIM2) || \
1500014997
((INSTANCE) == TIM5))

system/Drivers/CMSIS/Device/ST/STM32F2xx/Include/stm32f2xx.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@
8181
#endif /* USE_HAL_DRIVER */
8282

8383
/**
84-
* @brief CMSIS Device version number V2.2.3
84+
* @brief CMSIS Device version number V2.2.4
8585
*/
8686
#define __STM32F2xx_CMSIS_VERSION_MAIN (0x02U) /*!< [31:24] main version */
8787
#define __STM32F2xx_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
88-
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x03U) /*!< [15:8] sub2 version */
88+
#define __STM32F2xx_CMSIS_VERSION_SUB2 (0x04U) /*!< [15:8] sub2 version */
8989
#define __STM32F2xx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9090
#define __STM32F2xx_CMSIS_VERSION ((__STM32F2xx_CMSIS_VERSION_MAIN << 24)\
9191
|(__STM32F2xx_CMSIS_VERSION_SUB1 << 16)\

0 commit comments

Comments
 (0)