From 52496870c57486bb0cc3cc38889ef9866b9476c5 Mon Sep 17 00:00:00 2001 From: rusefi Date: Fri, 10 May 2019 19:34:28 -0400 Subject: [PATCH] USB pins are not registered in pin_repository #797 --- firmware/config/boards/nucleo_f746/board.h | 47 ++++++++++++---------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/firmware/config/boards/nucleo_f746/board.h b/firmware/config/boards/nucleo_f746/board.h index 30c8061e0c..f381d05554 100644 --- a/firmware/config/boards/nucleo_f746/board.h +++ b/firmware/config/boards/nucleo_f746/board.h @@ -36,6 +36,11 @@ #define BOARD_ST_NUCLEO144_F746ZI #define BOARD_NAME "STM32 Nucleo144-F746ZI for RusEFI" +#define EFI_USB_AF 10U +#define EFI_USB_SERIAL_ID GPIOA_10 +#define EFI_USB_SERIAL_DM GPIOA_11 +#define EFI_USB_SERIAL_DP GPIOA_12 + /* * Ethernet PHY type. */ @@ -91,9 +96,9 @@ #define GPIOA_RMII_RX_DV 7U #define GPIOA_USB_SOF 8U #define GPIOA_USB_VBUS 9U -#define GPIOA_USB_ID 10U -#define GPIOA_USB_DM 11U -#define GPIOA_USB_DP 12U +#define GPIOG_PIN10 10U +#define GPIOG_PIN11 11U +#define GPIOG_PIN12 12U #define GPIOA_SWDIO 13U #define GPIOA_SWCLK 14U #define GPIOA_ZIO_D20 15U @@ -590,9 +595,9 @@ PIN_MODE_ALTERNATE(GPIOA_ARD_D11) | \ PIN_MODE_ALTERNATE(GPIOA_USB_SOF) | \ PIN_MODE_ANALOG(GPIOA_USB_VBUS) | \ - PIN_MODE_ALTERNATE(GPIOA_USB_ID) | \ - PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \ - PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \ + PIN_MODE_OUTPUT(GPIOG_PIN10) | \ + PIN_MODE_OUTPUT(GPIOG_PIN11) | \ + PIN_MODE_OUTPUT(GPIOG_PIN12) | \ PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \ PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \ PIN_MODE_INPUT(GPIOA_ZIO_D20)) @@ -606,9 +611,9 @@ PIN_OTYPE_PUSHPULL(GPIOA_ARD_D11) | \ PIN_OTYPE_PUSHPULL(GPIOA_USB_SOF) | \ PIN_OTYPE_PUSHPULL(GPIOA_USB_VBUS) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USB_ID) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USB_DM) | \ - PIN_OTYPE_PUSHPULL(GPIOA_USB_DP) | \ + PIN_OTYPE_PUSHPULL(GPIOG_PIN10) | \ + PIN_OTYPE_PUSHPULL(GPIOG_PIN11) | \ + PIN_OTYPE_PUSHPULL(GPIOG_PIN12) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \ PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \ PIN_OTYPE_PUSHPULL(GPIOA_ZIO_D20)) @@ -622,9 +627,9 @@ PIN_OSPEED_HIGH(GPIOA_ARD_D11) | \ PIN_OSPEED_HIGH(GPIOA_USB_SOF) | \ PIN_OSPEED_HIGH(GPIOA_USB_VBUS) | \ - PIN_OSPEED_HIGH(GPIOA_USB_ID) | \ - PIN_OSPEED_HIGH(GPIOA_USB_DM) | \ - PIN_OSPEED_HIGH(GPIOA_USB_DP) | \ + PIN_OSPEED_HIGH(GPIOG_PIN10) | \ + PIN_OSPEED_HIGH(GPIOG_PIN11) | \ + PIN_OSPEED_HIGH(GPIOG_PIN12) | \ PIN_OSPEED_HIGH(GPIOA_SWDIO) | \ PIN_OSPEED_HIGH(GPIOA_SWCLK) | \ PIN_OSPEED_HIGH(GPIOA_ZIO_D20)) @@ -638,9 +643,9 @@ PIN_PUPDR_PULLUP(GPIOA_ARD_D11) | \ PIN_PUPDR_FLOATING(GPIOA_USB_SOF) | \ PIN_PUPDR_FLOATING(GPIOA_USB_VBUS) | \ - PIN_PUPDR_FLOATING(GPIOA_USB_ID) | \ - PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \ - PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \ + PIN_PUPDR_FLOATING(GPIOG_PIN10) | \ + PIN_PUPDR_FLOATING(GPIOG_PIN11) | \ + PIN_PUPDR_FLOATING(GPIOG_PIN12) | \ PIN_PUPDR_FLOATING(GPIOA_SWDIO) | \ PIN_PUPDR_FLOATING(GPIOA_SWCLK) | \ PIN_PUPDR_PULLUP(GPIOA_ZIO_D20)) @@ -654,9 +659,9 @@ PIN_ODR_HIGH(GPIOA_ARD_D11) | \ PIN_ODR_HIGH(GPIOA_USB_SOF) | \ PIN_ODR_HIGH(GPIOA_USB_VBUS) | \ - PIN_ODR_HIGH(GPIOA_USB_ID) | \ - PIN_ODR_HIGH(GPIOA_USB_DM) | \ - PIN_ODR_HIGH(GPIOA_USB_DP) | \ + PIN_ODR_HIGH(GPIOG_PIN10) | \ + PIN_ODR_HIGH(GPIOG_PIN11) | \ + PIN_ODR_HIGH(GPIOG_PIN12) | \ PIN_ODR_HIGH(GPIOA_SWDIO) | \ PIN_ODR_HIGH(GPIOA_SWCLK) | \ PIN_ODR_HIGH(GPIOA_ZIO_D20)) @@ -670,9 +675,9 @@ PIN_AFIO_AF(GPIOA_ARD_D11, 11U)) #define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_USB_SOF, 10U) | \ PIN_AFIO_AF(GPIOA_USB_VBUS, 0U) | \ - PIN_AFIO_AF(GPIOA_USB_ID, 10U) | \ - PIN_AFIO_AF(GPIOA_USB_DM, 10U) | \ - PIN_AFIO_AF(GPIOA_USB_DP, 10U) | \ + PIN_AFIO_AF(GPIOG_PIN10, 0U) | \ + PIN_AFIO_AF(GPIOG_PIN11, 0U) | \ + PIN_AFIO_AF(GPIOG_PIN12, 0U) | \ PIN_AFIO_AF(GPIOA_SWDIO, 0U) | \ PIN_AFIO_AF(GPIOA_SWCLK, 0U) | \ PIN_AFIO_AF(GPIOA_ZIO_D20, 0U))