Skip to content

Commit 7268818

Browse files
committed
variant: update custom files with HAL legacy module definitions
Signed-off-by: Frederic Pillon <[email protected]>
1 parent edfff68 commit 7268818

File tree

32 files changed

+59
-59
lines changed

32 files changed

+59
-59
lines changed

variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,15 +217,15 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
217217

218218
//*** CAN ***
219219

220-
#ifdef HAL_CAN_MODULE_ENABLED
220+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
221221
WEAK const PinMap PinMap_CAN_RD[] = {
222222
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
223223
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
224224
{NC, NP, 0}
225225
};
226226
#endif
227227

228-
#ifdef HAL_CAN_MODULE_ENABLED
228+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
229229
WEAK const PinMap PinMap_CAN_TD[] = {
230230
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
231231
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},

variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,15 +236,15 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
236236

237237
//*** CAN ***
238238

239-
#ifdef HAL_CAN_MODULE_ENABLED
239+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
240240
WEAK const PinMap PinMap_CAN_RD[] = {
241241
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
242242
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
243243
{NC, NP, 0}
244244
};
245245
#endif
246246

247-
#ifdef HAL_CAN_MODULE_ENABLED
247+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
248248
WEAK const PinMap PinMap_CAN_TD[] = {
249249
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
250250
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},

variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,15 +211,15 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
211211

212212
//*** CAN ***
213213

214-
#ifdef HAL_CAN_MODULE_ENABLED
214+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
215215
WEAK const PinMap PinMap_CAN_RD[] = {
216216
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
217217
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
218218
{NC, NP, 0}
219219
};
220220
#endif
221221

222-
#ifdef HAL_CAN_MODULE_ENABLED
222+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
223223
WEAK const PinMap PinMap_CAN_TD[] = {
224224
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
225225
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},

variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,15 +264,15 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
264264

265265
//*** CAN ***
266266

267-
#ifdef HAL_CAN_MODULE_ENABLED
267+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
268268
WEAK const PinMap PinMap_CAN_RD[] = {
269269
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
270270
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
271271
{NC, NP, 0}
272272
};
273273
#endif
274274

275-
#ifdef HAL_CAN_MODULE_ENABLED
275+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
276276
WEAK const PinMap PinMap_CAN_TD[] = {
277277
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
278278
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},

variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins_NUCLEO_F207ZG.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
315315

316316
//*** CAN ***
317317

318-
#ifdef HAL_CAN_MODULE_ENABLED
318+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
319319
WEAK const PinMap PinMap_CAN_RD[] = {
320320
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
321321
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
326326
};
327327
#endif
328328

329-
#ifdef HAL_CAN_MODULE_ENABLED
329+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
330330
WEAK const PinMap PinMap_CAN_TD[] = {
331331
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
332332
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},

variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,15 +251,15 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
251251

252252
//*** CAN ***
253253

254-
#ifdef HAL_CAN_MODULE_ENABLED
254+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
255255
WEAK const PinMap PinMap_CAN_RD[] = {
256256
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // USB_DM
257257
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
258258
{NC, NP, 0}
259259
};
260260
#endif
261261

262-
#ifdef HAL_CAN_MODULE_ENABLED
262+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
263263
WEAK const PinMap PinMap_CAN_TD[] = {
264264
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // USB_DP
265265
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},

variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
274274

275275
//*** CAN ***
276276

277-
#ifdef HAL_CAN_MODULE_ENABLED
277+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
278278
WEAK const PinMap PinMap_CAN_RD[] = {
279279
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
280280
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -284,7 +284,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
284284
};
285285
#endif
286286

287-
#ifdef HAL_CAN_MODULE_ENABLED
287+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
288288
WEAK const PinMap PinMap_CAN_TD[] = {
289289
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
290290
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},

variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
295295

296296
//*** CAN ***
297297

298-
#ifdef HAL_CAN_MODULE_ENABLED
298+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
299299
WEAK const PinMap PinMap_CAN_RD[] = {
300300
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
301301
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
306306
};
307307
#endif
308308

309-
#ifdef HAL_CAN_MODULE_ENABLED
309+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
310310
WEAK const PinMap PinMap_CAN_TD[] = {
311311
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
312312
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},

variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
295295

296296
//*** CAN ***
297297

298-
#ifdef HAL_CAN_MODULE_ENABLED
298+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
299299
WEAK const PinMap PinMap_CAN_RD[] = {
300300
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
301301
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
306306
};
307307
#endif
308308

309-
#ifdef HAL_CAN_MODULE_ENABLED
309+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
310310
WEAK const PinMap PinMap_CAN_TD[] = {
311311
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
312312
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},

variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
295295

296296
//*** CAN ***
297297

298-
#ifdef HAL_CAN_MODULE_ENABLED
298+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
299299
WEAK const PinMap PinMap_CAN_RD[] = {
300300
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
301301
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
306306
};
307307
#endif
308308

309-
#ifdef HAL_CAN_MODULE_ENABLED
309+
#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
310310
WEAK const PinMap PinMap_CAN_TD[] = {
311311
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
312312
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},

0 commit comments

Comments
 (0)