Skip to content

Commit 2649ad3

Browse files
fpistmfpistm
authored
Merge pull request stm32duino#282 from fpistm/HAL_update
Update STM32F3xx and STM32F7xx
2 parents e2147b3 + 89799a0 commit 2649ad3

File tree

78 files changed

+43108
-5399
lines changed

Some content is hidden

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

78 files changed

+43108
-5399
lines changed

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -8354,9 +8354,6 @@ typedef struct
83548354
((INSTANCE) == TIM2))
83558355

83568356
/****************** TIM Instances : supporting Hall interface *****************/
8357-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
8358-
((INSTANCE) == TIM1)
8359-
83608357
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
83618358
((INSTANCE) == TIM1)
83628359

@@ -8385,11 +8382,7 @@ typedef struct
83858382
((INSTANCE) == TIM15))
83868383

83878384
/****************** TIM Instances : supporting synchronization ****************/
8388-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
8389-
(((INSTANCE) == TIM1) || \
8390-
((INSTANCE) == TIM2) || \
8391-
((INSTANCE) == TIM6) || \
8392-
((INSTANCE) == TIM15))
8385+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
83938386

83948387
/****************** TIM Instances : supporting 32 bits counter ****************/
83958388
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
@@ -8577,8 +8570,8 @@ typedef struct
85778570
/* Aliases for __IRQn */
85788571
#define ADC1_2_IRQn ADC1_IRQn
85798572
#define COMP1_2_IRQn COMP2_IRQn
8580-
#define COMP1_2_3_IRQn COMP2_IRQn
85818573
#define COMP_IRQn COMP2_IRQn
8574+
#define COMP1_2_3_IRQn COMP2_IRQn
85828575
#define COMP4_5_6_IRQn COMP4_6_IRQn
85838576
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
85848577
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -8592,8 +8585,8 @@ typedef struct
85928585
/* Aliases for __IRQHandler */
85938586
#define ADC1_2_IRQHandler ADC1_IRQHandler
85948587
#define COMP1_2_IRQHandler COMP2_IRQHandler
8595-
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
85968588
#define COMP_IRQHandler COMP2_IRQHandler
8589+
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
85978590
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
85988591
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
85998592
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

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

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -12104,9 +12104,6 @@ typedef struct
1210412104
((INSTANCE) == TIM2))
1210512105

1210612106
/****************** TIM Instances : supporting Hall interface *****************/
12107-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
12108-
((INSTANCE) == TIM1)
12109-
1211012107
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1211112108
((INSTANCE) == TIM1)
1211212109

@@ -12135,11 +12132,7 @@ typedef struct
1213512132
((INSTANCE) == TIM15))
1213612133

1213712134
/****************** TIM Instances : supporting synchronization ****************/
12138-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
12139-
(((INSTANCE) == TIM1) || \
12140-
((INSTANCE) == TIM2) || \
12141-
((INSTANCE) == TIM6) || \
12142-
((INSTANCE) == TIM15))
12135+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1214312136

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

1233012323
/* Aliases for __IRQn */
1233112324
#define ADC1_2_IRQn ADC1_IRQn
12332-
#define COMP1_2_IRQn COMP2_IRQn
1233312325
#define COMP1_2_3_IRQn COMP2_IRQn
1233412326
#define COMP_IRQn COMP2_IRQn
12327+
#define COMP1_2_IRQn COMP2_IRQn
1233512328
#define COMP4_5_6_IRQn COMP4_6_IRQn
1233612329
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
1233712330
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -12348,9 +12341,9 @@ typedef struct
1234812341

1234912342
/* Aliases for __IRQHandler */
1235012343
#define ADC1_2_IRQHandler ADC1_IRQHandler
12351-
#define COMP1_2_IRQHandler COMP2_IRQHandler
1235212344
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
1235312345
#define COMP_IRQHandler COMP2_IRQHandler
12346+
#define COMP1_2_IRQHandler COMP2_IRQHandler
1235412347
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1235512348
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
1235612349
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

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

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -12364,10 +12364,6 @@ typedef struct
1236412364
((INSTANCE) == TIM3) || \
1236512365
((INSTANCE) == TIM4))
1236612366

