From 5fe0cd16abb615a3cd02264c36a773c65bc27d4e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 29 Oct 2019 13:55:06 +1100 Subject: [PATCH] HAL_ChibiOS: enable MatekF765 LED pin - use tonealarm for buzzer - add more baro options --- .../hwdef/MatekF765-Wing/defaults.parm | 2 ++ .../hwdef/MatekF765-Wing/hwdef.dat | 19 +++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm new file mode 100644 index 0000000000..7b610d2326 --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/defaults.parm @@ -0,0 +1,2 @@ +SERVO13_FUNCTION 120 +NTF_LED_TYPES 455 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat index cfaf47f250..808c921943 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF765-Wing/hwdef.dat @@ -36,11 +36,8 @@ I2C_ORDER I2C2 I2C1 # order of UARTs (and USB) UART_ORDER OTG1 USART2 UART7 USART1 USART3 UART8 UART4 -# buzzer -PB9 BUZZER OUTPUT GPIO(80) LOW -define HAL_BUZZER_PIN 80 -define HAL_BUZZER_ON 1 -define HAL_BUZZER_OFF 0 +# tonealarm support +PB9 TIM11_CH1 TIM11 GPIO(32) ALARM # PA10 IO-debug-console PA11 OTG_FS_DM OTG1 @@ -156,6 +153,7 @@ PD14 TIM4_CH3 TIM4 PWM(9) GPIO(58) PD15 TIM4_CH4 TIM4 PWM(10) GPIO(59) PE5 TIM9_CH1 TIM9 PWM(11) GPIO(60) NODMA PE6 TIM9_CH2 TIM9 PWM(12) GPIO(61) NODMA +PA8 TIM1_CH1 TIM1 PWM(13) GPIO(62) # for WS2812 LED # microSD support PC8 SDMMC_D0 SDMMC1 @@ -169,9 +167,6 @@ PD2 SDMMC_CMD SDMMC1 PE4 PINIO1 OUTPUT GPIO(81) LOW PE15 PINIO2 OUTPUT GPIO(82) LOW -# 2812 LED -# PA8, TIM1_CH1 - DMA_PRIORITY S* define HAL_STORAGE_SIZE 16384 @@ -195,8 +190,11 @@ IMU Invensense SPI:icm20602 ROTATION_PITCH_180 IMU Invensense SPI:mpu6000 ROTATION_ROLL_180 define HAL_DEFAULT_INS_FAST_SAMPLE 1 -# one BARO +# one BARO, multiple possible choices for different +# board varients BARO BMP280 I2C:0:0x76 +BARO BMP388 I2C:0:0x76 +BARO MS56XX I2C:0:0x77 define HAL_OS_FATFS_IO 1 define HAL_BOARD_LOG_DIRECTORY "/APM/LOGS" @@ -207,5 +205,6 @@ define OSD_ENABLED ENABLED define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin -define BOARD_PWM_COUNT_DEFAULT 12 +define BOARD_PWM_COUNT_DEFAULT 13 +