Fix nucleo and crazyflie boards. (#2923)

* Fix nucleo board like #2898.

* Fix crazyflie board.
This commit is contained in:
Fabien-B
2022-10-11 16:31:59 +02:00
committed by GitHub
parent ea674de286
commit 45b020d678
5 changed files with 128 additions and 288 deletions
@@ -63,7 +63,7 @@ PA04 NRF_FLOW_CTRL INPUT FLOATING
PA05 E_SCK SPI AF:SPI1_SCK
PA06 E_MISO SPI AF:SPI1_MISO
PA07 E_MOSI SPI AF:SPI1_MOSI
PA08 IMU_SCL I2C AF:I2C3_SCL
PA08 I2C3_SCL I2C AF:I2C3_SCL
PA10 USB_ID OTG AF:USB_OTG_FS_ID
PA11 USB_DM OTG AF:USB_OTG_FS_DM
PA12 USB_DP OTG AF:USB_OTG_FS_DP
@@ -73,8 +73,8 @@ PB02 BOOT1 INPUT FLOATING
#PB03 STM_SW0 INPUT FLOATING FIXME in system section ?
PB04 E_CS1 INPUT FLOATING
PB05 E_CS2 INPUT FLOATING
PB06 E_SCL I2C AF:I2C1_SCL
PB07 E_SDA I2C AF:I2C1_SDA
PB06 I2C1_SCL I2C AF:I2C1_SCL # EXTERNAL
PB07 I2C1_SDA I2C AF:I2C1_SDA # EXTERNAL
PB08 E_CS3 INPUT FLOATING
PB09 MOTOR4 PWM AF:TIM4_CH4
PB11 MOTOR2 PWM AF:TIM2_CH4
@@ -87,7 +87,7 @@ PC02 LED_GREEN_R LED
PC03 LED_RED_R LED
PC06 NRF_TX UART AF:USART6_TX
PC07 NRF_RX UART AF:USART6_RX
PC09 IMU_SDA I2C AF:I2C3_SDA
PC09 I2C3_SDA I2C AF:I2C3_SDA
PC10 E_TX1 UART AF:USART3_TX
PC11 E_RX1 UART AF:USART3_RX
PC12 E_CS0 INPUT FLOATING
File diff suppressed because it is too large Load Diff
@@ -23,40 +23,40 @@
#ifndef USE_LED_1
#define USE_LED_1 1
#endif
#define LED_1_GPIO LED_RED_R_PORT
#define LED_1_GPIO_PIN LED_RED_R
#define LED_1_GPIO PAL_PORT(LED_RED_R)
#define LED_1_GPIO_PIN PAL_PAD(LED_RED_R)
#define LED_1_GPIO_ON gpio_clear
#define LED_1_GPIO_OFF gpio_set
#ifndef USE_LED_2
#define USE_LED_2 1
#endif
#define LED_2_GPIO LED_RED_L_PORT
#define LED_2_GPIO_PIN LED_RED_L
#define LED_2_GPIO PAL_PORT(LED_RED_L)
#define LED_2_GPIO_PIN PAL_PAD(LED_RED_L)
#define LED_2_GPIO_ON gpio_clear
#define LED_2_GPIO_OFF gpio_set
#ifndef USE_LED_3
#define USE_LED_3 1
#endif
#define LED_3_GPIO LED_GREEN_R_PORT
#define LED_3_GPIO_PIN LED_GREEN_R
#define LED_3_GPIO PAL_PORT(LED_GREEN_R)
#define LED_3_GPIO_PIN PAL_PAD(LED_GREEN_R)
#define LED_3_GPIO_ON gpio_clear
#define LED_3_GPIO_OFF gpio_set
#ifndef USE_LED_4
#define USE_LED_4 1
#endif
#define LED_4_GPIO LED_GREEN_L_PORT
#define LED_4_GPIO_PIN LED_GREEN_L
#define LED_4_GPIO PAL_PORT(LED_GREEN_L)
#define LED_4_GPIO_PIN PAL_PAD(LED_GREEN_L)
#define LED_4_GPIO_ON gpio_clear
#define LED_4_GPIO_OFF gpio_set
#ifndef USE_LED_5
#define USE_LED_5 1
#endif
#define LED_5_GPIO LED_BLUE_L_PORT
#define LED_5_GPIO_PIN LED_BLUE_L
#define LED_5_GPIO PAL_PORT(LED_BLUE_L)
#define LED_5_GPIO_PIN PAL_PAD(PAL_PAD(LED_BLUE_L))
#define LED_5_GPIO_ON gpio_set
#define LED_5_GPIO_OFF gpio_clear
@@ -77,8 +77,8 @@
#endif
#if USE_PWM1
#define PWM_SERVO_1 1
#define PWM_SERVO_1_GPIO MOTOR1_PORT
#define PWM_SERVO_1_PIN MOTOR1
#define PWM_SERVO_1_GPIO PAL_PORT(MOTOR1)
#define PWM_SERVO_1_PIN PAL_PAD(MOTOR1)
#define PWM_SERVO_1_AF AF_MOTOR1
#define PWM_SERVO_1_DRIVER PWMD2
#define PWM_SERVO_1_CHANNEL 1
@@ -90,8 +90,8 @@
#endif
#if USE_PWM2
#define PWM_SERVO_2 2
#define PWM_SERVO_2_GPIO MOTOR2_PORT
#define PWM_SERVO_2_PIN MOTOR2
#define PWM_SERVO_2_GPIO PAL_PORT(MOTOR2)
#define PWM_SERVO_2_PIN PAL_PAD(MOTOR2)
#define PWM_SERVO_2_AF AF_MOTOR2
#define PWM_SERVO_2_DRIVER PWMD2
#define PWM_SERVO_2_CHANNEL 3
@@ -103,8 +103,8 @@
#endif
#if USE_PWM3
#define PWM_SERVO_3 3
#define PWM_SERVO_3_GPIO MOTOR3_PORT
#define PWM_SERVO_3_PIN MOTOR3
#define PWM_SERVO_3_GPIO PAL_PORT(MOTOR3)
#define PWM_SERVO_3_PIN PAL_PAD(MOTOR3)
#define PWM_SERVO_3_AF AF_MOTOR3
#define PWM_SERVO_3_DRIVER PWMD2
#define PWM_SERVO_3_CHANNEL 0
@@ -116,8 +116,8 @@
#endif
#if USE_PWM4
#define PWM_SERVO_4 4
#define PWM_SERVO_4_GPIO MOTOR4_PORT
#define PWM_SERVO_4_PIN MOTOR4
#define PWM_SERVO_4_GPIO PAL_PORT(MOTOR4)
#define PWM_SERVO_4_PIN PAL_PAD(MOTOR4)
#define PWM_SERVO_4_AF AF_MOTOR4
#define PWM_SERVO_4_DRIVER PWMD4
#define PWM_SERVO_4_CHANNEL 3
@@ -143,10 +143,10 @@
/**
* UART2 E_TX2
*/
#define UART2_GPIO_PORT_TX E_TX2_PORT
#define UART2_GPIO_TX E_TX2
#define UART2_GPIO_PORT_RX E_RX2_PORT
#define UART2_GPIO_RX E_RX2
#define UART2_GPIO_PORT_TX PAL_PORT(E_TX2)
#define UART2_GPIO_TX PAL_PAD(E_TX2)
#define UART2_GPIO_PORT_RX PAL_PORT(E_RX2)
#define UART2_GPIO_RX PAL_PAD(E_RX2)
#define UART2_GPIO_AF AF_E_RX2
#ifndef UART2_HW_FLOW_CONTROL
#define UART2_HW_FLOW_CONTROL FALSE
@@ -155,21 +155,21 @@
/**
* UART3 E_TX1
*/
#define UART3_GPIO_PORT_TX E_TX1_PORT
#define UART3_GPIO_TX E_TX1
#define UART3_GPIO_PORT_RX E_RX1_PORT
#define UART3_GPIO_RX E_RX1
#define UART3_GPIO_PORT_TX PAL_PORT(E_TX1)
#define UART3_GPIO_TX PAL_PAD(E_TX1)
#define UART3_GPIO_PORT_RX PAL_PORT(E_RX1)
#define UART3_GPIO_RX PAL_PAD(E_RX1)
#define UART3_GPIO_AF AF_E_RX1
/**
* UART6 NRF
*/
#define UART6_GPIO_PORT_TX NRF_TX_PORT
#define UART6_GPIO_TX NRF_TX
#define UART6_GPIO_PORT_RX NRF_RX_PORT
#define UART6_GPIO_RX NRF_RX
#define UART6_GPIO_PORT_TX PAL_PORT(NRF_TX)
#define UART6_GPIO_TX PAL_PAD(NRF_TX)
#define UART6_GPIO_PORT_RX PAL_PORT(NRF_RX)
#define UART6_GPIO_RX PAL_PAD(NRF_RX)
#define UART6_GPIO_AF AF_NRF_RX
#define UART6_GPIO_PORT_CTS NRF_FLOW_CTRL_PORT
#define UART6_GPIO_PORT_CTS PAL_PORT(NRF_FLOW_CTRL)
#define UART6_GPIO_CTS NRF_FLOW_CTRL
/**
@@ -273,23 +273,23 @@
// External SPI
#define SPI1_GPIO_AF AF_E_SCK
#define SPI1_GPIO_PORT_MISO E_MISO_PORT
#define SPI1_GPIO_MISO E_MISO
#define SPI1_GPIO_PORT_MOSI E_MOSI_PORT
#define SPI1_GPIO_MOSI E_MOSI
#define SPI1_GPIO_PORT_SCK E_SCK_PORT
#define SPI1_GPIO_SCK E_SCK
#define SPI1_GPIO_PORT_MISO PAL_PORT(E_MISO)
#define SPI1_GPIO_MISO PAL_PAD(E_MISO)
#define SPI1_GPIO_PORT_MOSI PAL_PORT(E_MOSI)
#define SPI1_GPIO_MOSI PAL_PAD(E_MOSI)
#define SPI1_GPIO_PORT_SCK PAL_PORT(E_SCK)
#define SPI1_GPIO_SCK PAL_PAD(E_SCK)
#define SPI_SELECT_SLAVE0_PORT E_CS0_PORT
#define SPI_SELECT_SLAVE0_PIN E_CS0
#define SPI_SELECT_SLAVE1_PORT E_CS1_PORT
#define SPI_SELECT_SLAVE1_PIN E_CS1
#define SPI_SELECT_SLAVE2_PORT E_CS2_PORT
#define SPI_SELECT_SLAVE2_PIN E_CS2
#define SPI_SELECT_SLAVE3_PORT E_CS3_PORT
#define SPI_SELECT_SLAVE3_PIN E_CS3
#define SPI_SELECT_SLAVE0_PORT PAL_PORT(E_CS0)
#define SPI_SELECT_SLAVE0_PIN PAL_PAD(E_CS0)
#define SPI_SELECT_SLAVE1_PORT PAL_PORT(E_CS1)
#define SPI_SELECT_SLAVE1_PIN PAL_PAD(E_CS1)
#define SPI_SELECT_SLAVE2_PORT PAL_PORT(E_CS2)
#define SPI_SELECT_SLAVE2_PIN PAL_PAD(E_CS2)
#define SPI_SELECT_SLAVE3_PORT PAL_PORT(E_CS3)
#define SPI_SELECT_SLAVE3_PIN PAL_PAD(E_CS3
/**
/**)
* Baro
*
* Apparently needed for backwards compatibility
+20 -20
View File
@@ -113,8 +113,8 @@
#define UART3_RX 9U
#define PD10 10U
#define PD11 11U
#define I2C4_SCL_EXTERNAL 12U
#define I2C4_SDA_EXTERNAL 13U
#define I2C4_SCL 12U
#define I2C4_SDA 13U
#define PD14 14U
#define PD15 15U
@@ -287,8 +287,8 @@
#define LINE_UART2_RX PAL_LINE(GPIOD, 6U)
#define LINE_UART3_TX PAL_LINE(GPIOD, 8U)
#define LINE_UART3_RX PAL_LINE(GPIOD, 9U)
#define LINE_I2C4_SCL_EXTERNAL PAL_LINE(GPIOD, 12U)
#define LINE_I2C4_SDA_EXTERNAL PAL_LINE(GPIOD, 13U)
#define LINE_I2C4_SCL PAL_LINE(GPIOD, 12U)
#define LINE_I2C4_SDA PAL_LINE(GPIOD, 13U)
#define LINE_RC1 PAL_LINE(GPIOE, 0U)
#define LINE_SPI4_INTERNAL_CLK PAL_LINE(GPIOE, 2U)
@@ -647,8 +647,8 @@
PIN_MODE_ALTERNATE(UART3_RX) | \
PIN_MODE_INPUT(PD10) | \
PIN_MODE_INPUT(PD11) | \
PIN_MODE_ALTERNATE(I2C4_SCL_EXTERNAL) | \
PIN_MODE_ALTERNATE(I2C4_SDA_EXTERNAL) | \
PIN_MODE_ALTERNATE(I2C4_SCL) | \
PIN_MODE_ALTERNATE(I2C4_SDA) | \
PIN_MODE_INPUT(PD14) | \
PIN_MODE_INPUT(PD15))
@@ -664,8 +664,8 @@
PIN_OTYPE_PUSHPULL(UART3_RX) | \
PIN_OTYPE_PUSHPULL(PD10) | \
PIN_OTYPE_PUSHPULL(PD11) | \
PIN_OTYPE_OPENDRAIN(I2C4_SCL_EXTERNAL) | \
PIN_OTYPE_OPENDRAIN(I2C4_SDA_EXTERNAL) | \
PIN_OTYPE_OPENDRAIN(I2C4_SCL) | \
PIN_OTYPE_OPENDRAIN(I2C4_SDA) | \
PIN_OTYPE_PUSHPULL(PD14) | \
PIN_OTYPE_PUSHPULL(PD15))
@@ -681,8 +681,8 @@
PIN_OSPEED_SPEED_HIGH(UART3_RX) | \
PIN_OSPEED_SPEED_VERYLOW(PD10) | \
PIN_OSPEED_SPEED_VERYLOW(PD11) | \
PIN_OSPEED_SPEED_HIGH(I2C4_SCL_EXTERNAL) | \
PIN_OSPEED_SPEED_HIGH(I2C4_SDA_EXTERNAL) | \
PIN_OSPEED_SPEED_HIGH(I2C4_SCL) | \
PIN_OSPEED_SPEED_HIGH(I2C4_SDA) | \
PIN_OSPEED_SPEED_VERYLOW(PD14) | \
PIN_OSPEED_SPEED_VERYLOW(PD15))
@@ -698,8 +698,8 @@
PIN_PUPDR_FLOATING(UART3_RX) | \
PIN_PUPDR_PULLDOWN(PD10) | \
PIN_PUPDR_PULLDOWN(PD11) | \
PIN_PUPDR_PULLUP(I2C4_SCL_EXTERNAL) | \
PIN_PUPDR_PULLUP(I2C4_SDA_EXTERNAL) | \
PIN_PUPDR_PULLUP(I2C4_SCL) | \
PIN_PUPDR_PULLUP(I2C4_SDA) | \
PIN_PUPDR_PULLDOWN(PD14) | \
PIN_PUPDR_PULLDOWN(PD15))
@@ -715,8 +715,8 @@
PIN_ODR_LEVEL_HIGH(UART3_RX) | \
PIN_ODR_LEVEL_LOW(PD10) | \
PIN_ODR_LEVEL_LOW(PD11) | \
PIN_ODR_LEVEL_HIGH(I2C4_SCL_EXTERNAL) | \
PIN_ODR_LEVEL_HIGH(I2C4_SDA_EXTERNAL) | \
PIN_ODR_LEVEL_HIGH(I2C4_SCL) | \
PIN_ODR_LEVEL_HIGH(I2C4_SDA) | \
PIN_ODR_LEVEL_LOW(PD14) | \
PIN_ODR_LEVEL_LOW(PD15))
@@ -733,8 +733,8 @@
PIN_AFIO_AF(UART3_RX, 7) | \
PIN_AFIO_AF(PD10, 0) | \
PIN_AFIO_AF(PD11, 0) | \
PIN_AFIO_AF(I2C4_SCL_EXTERNAL, 4) | \
PIN_AFIO_AF(I2C4_SDA_EXTERNAL, 4) | \
PIN_AFIO_AF(I2C4_SCL, 4) | \
PIN_AFIO_AF(I2C4_SDA, 4) | \
PIN_AFIO_AF(PD14, 0) | \
PIN_AFIO_AF(PD15, 0))
@@ -1517,10 +1517,10 @@
#define AF_LINE_UART3_TX 7U
#define AF_UART3_RX 7U
#define AF_LINE_UART3_RX 7U
#define AF_I2C4_SCL_EXTERNAL 4U
#define AF_LINE_I2C4_SCL_EXTERNAL 4U
#define AF_I2C4_SDA_EXTERNAL 4U
#define AF_LINE_I2C4_SDA_EXTERNAL 4U
#define AF_I2C4_SCL 4U
#define AF_LINE_I2C4_SCL 4U
#define AF_I2C4_SDA 4U
#define AF_LINE_I2C4_SDA 4U
#define AF_RC1 8U
#define AF_LINE_RC1 8U
#define AF_SPI4_INTERNAL_CLK 5U
@@ -120,8 +120,8 @@ PD06 UART2_RX UART AF:USART2_RX
PD08 UART3_TX UART AF:USART3_TX
PD09 UART3_RX UART AF:USART3_RX
#PD10 LED4 LED # original Tawaki LED4
PD12 I2C4_SCL_EXTERNAL I2C AF:I2C4_SCL
PD13 I2C4_SDA_EXTERNAL I2C AF:I2C4_SDA
PD12 I2C4_SCL I2C AF:I2C4_SCL # EXTERNAL
PD13 I2C4_SDA I2C AF:I2C4_SDA # EXTERNAL
#PD15 LED1 LED # original Tawaki LED1
PE00 RC1 UART AF:UART8_RX ()