AP_HAL_ChibiOS: set default type for boards with onboard OSD

6 years ago · d204939cb2
9 changed files with 10 additions and 1 deletions
--- 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
				@@ -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
--- 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
				@@ -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
--- 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"
				@@ -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
+define STM32_PWM_USE_ADVANCED TRUE
--- 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
				@@ -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
--- 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
				@@ -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
--- 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
				@@ -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
--- 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
				@@ -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
--- 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
				@@ -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
--- 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
				@@ -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