Skip to content

Commit ea98e3c

Browse files
fpistmfpistm
committed
chore(variants): update custom peripheral pin mapping
to accommodate last changes done. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 374c342 commit ea98e3c

46 files changed

Lines changed: 140 additions & 145 deletions

File tree

Some content is hidden

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

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
342342
#ifdef HAL_ETH_MODULE_ENABLED
343343
WEAK const PinMap PinMap_Ethernet[] = {
344344
// {PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
345-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
346-
// {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
345+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
347346
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
348347
// {PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
349-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
350-
// {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
348+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
351349
// {PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
352350
// {PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
353351
// {PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -387,8 +385,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
387385

388386
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
389387
WEAK const PinMap PinMap_USB_OTG_HS[] = {
390-
#ifdef USE_USB_HS_IN_FS
391388
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
389+
#ifdef USE_USB_HS_IN_FS
392390
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
393391
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_VBUS
394392
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

‎variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
313313

314314
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
315315
WEAK const PinMap PinMap_USB_OTG_HS[] = {
316-
#ifdef USE_USB_HS_IN_FS
317316
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
317+
#ifdef USE_USB_HS_IN_FS
318318
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
319319
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
320320
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

‎variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_MICROMOD_F405.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
313313

314314
#ifdef HAL_PCD_MODULE_ENABLED
315315
WEAK const PinMap PinMap_USB_OTG_HS[] = {
316-
#ifdef USE_USB_HS_IN_FS
317316
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
317+
#ifdef USE_USB_HS_IN_FS
318318
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
319319
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
320320
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
{PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
{PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
{PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
{PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
{PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
{PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
{PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
{PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
{PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
{PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
{PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
{PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
{PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
{PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
{PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
{PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
{PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
{PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
{PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
{PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
{PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
{PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
{PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
{PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
// {PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
// {PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
// {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
// {PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
// {PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
// {PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
// {PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
// {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
// {PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
// {PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
// {PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
// {PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
// {PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
// {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
// {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
// {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -322,12 +322,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
322322
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
323323
WEAK const PinMap PinMap_Ethernet[] = {
324324
// {PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
325-
// {PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
326-
// {PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
325+
// {PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
327326
// {PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
328327
// {PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
329-
// {PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
330-
// {PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
328+
// {PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
331329
// {PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
332330
// {PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
333331
// {PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -363,8 +361,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
363361

364362
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
365363
WEAK const PinMap PinMap_USB_OTG_HS[] = {
366-
#ifdef USE_USB_HS_IN_FS
367364
// {PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
365+
#ifdef USE_USB_HS_IN_FS
368366
// {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
369367
// {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
370368
// {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

‎variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,10 @@ WEAK const PinMap PinMap_CAN_TD[] = {
342342
#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
343343
WEAK const PinMap PinMap_Ethernet[] = {
344344
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS
345-
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK
346-
{PA_1_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_CLK
345+
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_REF_CLK | ETH_RX_CLK
347346
{PA_2, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_MDIO
348347
{PA_3, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_COL
349-
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV
350-
{PA_7_ALT1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RX_DV
348+
{PA_7, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_CRS_DV | ETH_RX_DV
351349
{PB_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD2
352350
{PB_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_RXD3
353351
{PB_5, ETH, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
@@ -387,8 +385,8 @@ WEAK const PinMap PinMap_USB_OTG_FS[] = {
387385

388386
#if defined(HAL_PCD_MODULE_ENABLED) || defined(HAL_HCD_MODULE_ENABLED)
389387
WEAK const PinMap PinMap_USB_OTG_HS[] = {
390-
#ifdef USE_USB_HS_IN_FS
391388
{PA_4, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
389+
#ifdef USE_USB_HS_IN_FS
392390
{PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
393391
{PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, LL_GPIO_PULL_NO, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
394392
{PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM

0 commit comments

Comments
 (0)