Skip to content

Update STM32F3xx and STM32F7xx #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 1, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f301x8.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -8354,9 +8354,6 @@ typedef struct
((INSTANCE) == TIM2))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

Expand Down Expand Up @@ -8385,11 +8382,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -8577,8 +8570,8 @@ typedef struct
/* Aliases for __IRQn */
#define ADC1_2_IRQn ADC1_IRQn
#define COMP1_2_IRQn COMP2_IRQn
#define COMP1_2_3_IRQn COMP2_IRQn
#define COMP_IRQn COMP2_IRQn
#define COMP1_2_3_IRQn COMP2_IRQn
#define COMP4_5_6_IRQn COMP4_6_IRQn
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
Expand All @@ -8592,8 +8585,8 @@ typedef struct
/* Aliases for __IRQHandler */
#define ADC1_2_IRQHandler ADC1_IRQHandler
#define COMP1_2_IRQHandler COMP2_IRQHandler
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
#define COMP_IRQHandler COMP2_IRQHandler
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler
Expand Down
15 changes: 4 additions & 11 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302x8.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -12104,9 +12104,6 @@ typedef struct
((INSTANCE) == TIM2))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

Expand Down Expand Up @@ -12135,11 +12132,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -12329,9 +12322,9 @@ typedef struct

/* Aliases for __IRQn */
#define ADC1_2_IRQn ADC1_IRQn
#define COMP1_2_IRQn COMP2_IRQn
#define COMP1_2_3_IRQn COMP2_IRQn
#define COMP_IRQn COMP2_IRQn
#define COMP1_2_IRQn COMP2_IRQn
#define COMP4_5_6_IRQn COMP4_6_IRQn
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
Expand All @@ -12348,9 +12341,9 @@ typedef struct

/* Aliases for __IRQHandler */
#define ADC1_2_IRQHandler ADC1_IRQHandler
#define COMP1_2_IRQHandler COMP2_IRQHandler
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
#define COMP_IRQHandler COMP2_IRQHandler
#define COMP1_2_IRQHandler COMP2_IRQHandler
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler
Expand Down
14 changes: 2 additions & 12 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302xc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -12364,10 +12364,6 @@ typedef struct
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)
Expand Down Expand Up @@ -12398,13 +12394,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down
18 changes: 4 additions & 14 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f302xe.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -14100,10 +14100,6 @@ typedef struct
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
((INSTANCE) == TIM1)
Expand Down Expand Up @@ -14134,13 +14130,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -14381,9 +14371,9 @@ typedef struct

/* Aliases for __IRQn */
#define ADC1_IRQn ADC1_2_IRQn
#define COMP1_2_3_IRQn COMP1_2_IRQn
#define COMP2_IRQn COMP1_2_IRQn
#define COMP_IRQn COMP1_2_IRQn
#define COMP1_2_3_IRQn COMP1_2_IRQn
#define COMP4_5_6_IRQn COMP4_6_IRQn
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
Expand All @@ -14400,9 +14390,9 @@ typedef struct

/* Aliases for __IRQHandler */
#define ADC1_IRQHandler ADC1_2_IRQHandler
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
#define COMP2_IRQHandler COMP1_2_IRQHandler
#define COMP_IRQHandler COMP1_2_IRQHandler
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler
Expand Down
21 changes: 6 additions & 15 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303x8.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -11868,9 +11868,6 @@ typedef struct
((INSTANCE) == TIM3))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1))

#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1))

