Skip to content

Commit 70006da

Browse files
fpistmfpistm
authored
Merge pull request #2045 from fpistm/sd_pinmap_arrays
Sd pinmap arrays
2 parents 0dbef76 + b0acf0b commit 70006da

File tree

453 files changed

+23618
-6224
lines changed

Some content is hidden

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

453 files changed

+23618
-6224
lines changed

‎CI/update/stm32variant.py‎

Lines changed: 249 additions & 115 deletions
Large diffs are not rendered by default.

‎cores/arduino/stm32/PeripheralPins.h‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,20 @@ extern const PinMap PinMap_USB_OTG_FS[];
100100
extern const PinMap PinMap_USB_OTG_HS[];
101101

102102
//*** SD ***
103-
extern const PinMap PinMap_SD[];
103+
extern const PinMap PinMap_SD_CMD[];
104+
extern const PinMap PinMap_SD_CK[];
105+
extern const PinMap PinMap_SD_DATA0[];
106+
extern const PinMap PinMap_SD_DATA1[];
107+
extern const PinMap PinMap_SD_DATA2[];
108+
extern const PinMap PinMap_SD_DATA3[];
109+
extern const PinMap PinMap_SD_DATA4[];
110+
extern const PinMap PinMap_SD_DATA5[];
111+
extern const PinMap PinMap_SD_DATA6[];
112+
extern const PinMap PinMap_SD_DATA7[];
113+
extern const PinMap PinMap_SD_CKIN[];
114+
extern const PinMap PinMap_SD_CDIR[];
115+
extern const PinMap PinMap_SD_D0DIR[];
116+
extern const PinMap PinMap_SD_D123DIR[];
117+
104118
#endif
105119

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

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,19 +299,73 @@ WEAK const PinMap PinMap_USB[] = {
299299
//*** SD ***
300300

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

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

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

Lines changed: 64 additions & 9 deletions
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 */

‎variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,19 +296,73 @@ WEAK const PinMap PinMap_USB[] = {
296296
//*** SD ***
297297

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

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

‎variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c‎

Lines changed: 63 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,19 +307,73 @@ WEAK const PinMap PinMap_USB[] = {
307307
//*** SD ***
308308

309309
#ifdef HAL_SD_MODULE_ENABLED
310-
WEAK const PinMap PinMap_SD[] = {
311-
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
312-
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
313-
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
314-
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
315-
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
316-
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
310+
WEAK const PinMap PinMap_SD_CMD[] = {
311+
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
312+
{NC, NP, 0}
313+
};
314+
#endif
315+
316+
#ifdef HAL_SD_MODULE_ENABLED
317+
WEAK const PinMap PinMap_SD_CK[] = {
318+
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
319+
{NC, NP, 0}
320+
};
321+
#endif
322+
323+
#ifdef HAL_SD_MODULE_ENABLED
324+
WEAK const PinMap PinMap_SD_DATA0[] = {
325+
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
326+
{NC, NP, 0}
327+
};
328+
#endif
329+
330+
#ifdef HAL_SD_MODULE_ENABLED
331+
WEAK const PinMap PinMap_SD_DATA1[] = {
332+
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
333+
{NC, NP, 0}
334+
};
335+
#endif
336+
337+
#ifdef HAL_SD_MODULE_ENABLED
338+
WEAK const PinMap PinMap_SD_DATA2[] = {
317339
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
340+
{NC, NP, 0}
341+
};
342+
#endif
343+
344+
#ifdef HAL_SD_MODULE_ENABLED
345+
WEAK const PinMap PinMap_SD_DATA3[] = {
318346
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
319-
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
320-
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
321347
{NC, NP, 0}
322348
};
323349
#endif
324350

351+
#ifdef HAL_SD_MODULE_ENABLED
352+
WEAK const PinMap PinMap_SD_DATA4[] = {
353+
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
354+
{NC, NP, 0}
355+
};
356+
#endif
357+
358+
#ifdef HAL_SD_MODULE_ENABLED
359+
WEAK const PinMap PinMap_SD_DATA5[] = {
360+
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
361+
{NC, NP, 0}
362+
};
363+
#endif
364+
365+
#ifdef HAL_SD_MODULE_ENABLED
366+
WEAK const PinMap PinMap_SD_DATA6[] = {
367+
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
368+
{NC, NP, 0}
369+
};
370+
#endif
371+
372+
#ifdef HAL_SD_MODULE_ENABLED
373+
WEAK const PinMap PinMap_SD_DATA7[] = {
374+
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
375+
{NC, NP, 0}
376+
};
377+
#endif
378+
325379
#endif /* !CUSTOM_PERIPHERAL_PINS */

0 commit comments

Comments
 (0)