12367-
/****************** TIM Instances : supporting Hall interface *****************/
12368-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
12369-
((INSTANCE) == TIM1)
12370-
1237112367
/****************** TIM Instances : supporting Hall interface *****************/
1237212368
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1237312369
((INSTANCE) == TIM1)
@@ -12398,13 +12394,7 @@ typedef struct
1239812394
((INSTANCE) == TIM15))
1239912395

1240012396
/****************** TIM Instances : supporting synchronization ****************/
12401-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
12402-
(((INSTANCE) == TIM1) || \
12403-
((INSTANCE) == TIM2) || \
12404-
((INSTANCE) == TIM3) || \
12405-
((INSTANCE) == TIM4) || \
12406-
((INSTANCE) == TIM6) || \
12407-
((INSTANCE) == TIM15))
12397+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1240812398

1240912399
/****************** TIM Instances : supporting 32 bits counter ****************/
1241012400
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\

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

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -14100,10 +14100,6 @@ typedef struct
1410014100
((INSTANCE) == TIM3) || \
1410114101
((INSTANCE) == TIM4))
1410214102

14103-
/****************** TIM Instances : supporting Hall interface *****************/
14104-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
14105-
((INSTANCE) == TIM1)
14106-
1410714103
/****************** TIM Instances : supporting Hall interface *****************/
1410814104
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1410914105
((INSTANCE) == TIM1)
@@ -14134,13 +14130,7 @@ typedef struct
1413414130
((INSTANCE) == TIM15))
1413514131

1413614132
/****************** TIM Instances : supporting synchronization ****************/
14137-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
14138-
(((INSTANCE) == TIM1) || \
14139-
((INSTANCE) == TIM2) || \
14140-
((INSTANCE) == TIM3) || \
14141-
((INSTANCE) == TIM4) || \
14142-
((INSTANCE) == TIM6) || \
14143-
((INSTANCE) == TIM15))
14133+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1414414134

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

1438214372
/* Aliases for __IRQn */
1438314373
#define ADC1_IRQn ADC1_2_IRQn
14384-
#define COMP1_2_3_IRQn COMP1_2_IRQn
1438514374
#define COMP2_IRQn COMP1_2_IRQn
1438614375
#define COMP_IRQn COMP1_2_IRQn
14376+
#define COMP1_2_3_IRQn COMP1_2_IRQn
1438714377
#define COMP4_5_6_IRQn COMP4_6_IRQn
1438814378
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
1438914379
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -14400,9 +14390,9 @@ typedef struct
1440014390

1440114391
/* Aliases for __IRQHandler */
1440214392
#define ADC1_IRQHandler ADC1_2_IRQHandler
14403-
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
1440414393
#define COMP2_IRQHandler COMP1_2_IRQHandler
1440514394
#define COMP_IRQHandler COMP1_2_IRQHandler
14395+
#define COMP1_2_3_IRQHandler COMP1_2_IRQHandler
1440614396
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1440714397
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
1440814398
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

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

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -11868,9 +11868,6 @@ typedef struct
1186811868
((INSTANCE) == TIM3))
1186911869

1187011870
/****************** TIM Instances : supporting Hall interface *****************/
11871-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
11872-
(((INSTANCE) == TIM1))
11873-
1187411871
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1187511872
(((INSTANCE) == TIM1))
1187611873

@@ -11903,13 +11900,7 @@ typedef struct
1190311900
((INSTANCE) == TIM15))
1190411901

1190511902
/****************** TIM Instances : supporting synchronization ****************/
11906-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
11907-
(((INSTANCE) == TIM1) || \
11908-
((INSTANCE) == TIM2) || \
11909-
((INSTANCE) == TIM3) || \
11910-
((INSTANCE) == TIM6) || \
11911-
((INSTANCE) == TIM7) || \
11912-
((INSTANCE) == TIM15))
11903+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1191311904