Expand Down Expand Up @@ -11903,13 +11900,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM7) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -12113,9 +12104,9 @@ typedef struct
#define ADC1_IRQn ADC1_2_IRQn
#define USB_LP_CAN_RX0_IRQn CAN_RX0_IRQn
#define USB_HP_CAN_TX_IRQn CAN_TX_IRQn
#define COMP1_2_IRQn COMP2_IRQn
#define COMP1_2_3_IRQn COMP2_IRQn
#define COMP_IRQn COMP2_IRQn
#define COMP1_2_3_IRQn COMP2_IRQn
#define COMP1_2_IRQn COMP2_IRQn
#define COMP4_5_6_IRQn COMP4_6_IRQn
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
Expand All @@ -12129,9 +12120,9 @@ typedef struct
#define ADC1_IRQHandler ADC1_2_IRQHandler
#define USB_LP_CAN_RX0_IRQHandler CAN_RX0_IRQHandler
#define USB_HP_CAN_TX_IRQHandler CAN_TX_IRQHandler
#define COMP1_2_IRQHandler COMP2_IRQHandler
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
#define COMP_IRQHandler COMP2_IRQHandler
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
#define COMP1_2_IRQHandler COMP2_IRQHandler
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler
Expand Down
24 changes: 6 additions & 18 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xc.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -13021,10 +13021,6 @@ typedef struct
((INSTANCE) == TIM8))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8))

#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8))
Expand Down Expand Up @@ -13066,15 +13062,7 @@ typedef struct
((INSTANCE) == TIM15))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM7) || \
((INSTANCE) == TIM8) || \
((INSTANCE) == TIM15))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -13339,9 +13327,9 @@ typedef struct
/* Aliases for __IRQn */
#define ADC1_IRQn ADC1_2_IRQn
#define SDADC1_IRQn ADC4_IRQn
#define COMP1_2_IRQn COMP1_2_3_IRQn
#define COMP2_IRQn COMP1_2_3_IRQn
#define COMP_IRQn COMP1_2_3_IRQn
#define COMP2_IRQn COMP1_2_3_IRQn
#define COMP1_2_IRQn COMP1_2_3_IRQn
#define COMP4_6_IRQn COMP4_5_6_IRQn
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
Expand All @@ -13361,9 +13349,9 @@ typedef struct
/* Aliases for __IRQHandler */
#define ADC1_IRQHandler ADC1_2_IRQHandler
#define SDADC1_IRQHandler ADC4_IRQHandler
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
#define COMP_IRQHandler COMP1_2_3_IRQHandler
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
#define COMP4_6_IRQHandler COMP4_5_6_IRQHandler
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler
Expand Down
22 changes: 4 additions & 18 deletions system/Drivers/CMSIS/Device/ST/STM32F3xx/Include/stm32f303xe.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral’s registers hardware
*
******************************************************************************
* @attention
Expand Down Expand Up @@ -14837,11 +14837,6 @@ typedef struct
((INSTANCE) == TIM20))

/****************** TIM Instances : supporting Hall interface *****************/
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8) || \
((INSTANCE) == TIM20))

#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM8) || \
Expand Down Expand Up @@ -14888,16 +14883,7 @@ typedef struct
((INSTANCE) == TIM20))

/****************** TIM Instances : supporting synchronization ****************/
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
(((INSTANCE) == TIM1) || \
((INSTANCE) == TIM2) || \
((INSTANCE) == TIM3) || \
((INSTANCE) == TIM4) || \
((INSTANCE) == TIM6) || \
((INSTANCE) == TIM7) || \
((INSTANCE) == TIM8) || \
((INSTANCE) == TIM15) || \
((INSTANCE) == TIM20))
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)

/****************** TIM Instances : supporting 32 bits counter ****************/
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
Expand Down Expand Up @@ -15188,8 +15174,8 @@ typedef struct
#define ADC1_IRQn ADC1_2_IRQn
#define SDADC1_IRQn ADC4_IRQn
#define COMP1_2_IRQn COMP1_2_3_IRQn
#define COMP2_IRQn COMP1_2_3_IRQn
#define COMP_IRQn COMP1_2_3_IRQn
#define COMP2_IRQn COMP1_2_3_IRQn
#define COMP4_6_IRQn COMP4_5_6_IRQn
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
Expand All @@ -15213,8 +15199,8 @@ typedef struct
#define ADC1_IRQHandler ADC1_2_IRQHandler
#define SDADC1_IRQHandler ADC4_IRQHandler
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
#define COMP_IRQHandler COMP1_2_3_IRQHandler
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
#define COMP4_6_IRQHandler COMP4_5_6_IRQHandler
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler
Expand Down
Loading