From 5b56887428bd1cf300cbc9d2bc17cd1c6c1fb67c Mon Sep 17 00:00:00 2001 From: anbello Date: Mon, 7 May 2018 08:30:20 +0200 Subject: [PATCH] Changes to be committed: modified: hwdef.dat Modified as per @sh83 hints --- .../AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat | 32 ++++--------------- 1 file changed, 7 insertions(+), 25 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat index a58b5dd063..8d72c3e6e3 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/airbotf4/hwdef.dat @@ -1,6 +1,6 @@ # hw definition file for processing by chibios_pins.py -# Omnibus F4 PRO, Omnibus F4 V3 boards -# with F405 mcu, mpu6000 imu, bmp280 barometer, 7456 series osd and sdcard +# Airbot F4, Flip32 F4 +# with F405 mcu, mpu6000 imu MCU STM32F4xx STM32F405xx @@ -52,11 +52,6 @@ PA7 SPI1_MOSI SPI1 PB10 I2C2_SCL I2C2 PB11 I2C2_SDA I2C2 -#PB15 SPI2_MOSI SPI2 -#PB14 SPI2_MISO SPI2 -#PB13 SPI2_SCK SPI2 -#PB12 SDCARD_CS CS - PA10 USART1_RX USART1 PA9 USART1_TX USART1 @@ -66,11 +61,10 @@ PC7 USART6_RX USART6 PA13 JTMS-SWDIO SWD PA14 JTCK-SWCLK SWD -#PA15 OSD_CS CS -#PB3 BMP280_CS CS -#PC12 SPI3_MOSI SPI3 -#PC11 SPI3_MISO SPI3 -#PC10 SPI3_SCK SPI3 +PB3 FLASH_CS CS +PC12 SPI3_MOSI SPI3 +PC11 SPI3_MISO SPI3 +PC10 SPI3_SCK SPI3 PB5 LED OUTPUT HIGH GPIO(57) PB4 TIM3_CH1 TIM3 GPIO(56) ALARM @@ -80,29 +74,17 @@ PA12 OTG_FS_DP OTG1 PC5 VBUS INPUT OPENDRAIN # "PPM" solder pad/resistor should be soldered and "S-BUS" resistor/solder pad removed -# Overwise UART1 or UART6 or RCIN will not work -#PB8 TIM4_CH3 TIM4 RCININT PULLDOWN LOW +# Overwise UART1 or RCIN will not work PB14 TIM12_CH1 TIM12 RCININT PULLDOWN LOW -#Omnibus F4 V3 and later had hw inverter on UART6 -#Overide it to use as GPS UART port -#PC8 SBUS_INVERT OUTPUT LOW - # SPI Device table SPIDEV mpu6000 SPI1 DEVID1 MPU6000_CS MODE3 1*MHZ 8*MHZ -#SPIDEV sdcard SPI2 DEVID2 SDCARD_CS MODE3 1*MHZ 16*MHZ -#SPIDEV bmp280 SPI3 DEVID3 BMP280_CS MODE3 1*MHZ 8*MHZ -#SPIDEV osd SPI3 DEVID4 OSD_CS MODE0 1*MHZ 4*MHZ -#define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_OMNIBUSF4PRO define CONFIG_HAL_BOARD_SUBTYPE HAL_BOARD_SUBTYPE_CHIBIOS_AIRBOTF4 define HAL_INS_DEFAULT HAL_INS_MPU60XX_SPI define HAL_INS_DEFAULT_ROTATION ROTATION_YAW_180 -#define HAL_BARO_DEFAULT HAL_BARO_BMP280_SPI -#define HAL_BARO_BMP280_NAME "bmp280" - define HAL_BARO_DEFAULT HAL_BARO_MS5611_I2C define HAL_BARO_MS5611_I2C_BUS 0 define HAL_BARO_MS5611_I2C_ADDR 0x77