1191411905
/****************** TIM Instances : supporting 32 bits counter ****************/
1191511906
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
@@ -12113,9 +12104,9 @@ typedef struct
1211312104
#define ADC1_IRQn ADC1_2_IRQn
1211412105
#define USB_LP_CAN_RX0_IRQn CAN_RX0_IRQn
1211512106
#define USB_HP_CAN_TX_IRQn CAN_TX_IRQn
12116-
#define COMP1_2_IRQn COMP2_IRQn
12117-
#define COMP1_2_3_IRQn COMP2_IRQn
1211812107
#define COMP_IRQn COMP2_IRQn
12108+
#define COMP1_2_3_IRQn COMP2_IRQn
12109+
#define COMP1_2_IRQn COMP2_IRQn
1211912110
#define COMP4_5_6_IRQn COMP4_6_IRQn
1212012111
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
1212112112
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
@@ -12129,9 +12120,9 @@ typedef struct
1212912120
#define ADC1_IRQHandler ADC1_2_IRQHandler
1213012121
#define USB_LP_CAN_RX0_IRQHandler CAN_RX0_IRQHandler
1213112122
#define USB_HP_CAN_TX_IRQHandler CAN_TX_IRQHandler
12132-
#define COMP1_2_IRQHandler COMP2_IRQHandler
12133-
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
1213412123
#define COMP_IRQHandler COMP2_IRQHandler
12124+
#define COMP1_2_3_IRQHandler COMP2_IRQHandler
12125+
#define COMP1_2_IRQHandler COMP2_IRQHandler
1213512126
#define COMP4_5_6_IRQHandler COMP4_6_IRQHandler
1213612127
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
1213712128
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -13021,10 +13021,6 @@ typedef struct
1302113021
((INSTANCE) == TIM8))
1302213022

1302313023
/****************** TIM Instances : supporting Hall interface *****************/
13024-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
13025-
(((INSTANCE) == TIM1) || \
13026-
((INSTANCE) == TIM8))
13027-
1302813024
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1302913025
(((INSTANCE) == TIM1) || \
1303013026
((INSTANCE) == TIM8))
@@ -13066,15 +13062,7 @@ typedef struct
1306613062
((INSTANCE) == TIM15))
1306713063

1306813064
/****************** TIM Instances : supporting synchronization ****************/
13069-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
13070-
(((INSTANCE) == TIM1) || \
13071-
((INSTANCE) == TIM2) || \
13072-
((INSTANCE) == TIM3) || \
13073-
((INSTANCE) == TIM4) || \
13074-
((INSTANCE) == TIM6) || \
13075-
((INSTANCE) == TIM7) || \
13076-
((INSTANCE) == TIM8) || \
13077-
((INSTANCE) == TIM15))
13065+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1307813066

1307913067
/****************** TIM Instances : supporting 32 bits counter ****************/
1308013068
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
@@ -13339,9 +13327,9 @@ typedef struct
1333913327
/* Aliases for __IRQn */
1334013328
#define ADC1_IRQn ADC1_2_IRQn
1334113329
#define SDADC1_IRQn ADC4_IRQn
13342-
#define COMP1_2_IRQn COMP1_2_3_IRQn
13343-
#define COMP2_IRQn COMP1_2_3_IRQn
1334413330
#define COMP_IRQn COMP1_2_3_IRQn
13331+
#define COMP2_IRQn COMP1_2_3_IRQn
13332+
#define COMP1_2_IRQn COMP1_2_3_IRQn
1334513333
#define COMP4_6_IRQn COMP4_5_6_IRQn
1334613334
#define TIM15_IRQn TIM1_BRK_TIM15_IRQn
1334713335
#define TIM18_DAC2_IRQn TIM1_CC_IRQn
@@ -13361,9 +13349,9 @@ typedef struct
1336113349
/* Aliases for __IRQHandler */
1336213350
#define ADC1_IRQHandler ADC1_2_IRQHandler
1336313351
#define SDADC1_IRQHandler ADC4_IRQHandler
13364-
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
13365-
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
1336613352
#define COMP_IRQHandler COMP1_2_3_IRQHandler
13353+
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
13354+
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
1336713355
#define COMP4_6_IRQHandler COMP4_5_6_IRQHandler
1336813356
#define TIM15_IRQHandler TIM1_BRK_TIM15_IRQHandler
1336913357
#define TIM18_DAC2_IRQHandler TIM1_CC_IRQHandler

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

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* This file contains:
88
* - Data structures and the address mapping for all peripherals
99
* - Peripheral's registers declarations and bits definition
10-
* - Macros to access peripheral�s registers hardware
10+
* - Macros to access peripheral’s registers hardware
1111
*
1212
******************************************************************************
1313
* @attention
@@ -14837,11 +14837,6 @@ typedef struct
1483714837
((INSTANCE) == TIM20))
1483814838

