Skip to content

Commit 43ff4ae

Browse files
authored
Merge pull request #13874 from jeromecoutant/PR_F3_11
STM32F3 update drivers version to CUBE V1.11.1
2 parents 0909f6f + 56a7afd commit 43ff4ae

File tree

267 files changed

+190110
-65853
lines changed

Some content is hidden

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

267 files changed

+190110
-65853
lines changed
Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,56 +38,91 @@ extern "C" {
3838

3939
typedef enum {
4040
ADC_1 = (int)ADC1_BASE,
41+
#if defined ADC2_BASE
4142
ADC_2 = (int)ADC2_BASE,
43+
#endif
44+
#if defined ADC3_BASE
4245
ADC_3 = (int)ADC3_BASE,
46+
#endif
47+
#if defined ADC4_BASE
4348
ADC_4 = (int)ADC4_BASE
49+
#endif
4450
} ADCName;
4551

4652
typedef enum {
47-
DAC_1 = (int)DAC_BASE
53+
DAC_1 = (int)DAC1_BASE,
54+
#if defined DAC2_BASE
55+
DAC_2 = (int)DAC2_BASE
56+
#endif
4857
} DACName;
4958

5059
typedef enum {
5160
UART_1 = (int)USART1_BASE,
5261
UART_2 = (int)USART2_BASE,
5362
UART_3 = (int)USART3_BASE,
63+
#if defined UART4_BASE
5464
UART_4 = (int)UART4_BASE,
65+
#endif
66+
#if defined UART5_BASE
5567
UART_5 = (int)UART5_BASE
68+
#endif
5669
} UARTName;
5770

5871
#define DEVICE_SPI_COUNT 4
5972
typedef enum {
73+
#if defined SPI1_BASE
6074
SPI_1 = (int)SPI1_BASE,
75+
#endif
76+
#if defined SPI2_BASE
6177
SPI_2 = (int)SPI2_BASE,
78+
#endif
79+
#if defined SPI3_BASE
6280
SPI_3 = (int)SPI3_BASE,
81+
#endif
82+
#if defined SPI4_BASE
6383
SPI_4 = (int)SPI4_BASE
84+
#endif
6485
} SPIName;
6586

6687
typedef enum {
6788
I2C_1 = (int)I2C1_BASE,
89+
#if defined I2C2_BASE
6890
I2C_2 = (int)I2C2_BASE,
91+
#endif
92+
#if defined I2C3_BASE
6993
I2C_3 = (int)I2C3_BASE
94+
#endif
7095
} I2CName;
7196

7297
typedef enum {
7398
PWM_1 = (int)TIM1_BASE,
7499
PWM_2 = (int)TIM2_BASE,
100+
#if defined TIM3_BASE
75101
PWM_3 = (int)TIM3_BASE,
102+
#endif
103+
#if defined TIM4_BASE
76104
PWM_4 = (int)TIM4_BASE,
105+
#endif
106+
#if defined TIM8_BASE
77107
PWM_8 = (int)TIM8_BASE,
108+
#endif
78109
PWM_15 = (int)TIM15_BASE,
79110
PWM_16 = (int)TIM16_BASE,
80111
PWM_17 = (int)TIM17_BASE,
112+
#if defined TIM20_BASE
81113
PWM_20 = (int)TIM20_BASE
114+
#endif
82115
} PWMName;
83116

84117
typedef enum {
85118
CAN_1 = (int)CAN_BASE
86119
} CANName;
87120

121+
#if defined USB_BASE
88122
typedef enum {
89123
USB_FS = (int)USB_BASE,
90124
} USBName;
125+
#endif
91126

92127
#ifdef __cplusplus
93128
}

targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f301x8.h

Lines changed: 8612 additions & 0 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F302x8/device/stm32f302x8.h renamed to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f302x8.h

Lines changed: 3886 additions & 3885 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f302xc.h

Lines changed: 12728 additions & 0 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f302xe.h

Lines changed: 14472 additions & 0 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303x8/device/stm32f303x8.h renamed to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303x8.h

Lines changed: 3853 additions & 3874 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xC/device/stm32f303xc.h renamed to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xc.h

Lines changed: 4382 additions & 4303 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/TARGET_STM32F303xE/device/stm32f303xe.h renamed to targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f303xe.h

Lines changed: 5261 additions & 5181 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f318xx.h

Lines changed: 8599 additions & 0 deletions
Large diffs are not rendered by default.

targets/TARGET_STM/TARGET_STM32F3/STM32Cube_FW/CMSIS/stm32f328xx.h

Lines changed: 12109 additions & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)