From 3f98e3aacb4679d333f9cda383208e12c3cf24ca Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Mon, 27 Jun 2022 16:54:39 +1000 Subject: [PATCH] hwdef: use an include file for boards requiring generic feature minimization --- libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M-bdshot/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat | 2 +- libraries/AP_HAL_ChibiOS/hwdef/include/minimize_features.inc | 1 + libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) create mode 100644 libraries/AP_HAL_ChibiOS/hwdef/include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat index 1be67c7638..dd5f4d5431 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF7/hwdef.dat @@ -158,7 +158,7 @@ define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 # save FLASH, but leave above when flash issue is fixed -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc # reduce max size of embedded params for apj_tool.py diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat index 8b9db05c3f..592fb98602 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MatekF405-CAN/hwdef.dat @@ -166,7 +166,7 @@ define HAL_BATT2_VOLT_SCALE 11.0 # --------------------- save flash ---------------------- -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc define AP_BATTMON_SMBUS_ENABLE 0 define HAL_PARACHUTE_ENABLED 0 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat index 5e4de66698..4e84e6121a 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/MazzyStarDrone/hwdef.dat @@ -165,4 +165,4 @@ define HAL_BOARD_TERRAIN_DIRECTORY "/APM/TERRAIN" define STM32_PWM_USE_ADVANCED TRUE # we are low on flash on this board -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat index 2c30a5dc47..578c3f3481 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Nucleo-L496/hwdef.dat @@ -99,7 +99,7 @@ PA4 VSENSE ADC1 SCALE(2) define HAL_NO_MONITOR_THREAD -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc define AP_PARAM_MAX_EMBEDDED_PARAM 512 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat index 6a65cc9221..35bf614d3b 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/OMNIBUSF7V2/hwdef.dat @@ -133,7 +133,7 @@ define HAL_PARACHUTE_ENABLED 0 define HAL_SPRAYER_ENABLED 0 # save FLASH, but leave above when flash issue is fixed -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc # one baro BARO BMP280 SPI:bmp280 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M-bdshot/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M-bdshot/hwdef.dat index e274e56159..c27099a3a7 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M-bdshot/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M-bdshot/hwdef.dat @@ -36,5 +36,5 @@ COMPASS LSM303D SPI:lsm9ds0_am ROTATION_NONE define HAL_PROBE_EXTERNAL_I2C_COMPASSES FLASH_SIZE_KB 1024 -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc undef STORAGE_FLASH_PAGE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M/hwdef.dat index c9fb1f5180..096e1fdfd5 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/Pixhawk1-1M/hwdef.dat @@ -8,7 +8,7 @@ define AP_GPS_NMEA_ENABLED 1 include ../include/minimal_GPS.inc FLASH_SIZE_KB 1024 -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc undef STORAGE_FLASH_PAGE # produce this error if we are on a 2M board and using 1M firmware diff --git a/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat index f58c1332ab..52cf485c71 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat @@ -9,7 +9,7 @@ FLASH_SIZE_KB 1024 # actually needed as of February 2018 as the full build does fit in # 1M, but it prepares us for when large features such as scripting are # added to the build -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc # we don't have a flash page spare to write parameters to: undef STORAGE_FLASH_PAGE diff --git a/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_features.inc b/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_features.inc new file mode 100644 index 0000000000..30360bb79a --- /dev/null +++ b/libraries/AP_HAL_ChibiOS/hwdef/include/minimize_features.inc @@ -0,0 +1 @@ +define HAL_MINIMIZE_FEATURES 1 diff --git a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat index 8bc0e9b7e7..28d11889cc 100644 --- a/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat +++ b/libraries/AP_HAL_ChibiOS/hwdef/sparky2/hwdef.dat @@ -137,4 +137,4 @@ define HAL_LOGGING_DATAFLASH_ENABLED 1 define STM32_PWM_USE_ADVANCED TRUE # we are low on flash on this board -define HAL_MINIMIZE_FEATURES 1 +include ../include/minimize_features.inc