1483914839
/****************** TIM Instances : supporting Hall interface *****************/
14840-
#define IS_TIM_HALL_INTERFACE_INSTANCE(INSTANCE)\
14841-
(((INSTANCE) == TIM1) || \
14842-
((INSTANCE) == TIM8) || \
14843-
((INSTANCE) == TIM20))
14844-
1484514840
#define IS_TIM_HALL_SENSOR_INTERFACE_INSTANCE(INSTANCE)\
1484614841
(((INSTANCE) == TIM1) || \
1484714842
((INSTANCE) == TIM8) || \
@@ -14888,16 +14883,7 @@ typedef struct
1488814883
((INSTANCE) == TIM20))
1488914884

1489014885
/****************** TIM Instances : supporting synchronization ****************/
14891-
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE)\
14892-
(((INSTANCE) == TIM1) || \
14893-
((INSTANCE) == TIM2) || \
14894-
((INSTANCE) == TIM3) || \
14895-
((INSTANCE) == TIM4) || \
14896-
((INSTANCE) == TIM6) || \
14897-
((INSTANCE) == TIM7) || \
14898-
((INSTANCE) == TIM8) || \
14899-
((INSTANCE) == TIM15) || \
14900-
((INSTANCE) == TIM20))
14886+
#define IS_TIM_SYNCHRO_INSTANCE(INSTANCE) IS_TIM_MASTER_INSTANCE(INSTANCE)
1490114887

1490214888
/****************** TIM Instances : supporting 32 bits counter ****************/
1490314889
#define IS_TIM_32B_COUNTER_INSTANCE(INSTANCE)\
@@ -15188,8 +15174,8 @@ typedef struct
1518815174
#define ADC1_IRQn ADC1_2_IRQn
1518915175
#define SDADC1_IRQn ADC4_IRQn
1519015176
#define COMP1_2_IRQn COMP1_2_3_IRQn
15191-
#define COMP2_IRQn COMP1_2_3_IRQn
1519215177
#define COMP_IRQn COMP1_2_3_IRQn
15178+
#define COMP2_IRQn COMP1_2_3_IRQn
1519315179
#define COMP4_6_IRQn COMP4_5_6_IRQn
1519415180
#define HRTIM1_FLT_IRQn I2C3_ER_IRQn
1519515181
#define HRTIM1_TIME_IRQn I2C3_EV_IRQn
@@ -15213,8 +15199,8 @@ typedef struct
1521315199
#define ADC1_IRQHandler ADC1_2_IRQHandler
1521415200
#define SDADC1_IRQHandler ADC4_IRQHandler
1521515201
#define COMP1_2_IRQHandler COMP1_2_3_IRQHandler
15216-
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
1521715202
#define COMP_IRQHandler COMP1_2_3_IRQHandler
15203+
#define COMP2_IRQHandler COMP1_2_3_IRQHandler
1521815204
#define COMP4_6_IRQHandler COMP4_5_6_IRQHandler
1521915205
#define HRTIM1_FLT_IRQHandler I2C3_ER_IRQHandler
1522015206
#define HRTIM1_TIME_IRQHandler I2C3_EV_IRQHandler

0 commit comments

Comments
 (0)