From 8d82a592df850b96c8172869450c60905213d806 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 2 Feb 2024 23:14:49 +1100 Subject: [PATCH] hwdef: remove parachutefrom many FPV/OSD boards --- libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/FlywooF405Pro/hwdef.dat | 6 ++++++ libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405Mini/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat | 5 +++++ libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat | 4 ++++ libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat | 5 +++++ libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat | 5 +++++ libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat | 4 ++++ 18 files changed, 77 insertions(+) diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat index 5e27c96a75d303..3d1451413f83c8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BETAFPV-F405/hwdef.dat @@ -144,3 +144,7 @@ define HAL_FRAME_TYPE_DEFAULT 12 AUTOBUILD_TARGETS Copter include ../include/minimize_fpv_osd.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat index d1c3153292349b..24158e522ecaec 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7/hwdef.dat @@ -139,4 +139,8 @@ define STM32_PWM_USE_ADVANCED TRUE # save some flash include ../include/minimize_fpv_osd.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat index e1c82946b5ed06..49379217300338 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/BeastF7v2/hwdef.dat @@ -63,4 +63,8 @@ define HAL_BARO_ALLOW_INIT_NO_BARO 1 # save some flash include ../include/minimize_fpv_osd.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + define DEFAULT_NTF_LED_TYPES 257 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat index 708b574cef45f5..8744a707e7d1ce 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat @@ -165,3 +165,7 @@ define HAL_DEFAULT_INS_FAST_SAMPLE 1 # no space for bootloader in firmware image: include ../include/minimize_fpv_osd.inc include ../include/no_bootloader_DFU.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405Pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405Pro/hwdef.dat index 7b5af147f88508..3be062c88f1f88 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405Pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405Pro/hwdef.dat @@ -153,4 +153,10 @@ define HAL_DEFAULT_INS_FAST_SAMPLE 3 define HAL_FRAME_TYPE_DEFAULT 12 include ../include/minimize_fpv_osd.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + AUTOBUILD_TARGETS Copter + diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat index 3b2beee7d66c43..10a65241f45d90 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF405S-AIO/hwdef.dat @@ -153,4 +153,8 @@ define DEFAULT_NTF_LED_TYPES 257 # save some flash space include ../include/minimize_fpv_osd.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat index ea20a6af98b863..bf2637d9dc1617 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat @@ -166,4 +166,8 @@ define AP_BATTMON_SMBUS_ENABLE 0 include ../include/minimize_fpv_osd.inc include ../include/save_some_flash.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + AUTOBUILD_TARGETS Plane diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat index eea0b4785433c6..89ab5816cfacc6 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat @@ -153,4 +153,8 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + define DEFAULT_NTF_LED_TYPES 256 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat index 20b64689a4dda5..df5fe67a5d043b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405US-I2C/hwdef.dat @@ -159,3 +159,7 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # no space for bootloader: include ../include/minimize_fpv_osd.inc include ../include/no_bootloader_DFU.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat index 41ef077b8ac8b0..0f8b2da4418731 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat @@ -170,3 +170,7 @@ DMA_PRIORITY TIM2* TIM3* # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat index 8554ca376670ba..7a9e05910e1643 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat @@ -153,3 +153,7 @@ define HAL_MOUNT_ENABLED 0 # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405Mini/hwdef.dat index ac554bd0467796..4725fbf25f9f49 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/SpeedyBeeF405Mini/hwdef.dat @@ -151,5 +151,9 @@ define HAL_DEFAULT_INS_FAST_SAMPLE 3 # Motor order implies Betaflight/X for standard ESCs define HAL_FRAME_TYPE_DEFAULT 12 +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + include ../include/minimize_fpv_osd.inc AUTOBUILD_TARGETS Copter diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat index 3ed2139872c193..abc94b221324d8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat @@ -152,5 +152,9 @@ define OSD_ENABLED 1 #font for the osd ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat index b7a2ebc1277a2e..0d143ee0d395eb 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c/hwdef.dat @@ -153,5 +153,10 @@ define HAL_GYROFFT_ENABLED 0 # bootloader embedding / bootloader flashing not available define AP_BOOTLOADER_FLASHING_ENABLED 0 + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat index 0a9e00e28a25e3..cf80d63f47b337 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini/hwdef.dat @@ -129,4 +129,8 @@ define HAL_LOGGING_DATAFLASH_ENABLED 1 define HAL_GYROFFT_ENABLED 0 +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat index d22798c436d813..677e242ec4285f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat @@ -147,5 +147,10 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc include ../include/no_bootloader_DFU.inc + undef AP_BATTERY_SYNTHETIC_CURRENT_ENABLED define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat index f313a8b83f47d3..18b69ad83b8952 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v3/hwdef.dat @@ -154,7 +154,12 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc include ../include/no_bootloader_DFU.inc + undef AP_BATTERY_SYNTHETIC_CURRENT_ENABLED define AP_BATTERY_SYNTHETIC_CURRENT_ENABLED 0 define DEFAULT_NTF_LED_TYPES 257 + +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat index 3c23f669555b29..78f40df931ef24 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4v4/hwdef.dat @@ -162,4 +162,8 @@ define HAL_OS_FATFS_IO 1 # minimal drivers to reduce flash usage include ../include/minimize_fpv_osd.inc +# defines to transition minimize-fpv-osd boards to parachute-not-compiled-in: +define HAL_PARACHUTE_ENABLED 0 +define AP_PARACHUTE_UNAVAILABLE_ENABLED 1 + define DEFAULT_NTF_LED_TYPES 257