HAL_ChibiOS: added OTG2 on all F7 and H7 boards with CAN

allows for SLCAN on 2nd port
This commit is contained in:
Andrew Tridgell 2019-07-12 15:00:03 +10:00
parent 02014776e8
commit 1919268801
9 changed files with 7 additions and 9 deletions

View File

@ -13,7 +13,7 @@ undef PE3
PE3 VDD_3V3_SENSORS_EN OUTPUT LOW
# order of UARTs (and USB).
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2
# enable TX on USART6 (disabled for fmuv5 with iomcu)
PG14 USART6_TX USART6 NODMA

View File

@ -299,7 +299,6 @@ define HAL_BATT_CURR_PIN 15
define HAL_BATT_VOLT_SCALE 10.1
define HAL_BATT_CURR_SCALE 17.0
define HAL_GPIO_PWM_VOLT_PIN 3
define HAL_HAVE_DUAL_USB_CDC 1
# List of files to put in ROMFS. For fmuv3 we need an IO firmware so
# we can automatically update the IOMCU firmware on boot. The format

View File

@ -471,7 +471,6 @@ define HAL_BATT_CURR_PIN 3
define HAL_BATT_VOLT_SCALE 10.1
define HAL_BATT_CURR_SCALE 17.0
define HAL_GPIO_PWM_VOLT_PIN 3
define HAL_HAVE_DUAL_USB_CDC 1
# this defines the default maximum clock on I2C devices.
define HAL_I2C_MAX_CLOCK 100000

View File

@ -9,7 +9,7 @@ include ../fmuv5/hwdef.dat
STM32_ST_USE_TIMER 5
# order of UARTs (and USB). Telem2 is UART4 on the mini, USART3 is not available
UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7
UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7 OTG2
# enable TX on USART6 (disabled for fmuv5 with iomcu)
PG14 USART6_TX USART6 NODMA

View File

@ -28,7 +28,7 @@ FLASH_RESERVE_START_KB 128
STM32_VDD 330U
# order of UARTs (and USB)
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2
define HAL_STORAGE_SIZE 16384

View File

@ -13,7 +13,7 @@ undef PE3
PE3 VDD_3V3_SENSORS_EN OUTPUT LOW
# order of UARTs (and USB). Telem2 is UART4 on the mini, USART3 is not available
UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7
UART_ORDER OTG1 USART1 USART2 UART4 USART6 UART7 OTG2
# enable TX on USART6 (disabled for fmuv5 with iomcu)
PG14 USART6_TX USART6 NODMA

View File

@ -33,7 +33,7 @@ FLASH_SIZE_KB 2048
env OPTIMIZE -O3
# order of UARTs (and USB)
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7
UART_ORDER OTG1 USART1 USART2 USART3 UART4 USART6 UART7 OTG2
# now we define the pins that USB is connected on
PA11 OTG_FS_DM OTG1

View File

@ -73,7 +73,7 @@ I2C_ORDER I2C1
# USART6 FC
# UART7 DEBUG
UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART6 UART7
UART_ORDER OTG1 UART4 USART2 USART3 UART8 USART6 UART7 OTG2
# Another USART, this one for telem1. This one has RTS and CTS lines.
# USART2 telem1

View File

@ -116,7 +116,7 @@ I2C_ORDER I2C1
# 6) SERIAL5: extra UART (usually RTOS debug console)
# order of UARTs (and USB)
UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7
UART_ORDER OTG1 UART4 USART2 USART3 UART8 UART7 OTG2
# if the board has an IOMCU connected via a UART then this defines the
# UART to talk to that MCU. Leave it out for boards with no IOMCU