From d204939cb2b4101ba0c9ae732e9c6f2823299ad0 Mon Sep 17 00:00:00 2001 From: vierfuffzig Date: Thu, 1 Nov 2018 11:10:21 +1100 Subject: [PATCH] AP_HAL_ChibiOS: set default type for boards with onboard OSD --- libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat | 3 ++- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 1 + libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat | 1 + 9 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index 9129070d33..be141a6014 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -156,6 +156,7 @@ define HAL_PROBE_EXTERNAL_I2C_BAROS # OSD support define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # available storage diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index 80201a0571..646cce4656 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -140,6 +140,7 @@ SPIDEV osd SPI3 DEVID4 MAX7456_CS MODE0 10*MHZ 10*MHZ # setup for OSD define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # 8 PWM available by default diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 995246b94f..56125638bf 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -147,7 +147,8 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" # setup for OSD define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define BOARD_PWM_COUNT_DEFAULT 6 -define STM32_PWM_USE_ADVANCED TRUE \ No newline at end of file +define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 4b3f5f1e3a..60aba4669b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -177,6 +177,7 @@ define HAL_I2C_INTERNAL_MASK 0 define HAL_COMPASS_AUTO_ROT_DEFAULT 2 define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin define BOARD_PWM_COUNT_DEFAULT 9 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat index ece4920879..bf105bee05 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat @@ -170,4 +170,5 @@ define BOARD_PWM_COUNT_DEFAULT 8 # setup for OSD define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat index a23b7dd666..62fb179422 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat @@ -134,4 +134,5 @@ define HAL_COMPASS_AUTO_ROT_DEFAULT 2 define HAL_BARO_DEFAULT HAL_BARO_BMP280_SPI define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index b37a153571..96aba04d1a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -123,6 +123,7 @@ define BOARD_RSSI_ANA_PIN 0 define HAL_GPIO_A_LED_PIN 41 define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 #To complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index a9d08e0c34..d58495db04 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -129,6 +129,7 @@ define BOARD_RSSI_ANA_PIN 0 define HAL_GPIO_A_LED_PIN 57 define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 #To complementary channels work we define this define STM32_PWM_USE_ADVANCED TRUE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index 98b582b3e7..c7e75ac015 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -156,4 +156,5 @@ define BOARD_PWM_COUNT_DEFAULT 8 # setup for OSD define OSD_ENABLED ENABLED +define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin