From a9783de61c5868e8cadf1d32c67ea3127a0d5f4a Mon Sep 17 00:00:00 2001 From: Hwurzburg Date: Fri, 21 Jun 2019 14:33:54 -0700 Subject: [PATCH] correct include paths, uncomment alarm pin, fix conflict with rssi --- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef-bl.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat | 6 +++++- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 8 ++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef-bl.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef-bl.dat index 0066acfc7d..e572c6b930 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef-bl.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef-bl.dat @@ -1,5 +1,5 @@ # hw definition file for processing by chibios_pins.py # for omnibusf4 AIO (no current sensor onboard) bootloader -include ../omnibusf4pro-bl.dat +include ../omnibusf4pro/hwdef-bl.dat diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat index 1817723d43..e10cdb32df 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4/hwdef.dat @@ -2,7 +2,7 @@ # Omnibus F4 AIO (no current sensor onboard) boards # with F405 mcu, mpu6000 imu, bmp280 barometer, 7456 series osd and sdcard -include ../omnibusf4pro.dat +include ../omnibusf4pro/hwdef.dat undef PC8 undef PC9 @@ -12,3 +12,7 @@ undef PC9 PC8 SBUS_INVERT_RX OUTPUT LOW PC9 SBUS_INVERT_TX OUTPUT LOW + +undef BOARD_PWM_COUNT_DEFAULT +define BOARD_PWM_COUNT_DEFAULT 6 + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index 8d18efd734..855d65a8fa 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -73,11 +73,11 @@ PC11 SPI3_MISO SPI3 PC10 SPI3_SCK SPI3 -PB5 LED_BLUE OUTPUT LOW GPIO(0) -define HAL_GPIO_A_LED_PIN 0 -define HAL_GPIO_B_LED_PIN 1 #dummy assignment required to allow AP_NOTIFY to use board led +PB5 LED_BLUE OUTPUT LOW GPIO(1) +define HAL_GPIO_A_LED_PIN 1 +define HAL_GPIO_B_LED_PIN 2 #dummy assignment required to allow AP_NOTIFY to use board led -#PB4 TIM3_CH1 TIM3 GPIO(58) ALARM +PB4 TIM3_CH1 TIM3 GPIO(58) ALARM PA11 OTG_FS_DM OTG1 PA12 OTG_FS_DP OTG1