Skip to content

Commit 66b9d99

Browse files
fpistmfpistm
authored
Merge pull request stm32duino#555 from fpistm/WEAK_PinMAP
Add WEAK attribute to PinMap arrays
2 parents 801ce35 + e10a844 commit 66b9d99

File tree

52 files changed

+829
-829
lines changed

Some content is hidden

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

52 files changed

+829
-829
lines changed

‎variants/ARMED_V1/PeripheralPins.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
//*** ADC ***
4141

4242
#ifdef HAL_ADC_MODULE_ENABLED
43-
const PinMap PinMap_ADC[] = {
43+
WEAK const PinMap PinMap_ADC[] = {
4444
// {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0 - User Blue button
4545
// {PA_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0 - User Blue button
4646
// {PA_0, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0 - User Blue button
@@ -88,7 +88,7 @@ const PinMap PinMap_ADC[] = {
8888
//*** DAC ***
8989

9090
#ifdef HAL_DAC_MODULE_ENABLED
91-
const PinMap PinMap_DAC[] = {
91+
WEAK const PinMap PinMap_DAC[] = {
9292
// {PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 - I2S3_WS
9393
// {PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
9494
{NC, NP, 0}
@@ -98,7 +98,7 @@ const PinMap PinMap_DAC[] = {
9898
//*** I2C ***
9999

100100
#ifdef HAL_I2C_MODULE_ENABLED
101-
const PinMap PinMap_I2C_SDA[] = {
101+
WEAK const PinMap PinMap_I2C_SDA[] = {
102102
// {PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
103103
{PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SDA
104104
// {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
@@ -108,7 +108,7 @@ const PinMap PinMap_I2C_SDA[] = {
108108
#endif
109109

110110
#ifdef HAL_I2C_MODULE_ENABLED
111-
const PinMap PinMap_I2C_SCL[] = {
111+
WEAK const PinMap PinMap_I2C_SCL[] = {
112112
// {PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
113113
// {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, // Audio_SCL
114114
{PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
@@ -120,7 +120,7 @@ const PinMap PinMap_I2C_SCL[] = {
120120
//*** PWM ***
121121

122122
#ifdef HAL_TIM_MODULE_ENABLED
123-
const PinMap PinMap_PWM[] = {
123+
WEAK const PinMap PinMap_PWM[] = {
124124
{PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
125125
// {PA_0, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
126126
{PA_1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
@@ -196,7 +196,7 @@ const PinMap PinMap_PWM[] = {
196196
//*** SERIAL ***
197197

198198
#ifdef HAL_UART_MODULE_ENABLED
199-
const PinMap PinMap_UART_TX[] = {
199+
WEAK const PinMap PinMap_UART_TX[] = {
200200
// {PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, // User Blue button
201201
// {PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
202202
// {PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
@@ -213,7 +213,7 @@ const PinMap PinMap_UART_TX[] = {
213213
#endif
214214

215215
#ifdef HAL_UART_MODULE_ENABLED
216-
const PinMap PinMap_UART_RX[] = {
216+
WEAK const PinMap PinMap_UART_RX[] = {
217217
// {PA_1, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
218218
// {PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
219219
// {PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
@@ -230,7 +230,7 @@ const PinMap PinMap_UART_RX[] = {
230230
#endif
231231

232232
#ifdef HAL_UART_MODULE_ENABLED
233-
const PinMap PinMap_UART_RTS[] = {
233+
WEAK const PinMap PinMap_UART_RTS[] = {
234234
// {PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
235235
// {PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
236236
// {PB_14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
@@ -241,7 +241,7 @@ const PinMap PinMap_UART_RTS[] = {
241241
#endif
242242

243243
#ifdef HAL_UART_MODULE_ENABLED
244-
const PinMap PinMap_UART_CTS[] = {
244+
WEAK const PinMap PinMap_UART_CTS[] = {
245245
// {PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, // User Blue button
246246
// {PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, // USB
247247
// {PB_13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
@@ -254,7 +254,7 @@ const PinMap PinMap_UART_CTS[] = {
254254
//*** SPI ***
255255

256256
#ifdef HAL_SPI_MODULE_ENABLED
257-
const PinMap PinMap_SPI_MOSI[] = {
257+
WEAK const PinMap PinMap_SPI_MOSI[] = {
258258
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
259259
// {PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
260260
// {PB_5, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
@@ -266,7 +266,7 @@ const PinMap PinMap_SPI_MOSI[] = {
266266
#endif
267267

268268
#ifdef HAL_SPI_MODULE_ENABLED
269-
const PinMap PinMap_SPI_MISO[] = {
269+
WEAK const PinMap PinMap_SPI_MISO[] = {
270270
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
271271
// {PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
272272
// {PB_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
@@ -278,7 +278,7 @@ const PinMap PinMap_SPI_MISO[] = {
278278
#endif
279279

280280
#ifdef HAL_SPI_MODULE_ENABLED
281-
const PinMap PinMap_SPI_SCLK[] = {
281+
WEAK const PinMap PinMap_SPI_SCLK[] = {
282282
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // MEMS
283283
// {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // T_SWO
284284
// {PB_3, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // T_SWO
@@ -290,7 +290,7 @@ const PinMap PinMap_SPI_SCLK[] = {
290290
#endif
291291

292292
#ifdef HAL_SPI_MODULE_ENABLED
293-
const PinMap PinMap_SPI_SSEL[] = {
293+
WEAK const PinMap PinMap_SPI_SSEL[] = {
294294
// {PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, // I2S3_WS
295295
// {PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, // I2S3_WS
296296
// {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
@@ -304,7 +304,7 @@ const PinMap PinMap_SPI_SSEL[] = {
304304
//*** CAN ***
305305

306306
#ifdef HAL_CAN_MODULE_ENABLED
307-
const PinMap PinMap_CAN_RD[] = {
307+
WEAK const PinMap PinMap_CAN_RD[] = {
308308
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
309309
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
310310
// {PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -315,7 +315,7 @@ const PinMap PinMap_CAN_RD[] = {
315315
#endif
316316

317317
#ifdef HAL_CAN_MODULE_ENABLED
318-
const PinMap PinMap_CAN_TD[] = {
318+
WEAK const PinMap PinMap_CAN_TD[] = {
319319
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
320320
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // Audio_SCL
321321
// {PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // Audio_SDA
@@ -328,7 +328,7 @@ const PinMap PinMap_CAN_TD[] = {
328328
//*** ETHERNET ***
329329

330330
#ifdef HAL_ETH_MODULE_ENABLED
331-
const PinMap PinMap_Ethernet[] = {
331+
WEAK const PinMap PinMap_Ethernet[] = {
332332
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
333333
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK|ETH_RX_CLK
334334
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
@@ -357,7 +357,7 @@ const PinMap PinMap_Ethernet[] = {
357357
//*** USB ***
358358

359359
#ifdef HAL_PCD_MODULE_ENABLED
360-
const PinMap PinMap_USB_OTG_FS[] = {
360+
WEAK const PinMap PinMap_USB_OTG_FS[] = {
361361
{PA_8, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
362362
{PA_9, USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
363363
{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
@@ -368,7 +368,7 @@ const PinMap PinMap_USB_OTG_FS[] = {
368368
#endif
369369

370370
#ifdef HAL_PCD_MODULE_ENABLED
371-
const PinMap PinMap_USB_OTG_HS[] = {
371+
WEAK const PinMap PinMap_USB_OTG_HS[] = {
372372
#ifdef USE_USB_HS_IN_FS
373373
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
374374
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID

‎variants/BLACK_F407XX/PeripheralPins.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
//*** ADC ***
4141

4242
#ifdef HAL_ADC_MODULE_ENABLED
43-
const PinMap PinMap_ADC[] = {
43+
WEAK const PinMap PinMap_ADC[] = {
4444
{PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
4545
// {PA_0, ADC2, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
4646
// {PA_0, ADC3, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
@@ -100,7 +100,7 @@ const PinMap PinMap_ADC[] = {
100100
//*** DAC ***
101101

102102
#ifdef HAL_DAC_MODULE_ENABLED
103-
const PinMap PinMap_DAC[] = {
103+
WEAK const PinMap PinMap_DAC[] = {
104104
{PA_4, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1
105105
{PA_5, DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2
106106
{NC, NP, 0}
@@ -110,7 +110,7 @@ const PinMap PinMap_DAC[] = {
110110
//*** I2C ***
111111

112112
#ifdef HAL_I2C_MODULE_ENABLED
113-
const PinMap PinMap_I2C_SDA[] = {
113+
WEAK const PinMap PinMap_I2C_SDA[] = {
114114
{PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
115115
{PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
116116
{PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)},
@@ -123,7 +123,7 @@ const PinMap PinMap_I2C_SDA[] = {
123123
#endif
124124

125125
#ifdef HAL_I2C_MODULE_ENABLED
126-
const PinMap PinMap_I2C_SCL[] = {
126+
WEAK const PinMap PinMap_I2C_SCL[] = {
127127
{PA_8, I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)},
128128
{PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
129129
{PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)},
@@ -138,7 +138,7 @@ const PinMap PinMap_I2C_SCL[] = {
138138
//*** PWM ***
139139

140140
#ifdef HAL_TIM_MODULE_ENABLED
141-
const PinMap PinMap_PWM[] = {
141+
WEAK const PinMap PinMap_PWM[] = {
142142
{PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
143143
// {PA_0, TIM5, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
144144
{PA_1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
@@ -173,26 +173,26 @@ const PinMap PinMap_PWM[] = {
173173
{PB_5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
174174
{PB_6, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
175175
{PB_7, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
176-
{PB_8, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
176+
// {PB_8, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
177177
{PB_8, TIM10, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
178-
{PB_9, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
178+
// {PB_9, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
179179
{PB_9, TIM11, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
180180
{PB_10, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
181181
{PB_11, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
182182
{PB_13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
183-
{PB_14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
184-
{PB_14, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
183+
// {PB_14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
184+
// {PB_14, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
185185
{PB_14, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
186-
{PB_15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
187-
{PB_15, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
186+
// {PB_15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
187+
// {PB_15, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
188188
{PB_15, TIM12, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
189-
{PC_6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
189+
// {PC_6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
190190
{PC_6, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
191-
{PC_7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
191+
// {PC_7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
192192
{PC_7, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
193193
{PC_8, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
194-
{PC_8, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
195-
{PC_9, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
194+
// {PC_8, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
195+
// {PC_9, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
196196
{PC_9, TIM8, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
197197
{PD_12, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
198198
{PD_13, TIM4, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
@@ -220,7 +220,7 @@ const PinMap PinMap_PWM[] = {
220220
//*** SERIAL ***
221221

222222
#ifdef HAL_UART_MODULE_ENABLED
223-
const PinMap PinMap_UART_TX[] = {
223+
WEAK const PinMap PinMap_UART_TX[] = {
224224
{PA_0, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
225225
{PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
226226
{PA_9, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@@ -240,7 +240,7 @@ const PinMap PinMap_UART_TX[] = {
240240
#endif
241241

242242
#ifdef HAL_UART_MODULE_ENABLED
243-
const PinMap PinMap_UART_RX[] = {
243+
WEAK const PinMap PinMap_UART_RX[] = {
244244
{PA_1, UART4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)},
245245
{PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
246246
{PA_10, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
@@ -260,7 +260,7 @@ const PinMap PinMap_UART_RX[] = {
260260
#endif
261261

262262
#ifdef HAL_UART_MODULE_ENABLED
263-
const PinMap PinMap_UART_RTS[] = {
263+
WEAK const PinMap PinMap_UART_RTS[] = {
264264
{PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
265265
{PA_12, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
266266
{PB_14, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
@@ -275,7 +275,7 @@ const PinMap PinMap_UART_RTS[] = {
275275
#endif
276276

277277
#ifdef HAL_UART_MODULE_ENABLED
278-
const PinMap PinMap_UART_CTS[] = {
278+
WEAK const PinMap PinMap_UART_CTS[] = {
279279
{PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
280280
{PA_11, USART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)},
281281
{PB_13, USART3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)},
@@ -292,9 +292,9 @@ const PinMap PinMap_UART_CTS[] = {
292292
//*** SPI ***
293293

294294
#ifdef HAL_SPI_MODULE_ENABLED
295-
const PinMap PinMap_SPI_MOSI[] = {
295+
WEAK const PinMap PinMap_SPI_MOSI[] = {
296296
{PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
297-
{PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
297+
// {PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
298298
{PB_5, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
299299
{PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
300300
{PC_3, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -304,9 +304,9 @@ const PinMap PinMap_SPI_MOSI[] = {
304304
#endif
305305

306306
#ifdef HAL_SPI_MODULE_ENABLED
307-
const PinMap PinMap_SPI_MISO[] = {
307+
WEAK const PinMap PinMap_SPI_MISO[] = {
308308
{PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
309-
{PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
309+
// {PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
310310
{PB_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
311311
{PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
312312
{PC_2, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -316,9 +316,9 @@ const PinMap PinMap_SPI_MISO[] = {
316316
#endif
317317

318318
#ifdef HAL_SPI_MODULE_ENABLED
319-
const PinMap PinMap_SPI_SCLK[] = {
319+
WEAK const PinMap PinMap_SPI_SCLK[] = {
320320
{PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
321-
{PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
321+
// {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
322322
{PB_3, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
323323
{PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
324324
{PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -328,10 +328,10 @@ const PinMap PinMap_SPI_SCLK[] = {
328328
#endif
329329

330330
#ifdef HAL_SPI_MODULE_ENABLED
331-
const PinMap PinMap_SPI_SSEL[] = {
331+
WEAK const PinMap PinMap_SPI_SSEL[] = {
332332
{PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
333-
{PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
334-
{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
333+
// {PA_4, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
334+
// {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
335335
{PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
336336
{PB_9, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
337337
{PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
@@ -342,7 +342,7 @@ const PinMap PinMap_SPI_SSEL[] = {
342342
//*** CAN ***
343343

344344
#ifdef HAL_CAN_MODULE_ENABLED
345-
const PinMap PinMap_CAN_RD[] = {
345+
WEAK const PinMap PinMap_CAN_RD[] = {
346346
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
347347
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
348348
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -353,7 +353,7 @@ const PinMap PinMap_CAN_RD[] = {
353353
#endif
354354

355355
#ifdef HAL_CAN_MODULE_ENABLED
356-
const PinMap PinMap_CAN_TD[] = {
356+
WEAK const PinMap PinMap_CAN_TD[] = {
357357
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
358358
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
359359
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -366,7 +366,7 @@ const PinMap PinMap_CAN_TD[] = {
366366
//*** ETHERNET ***
367367

368368
#ifdef HAL_ETH_MODULE_ENABLED
369-
const PinMap PinMap_Ethernet[] = {
369+
WEAK const PinMap PinMap_Ethernet[] = {
370370
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
371371
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK|ETH_RX_CLK
372372
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
@@ -401,7 +401,7 @@ const PinMap PinMap_Ethernet[] = {
401401
//*** USB ***
402402

403403
#ifdef HAL_PCD_MODULE_ENABLED
404-
const PinMap PinMap_USB_OTG_FS[] = {
404+
WEAK const PinMap PinMap_USB_OTG_FS[] = {
405405
// {PA_8, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
406406
// {PA_9, USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
407407
// {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
@@ -412,7 +412,7 @@ const PinMap PinMap_USB_OTG_FS[] = {
412412
#endif
413413

414414
#ifdef HAL_PCD_MODULE_ENABLED
415-
const PinMap PinMap_USB_OTG_HS[] = {
415+
WEAK const PinMap PinMap_USB_OTG_HS[] = {
416416
#ifdef USE_USB_HS_IN_FS
417417
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
418418
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID

0 commit comments

Comments
 (0)