From dd059b89f38fc804ad516ae53f8ef79d9247fbad Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 27 Jun 2018 21:33:50 +1000 Subject: [PATCH] HAL_ChibiOS: added uartG for fmuv4 and fmuv5 --- libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat | 7 ++++--- libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat index 7a9028c45a..bd91be34e5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv4/hwdef.dat @@ -32,7 +32,7 @@ I2C_ORDER I2C1 define HAL_I2C_BUS_BASE 1 # order of UARTs (and USB) -UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 +UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART1 UART7 # UART4 is GPS PA0 UART4_TX UART4 @@ -147,8 +147,9 @@ PE1 UART8_TX UART8 PE3 VDD_SENSORS_EN OUTPUT HIGH # UART7 is debug -PE7 UART7_RX UART7 -PE8 UART7_TX UART7 +PE7 UART7_RX UART7 NODMA +PE8 UART7_TX UART7 NODMA + PE9 TIM1_CH1 TIM1 PWM(4) GPIO(53) PE11 TIM1_CH2 TIM1 PWM(3) GPIO(52) PE12 MAG_DRDY INPUT diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat index bb9a884788..03f732c4be 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv5/hwdef.dat @@ -31,7 +31,7 @@ STM32_VDD 330U FLASH_SIZE_KB 2048 # order of UARTs (and USB) -UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 +UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 # now we define the pins that USB is connected on PA11 OTG_FS_DM OTG1