From c9022e8cf252ca8572716375a71ffc7fac2865d3 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Sun, 24 Mar 2024 08:45:53 +1100 Subject: [PATCH] hwdef: remove save_some_flash.inc all but one board was getting all of these includes from minimize_fpv_osd, and the remaining board had most lines foming from minimize_features.inc. This file has served its purpose, its role now taken on by minimize_fpv_osd.inc --- libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat | 1 - libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat | 9 +++++---- .../AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc | 7 ------- libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat | 3 --- .../AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat | 3 --- libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat | 3 --- 14 files changed, 5 insertions(+), 29 deletions(-) delete mode 100644 libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat index fb4eaad060b41..4d39f02d742ee 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/AtomRCF405NAVI/hwdef.dat @@ -158,7 +158,6 @@ define AP_PARAM_MAX_EMBEDDED_PARAM 256 # save some flash include ../include/minimize_fpv_osd.inc -include ../include/save_some_flash.inc define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat index 91fc6dee3c557..1543f2b3379a8 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat @@ -167,7 +167,6 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin # define HAL_NAVEKF3_AVAILABLE 0 # save some flash -include ../include/save_some_flash.inc include ../include/minimize_fpv_osd.inc include ../include/no_bootloader_DFU.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat index 74799f29699b7..2fb1d8f3d5fed 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/HEEWING-F405/hwdef.dat @@ -159,6 +159,5 @@ define HAL_WITH_DSP FALSE define HAL_GYROFFT_ENABLED 0 include ../include/minimize_fpv_osd.inc -include ../include/save_some_flash.inc AUTOBUILD_TARGETS Plane diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat index daab9120f2b90..82e84c545d44f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4Mini/hwdef.dat @@ -38,7 +38,6 @@ DMA_PRIORITY ADC* USART3* TIM3* TIM5* SPI3* SPI1* DMA_NOSHARE SPI3_RX # save some flash -include ../include/save_some_flash.inc define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 define HAL_MOUNT_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat index 6567a816393f7..80b518f40c382 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7Mini/hwdef.dat @@ -157,5 +157,4 @@ define HAL_SPRAYER_ENABLED 0 define HAL_MOUNT_ENABLED 0 # save some flash -include ../include/save_some_flash.inc include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat index e4304e941af8b..25db119779ba5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-TE/hwdef.dat @@ -173,7 +173,6 @@ define HAL_GYROFFT_ENABLED 0 # --------------------- save flash ---------------------- # save some flash include ../include/minimize_fpv_osd.inc -include ../include/save_some_flash.inc include ../include/no_bootloader_DFU.inc define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat index 06f535019f1d3..12a58593d9804 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-Wing/hwdef.dat @@ -183,7 +183,6 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin define HAL_GYROFFT_ENABLED 0 # save some flash -include ../include/save_some_flash.inc define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat index 650d1f960be60..a276cb828c932 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405/hwdef.dat @@ -161,6 +161,5 @@ define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 # save some flash -include ../include/save_some_flash.inc include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat index 2d9aaec024589..e39e6cd2f532d 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/ReaperF745/hwdef.dat @@ -144,7 +144,6 @@ define HAL_OSD_TYPE_DEFAULT 1 ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin # save some flash -include ../include/save_some_flash.inc include ../include/minimize_fpv_osd.inc define AP_GRIPPER_ENABLED 0 define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat index ebb86cfb13404..67be87b6dbf8f 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat @@ -164,9 +164,10 @@ define HAL_BATT_CURR_PIN -1 define HAL_BATT_VOLT_SCALE 10.1 define HAL_BATT_CURR_SCALE 17.0 -# save some flash -include ../include/save_some_flash.inc -define HAL_SPEKTRUM_TELEM_ENABLED 0 - # minimal drivers to reduce flash usage include ../include/minimize_features.inc + +# save some flash +define AC_PRECLAND_ENABLED 0 +define AP_ICENGINE_ENABLED 0 +define AP_OPTICALFLOW_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc deleted file mode 100644 index 00294b4d85303..0000000000000 --- a/libraries/AP_HAL_ChibiOS/hwdef/include/save_some_flash.inc +++ /dev/null @@ -1,7 +0,0 @@ -# save some flash -define AP_OAPATHPLANNER_ENABLED 0 -define AC_PRECLAND_ENABLED 0 -define AP_ICENGINE_ENABLED 0 -define AP_OPTICALFLOW_ENABLED 0 -define HAL_BARO_WIND_COMP_ENABLED 0 -define HAL_GENERATOR_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat index a810350814e1b..1413596b7de24 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4pro/hwdef.dat @@ -151,7 +151,4 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font0.bin define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 -# save some flash -include ../include/save_some_flash.inc - include ../include/minimize_fpv_osd.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat index 499e105556c82..b789a0098acc7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-i2c-bdshot/hwdef.dat @@ -11,6 +11,3 @@ PA2 TIM2_CH3 TIM2 PWM(4) GPIO(53) # bootloader embedding / bootloader flashing not available define AP_BOOTLOADER_FLASHING_ENABLED 0 - -# save some flash -include ../include/save_some_flash.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat index 28432ba816d6e..ce5f045cc9ded 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/revo-mini-sd/hwdef.dat @@ -21,6 +21,3 @@ define HAL_OS_FATFS_IO 1 define HAL_PARACHUTE_ENABLED 0 define HAL_GYROFFT_ENABLED 0 - -# save some flash -include ../include/save_some_flash.inc