Skip to content

Commit b0acf0b

Browse files
fpistmfpistm
committed
variants: update dedicated with new SD pinmap arrays
Signed-off-by: Frederic Pillon <[email protected]>
1 parent 1567d90 commit b0acf0b

File tree

40 files changed

+3006
-596
lines changed

40 files changed

+3006
-596
lines changed

Diff for: ‎variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c

+64-9
Original file line numberDiff line numberDiff line change
@@ -297,19 +297,74 @@ WEAK const PinMap PinMap_USB[] = {
297297
//*** SD ***
298298

299299
#ifdef HAL_SD_MODULE_ENABLED
300-
WEAK const PinMap PinMap_SD[] = {
301-
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
302-
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
303-
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
304-
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
305-
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
306-
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
300+
WEAK const PinMap PinMap_SD_CMD[] = {
301+
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
302+
{NC, NP, 0}
303+
};
304+
#endif
305+
306+
#ifdef HAL_SD_MODULE_ENABLED
307+
WEAK const PinMap PinMap_SD_CK[] = {
308+
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
309+
{NC, NP, 0}
310+
};
311+
#endif
312+
313+
#ifdef HAL_SD_MODULE_ENABLED
314+
WEAK const PinMap PinMap_SD_DATA0[] = {
315+
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
316+
{NC, NP, 0}
317+
};
318+
#endif
319+
320+
#ifdef HAL_SD_MODULE_ENABLED
321+
WEAK const PinMap PinMap_SD_DATA1[] = {
322+
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
323+
{NC, NP, 0}
324+
};
325+
#endif
326+
327+
#ifdef HAL_SD_MODULE_ENABLED
328+
WEAK const PinMap PinMap_SD_DATA2[] = {
307329
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
330+
{NC, NP, 0}
331+
};
332+
#endif
333+
334+
#ifdef HAL_SD_MODULE_ENABLED
335+
WEAK const PinMap PinMap_SD_DATA3[] = {
308336
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
309-
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
310-
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
311337
{NC, NP, 0}
312338
};
313339
#endif
314340

341+
#ifdef HAL_SD_MODULE_ENABLED
342+
WEAK const PinMap PinMap_SD_DATA4[] = {
343+
// {PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
344+
{NC, NP, 0}
345+
};
346+
#endif
347+
348+
#ifdef HAL_SD_MODULE_ENABLED
349+
WEAK const PinMap PinMap_SD_DATA5[] = {
350+
// {PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
351+
{NC, NP, 0}
352+
};
353+
#endif
354+
355+
#ifdef HAL_SD_MODULE_ENABLED
356+
WEAK const PinMap PinMap_SD_DATA6[] = {
357+
// {PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
358+
{NC, NP, 0}
359+
};
360+
#endif
361+
362+
#ifdef HAL_SD_MODULE_ENABLED
363+
WEAK const PinMap PinMap_SD_DATA7[] = {
364+
// {PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
365+
{NC, NP, 0}
366+
};
367+
#endif
368+
369+
315370
#endif /* ARDUINO_STORM32_V1_31_RC */

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

+64-9
Original file line numberDiff line numberDiff line change
@@ -414,18 +414,73 @@ WEAK const PinMap PinMap_USB_OTG_HS[] = {
414414
//*** SD ***
415415

416416
#ifdef HAL_SD_MODULE_ENABLED
417-
WEAK const PinMap PinMap_SD[] = {
418-
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
419-
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
420-
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
421-
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
422-
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
423-
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
417+
WEAK const PinMap PinMap_SD_CMD[] = {
418+
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
419+
{NC, NP, 0}
420+
};
421+
#endif
422+
423+
#ifdef HAL_SD_MODULE_ENABLED
424+
WEAK const PinMap PinMap_SD_CK[] = {
425+
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
426+
{NC, NP, 0}
427+
};
428+
#endif
429+
430+
#ifdef HAL_SD_MODULE_ENABLED
431+
WEAK const PinMap PinMap_SD_DATA0[] = {
432+
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
433+
{NC, NP, 0}
434+
};
435+
#endif
436+
437+
#ifdef HAL_SD_MODULE_ENABLED
438+
WEAK const PinMap PinMap_SD_DATA1[] = {
439+
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
440+
{NC, NP, 0}
441+
};
442+
#endif
443+
444+
#ifdef HAL_SD_MODULE_ENABLED
445+
WEAK const PinMap PinMap_SD_DATA2[] = {
424446
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
447+
{NC, NP, 0}
448+
};
449+
#endif
450+
451+
#ifdef HAL_SD_MODULE_ENABLED
452+
WEAK const PinMap PinMap_SD_DATA3[] = {
425453
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
426-
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
427-
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
428454
{NC, NP, 0}
429455
};
430456
#endif
457+
458+
#ifdef HAL_SD_MODULE_ENABLED
459+
WEAK const PinMap PinMap_SD_DATA4[] = {
460+
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
461+
{NC, NP, 0}
462+
};
463+
#endif
464+
465+
#ifdef HAL_SD_MODULE_ENABLED
466+
WEAK const PinMap PinMap_SD_DATA5[] = {
467+
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
468+
{NC, NP, 0}
469+
};
470+
#endif
471+
472+
#ifdef HAL_SD_MODULE_ENABLED
473+
WEAK const PinMap PinMap_SD_DATA6[] = {
474+
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
475+
{NC, NP, 0}
476+
};
477+
#endif
478+
479+
#ifdef HAL_SD_MODULE_ENABLED
480+
WEAK const PinMap PinMap_SD_DATA7[] = {
481+
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
482+
{NC, NP, 0}
483+
};
484+
#endif
485+
431486
#endif /* ARDUINO_GENERIC_* */

Diff for: ‎variants/STM32F4xx/F401R(B-C-D-E)T/PeripheralPins_CoreBoard_F401RC.c

+63-9
Original file line numberDiff line numberDiff line change
@@ -238,19 +238,73 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
238238
//*** SD ***
239239

240240
#ifdef HAL_SD_MODULE_ENABLED
241-
WEAK const PinMap PinMap_SD[] = {
242-
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
243-
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
244-
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
245-
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
246-
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
247-
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
241+
WEAK const PinMap PinMap_SD_CMD[] = {
242+
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
243+
{NC, NP, 0}
244+
};
245+
#endif
246+
247+
#ifdef HAL_SD_MODULE_ENABLED
248+
WEAK const PinMap PinMap_SD_CK[] = {
249+
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
250+
{NC, NP, 0}
251+
};
252+
#endif
253+
254+
#ifdef HAL_SD_MODULE_ENABLED
255+
WEAK const PinMap PinMap_SD_DATA0[] = {
256+
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
257+
{NC, NP, 0}
258+
};
259+
#endif
260+
261+
#ifdef HAL_SD_MODULE_ENABLED
262+
WEAK const PinMap PinMap_SD_DATA1[] = {
263+
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
264+
{NC, NP, 0}
265+
};
266+
#endif
267+
268+
#ifdef HAL_SD_MODULE_ENABLED
269+
WEAK const PinMap PinMap_SD_DATA2[] = {
248270
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
271+
{NC, NP, 0}
272+
};
273+
#endif
274+
275+
#ifdef HAL_SD_MODULE_ENABLED
276+
WEAK const PinMap PinMap_SD_DATA3[] = {
249277
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
250-
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
251-
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
252278
{NC, NP, 0}
253279
};
254280
#endif
255281

282+
#ifdef HAL_SD_MODULE_ENABLED
283+
WEAK const PinMap PinMap_SD_DATA4[] = {
284+
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
285+
{NC, NP, 0}
286+
};
287+
#endif
288+
289+
#ifdef HAL_SD_MODULE_ENABLED
290+
WEAK const PinMap PinMap_SD_DATA5[] = {
291+
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
292+
{NC, NP, 0}
293+
};
294+
#endif
295+
296+
#ifdef HAL_SD_MODULE_ENABLED
297+
WEAK const PinMap PinMap_SD_DATA6[] = {
298+
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
299+
{NC, NP, 0}
300+
};
301+
#endif
302+
303+
#ifdef HAL_SD_MODULE_ENABLED
304+
WEAK const PinMap PinMap_SD_DATA7[] = {
305+
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
306+
{NC, NP, 0}
307+
};
308+
#endif
309+
256310
#endif /* ARDUINO_CoreBoard_F401RC */

Diff for: ‎variants/STM32F4xx/F401V(B-C-D-E)T/PeripheralPins_ST3DP001_EVAL.c

+63-9
Original file line numberDiff line numberDiff line change
@@ -265,19 +265,73 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
265265
//*** SD ***
266266

267267
#ifdef HAL_SD_MODULE_ENABLED
268-
WEAK const PinMap PinMap_SD[] = {
269-
// {PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
270-
// {PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
271-
// {PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
272-
// {PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
273-
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
274-
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
268+
WEAK const PinMap PinMap_SD_CMD[] = {
269+
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
270+
{NC, NP, 0}
271+
};
272+
#endif
273+
274+
#ifdef HAL_SD_MODULE_ENABLED
275+
WEAK const PinMap PinMap_SD_CK[] = {
276+
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
277+
{NC, NP, 0}
278+
};
279+
#endif
280+
281+
#ifdef HAL_SD_MODULE_ENABLED
282+
WEAK const PinMap PinMap_SD_DATA0[] = {
283+
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0
284+
{NC, NP, 0}
285+
};
286+
#endif
287+
288+
#ifdef HAL_SD_MODULE_ENABLED
289+
WEAK const PinMap PinMap_SD_DATA1[] = {
290+
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1
291+
{NC, NP, 0}
292+
};
293+
#endif
294+
295+
#ifdef HAL_SD_MODULE_ENABLED
296+
WEAK const PinMap PinMap_SD_DATA2[] = {
275297
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2
298+
{NC, NP, 0}
299+
};
300+
#endif
301+
302+
#ifdef HAL_SD_MODULE_ENABLED
303+
WEAK const PinMap PinMap_SD_DATA3[] = {
276304
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3
277-
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK
278-
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD
279305
{NC, NP, 0}
280306
};
281307
#endif
282308

309+
#ifdef HAL_SD_MODULE_ENABLED
310+
WEAK const PinMap PinMap_SD_DATA4[] = {
311+
// {PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4
312+
{NC, NP, 0}
313+
};
314+
#endif
315+
316+
#ifdef HAL_SD_MODULE_ENABLED
317+
WEAK const PinMap PinMap_SD_DATA5[] = {
318+
// {PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5
319+
{NC, NP, 0}
320+
};
321+
#endif
322+
323+
#ifdef HAL_SD_MODULE_ENABLED
324+
WEAK const PinMap PinMap_SD_DATA6[] = {
325+
// {PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6
326+
{NC, NP, 0}
327+
};
328+
#endif
329+
330+
#ifdef HAL_SD_MODULE_ENABLED
331+
WEAK const PinMap PinMap_SD_DATA7[] = {
332+
// {PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7
333+
{NC, NP, 0}
334+
};
335+
#endif
336+
283337
#endif /* ARDUINO_ST3DP001_EVAL */

0 commit comments

Comments
 (0)