Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Sd pinmap arrays#2045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
fpistm merged 5 commits intostm32duino:mainfromfpistm:sd_pinmap_arrays
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
364 changes: 249 additions & 115 deletionsCI/update/stm32variant.py
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletioncores/arduino/stm32/PeripheralPins.h
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,6 +100,20 @@ extern const PinMap PinMap_USB_OTG_FS[];
extern const PinMap PinMap_USB_OTG_HS[];

//*** SD ***
extern const PinMap PinMap_SD[];
extern const PinMap PinMap_SD_CMD[];
extern const PinMap PinMap_SD_CK[];
extern const PinMap PinMap_SD_DATA0[];
extern const PinMap PinMap_SD_DATA1[];
extern const PinMap PinMap_SD_DATA2[];
extern const PinMap PinMap_SD_DATA3[];
extern const PinMap PinMap_SD_DATA4[];
extern const PinMap PinMap_SD_DATA5[];
extern const PinMap PinMap_SD_DATA6[];
extern const PinMap PinMap_SD_DATA7[];
extern const PinMap PinMap_SD_CKIN[];
extern const PinMap PinMap_SD_CDIR[];
extern const PinMap PinMap_SD_D0DIR[];
extern const PinMap PinMap_SD_D123DIR[];

#endif

72 changes: 63 additions & 9 deletionsvariants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -299,19 +299,73 @@ WEAK const PinMap PinMap_USB[] = {
//*** SD ***

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD[]= {
{PB_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D4
{PB_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D5
{PC_6,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D6
{PC_7,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D7
{PC_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D0
{PC_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D1
WEAKconstPinMapPinMap_SD_CMD[]= {
{PD_2,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CMD
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_CK[]= {
{PC_12,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CK
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA0[]= {
{PC_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D0
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA1[]= {
{PC_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D1
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA2[]= {
{PC_10,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D2
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA3[]= {
{PC_11,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D3
{PC_12,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CK
{PD_2,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CMD
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA4[]= {
{PB_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D4
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA5[]= {
{PB_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D5
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA6[]= {
{PC_6,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D6
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA7[]= {
{PC_7,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D7
{NC,NP,0}
};
#endif

#endif/* !CUSTOM_PERIPHERAL_PINS */
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -297,19 +297,74 @@ WEAK const PinMap PinMap_USB[] = {
//*** SD ***

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD[] = {
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
WEAK const PinMap PinMap_SD_CMD[] = {
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_CK[] = {
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA0[] = {
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA1[] = {
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA2[] = {
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA3[] = {
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA4[] = {
// {PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA5[] = {
// {PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA6[] = {
// {PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA7[] = {
// {PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
{NC, NP, 0}
};
#endif


#endif /* ARDUINO_STORM32_V1_31_RC */
72 changes: 63 additions & 9 deletionsvariants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -296,19 +296,73 @@ WEAK const PinMap PinMap_USB[] = {
//*** SD ***

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD[]= {
{PB_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D4
{PB_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D5
{PC_6,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D6
{PC_7,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D7
{PC_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D0
{PC_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D1
WEAKconstPinMapPinMap_SD_CMD[]= {
{PD_2,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CMD
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_CK[]= {
{PC_12,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CK
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA0[]= {
{PC_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D0
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA1[]= {
{PC_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D1
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA2[]= {
{PC_10,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D2
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA3[]= {
{PC_11,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D3
{PC_12,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CK
{PD_2,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_NOPULL,AFIO_NONE)},// SDIO_CMD
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA4[]= {
{PB_8,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D4
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA5[]= {
{PB_9,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D5
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA6[]= {
{PC_6,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D6
{NC,NP,0}
};
#endif

#ifdefHAL_SD_MODULE_ENABLED
WEAKconstPinMapPinMap_SD_DATA7[]= {
{PC_7,SDIO,STM_PIN_DATA(STM_MODE_AF_PP,GPIO_PULLUP,AFIO_NONE)},// SDIO_D7
{NC,NP,0}
};
#endif

#endif/* !CUSTOM_PERIPHERAL_PINS */
72 changes: 63 additions & 9 deletionsvariants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -307,19 +307,73 @@ WEAK const PinMap PinMap_USB[] = {
//*** SD ***

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD[] = {
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
WEAK const PinMap PinMap_SD_CMD[] = {
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_CK[] = {
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA0[] = {
{PC_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D0
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA1[] = {
{PC_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D1
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA2[] = {
{PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D2
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA3[] = {
{PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D3
{PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CK
{PD_2, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)}, // SDIO_CMD
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA4[] = {
{PB_8, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D4
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA5[] = {
{PB_9, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D5
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA6[] = {
{PC_6, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D6
{NC, NP, 0}
};
#endif

#ifdef HAL_SD_MODULE_ENABLED
WEAK const PinMap PinMap_SD_DATA7[] = {
{PC_7, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, AFIO_NONE)}, // SDIO_D7
{NC, NP, 0}
};
#endif

#endif /* !CUSTOM_PERIPHERAL_PINS */
Loading
[8]ページ先頭
©2009-2025 Movatter.jp