AP_HAL_ChibiOS: allow airspeed backends to be compiled out

3 years ago · 7da0b3aaf2
13 changed files with 39 additions and 20 deletions
--- a/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/F35Lightning/hwdef.dat
@ -161,8 +161,8 @@ define HAL_BATT_CURR_PIN 12
				@@ -161,8 +161,8 @@ define HAL_BATT_CURR_PIN 12
 define HAL_BATT_VOLT_SCALE 11
 define HAL_BATT_CURR_SCALE 25

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc

 # enable IMU fast sampling
 define HAL_DEFAULT_INS_FAST_SAMPLE 1
--- a/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/FlywooF745/hwdef.dat
@ -168,8 +168,8 @@ define GRIPPER_ENABLED 0
				@@ -168,8 +168,8 @@ define GRIPPER_ENABLED 0
 define HAL_PARACHUTE_ENABLED 0


-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
 define HAL_SPRAYER_ENABLED 0
 define AP_BATTMON_SMBUS_ENABLE 0
 define AP_BATTMON_FUEL_ENABLE 0
--- a/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/KakuteF4/hwdef.dat
@ -148,5 +148,5 @@ define OSD_ENABLED 1
				@@ -148,5 +148,5 @@ define OSD_ENABLED 1
 define HAL_OSD_TYPE_DEFAULT 1
 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/MambaF405v2/hwdef.dat
@ -154,5 +154,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
				@@ -154,5 +154,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
 # To complementary channels work we define this
 #define STM32_PWM_USE_ADVANCED TRUE

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/OmnibusNanoV6/hwdef.dat
@ -151,5 +151,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin
				@@ -151,5 +151,5 @@ ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin

 define HAL_MOUNT_ENABLED 0

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/SuccexF4/hwdef.dat
@ -132,5 +132,5 @@ define HAL_SPRAYER_ENABLED 0
				@@ -132,5 +132,5 @@ define HAL_SPRAYER_ENABLED 0
 # reduce max size of embedded params for apj_tool.py
 define AP_PARAM_MAX_EMBEDDED_PARAM 1024

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/VRUBrain-v51/hwdef.dat
@ -181,5 +181,5 @@ define HAL_SPEKTRUM_TELEM_ENABLED 0
				@@ -181,5 +181,5 @@ define HAL_SPEKTRUM_TELEM_ENABLED 0
 define HAL_SOARING_ENABLED 0
 define AP_OPTICALFLOW_ENABLED 0

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/fmuv2/hwdef.dat
@ -14,5 +14,5 @@ define HAL_MINIMIZE_FEATURES 1
				@@ -14,5 +14,5 @@ define HAL_MINIMIZE_FEATURES 1
 # we don't have a flash page spare to write parameters to:
 undef STORAGE_FLASH_PAGE

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/include/minimal.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/include/minimal.inc
@ -0,0 +1,2 @@
				@@ -0,0 +1,2 @@
+include minimal_GPS.inc
+include minimal_Airspeed.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/include/minimal_Airspeed.inc
+++ b/libraries/AP_HAL_ChibiOS/hwdef/include/minimal_Airspeed.inc
@ -0,0 +1,10 @@
				@@ -0,0 +1,10 @@
+# include file to reduce flash by including *fewer* Airspeed drivers
+
+define AP_AIRSPEED_BACKEND_DEFAULT_ENABLED 0
+define AP_AIRSPEED_MS4525_ENABLED 1
+define AP_AIRSPEED_ANALOG_ENABLED 1
+define AP_AIRSPEED_MS5525_ENABLED 1
+define AP_AIRSPEED_SDP3X_ENABLED 1
+define AP_AIRSPEED_NMEA_ENABLED 1  # additional checks for vehicle type in .cpp
+
+define AP_AIRSPEED_UAVCAN_ENABLED HAL_ENABLE_LIBUAVCAN_DRIVERS
--- a/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/omnibusf4v6/hwdef.dat
@ -150,5 +150,5 @@ define OSD_ENABLED 1
				@@ -150,5 +150,5 @@ define OSD_ENABLED 1
 #font for the osd
 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc
--- a/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
+++ b/libraries/AP_HAL_ChibiOS/hwdef/scripts/chibios_hwdef.py
@ -2828,6 +2828,13 @@ def add_apperiph_defaults(f):
				@@ -2828,6 +2828,13 @@ def add_apperiph_defaults(f):
 #define HAL_SIM_GPS_ENABLED (AP_SIM_ENABLED && defined(HAL_PERIPH_ENABLE_GPS))
 #endif

+/*
+ * Airspeed Backends - we selectively turn backends *off*
+ */
+#ifndef AP_AIRSPEED_ANALOG_ENABLED
+#define AP_AIRSPEED_ANALOG_ENABLED 0
+#endif
+
 ''')


--- a/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
+++ b/libraries/AP_HAL_ChibiOS/hwdef/speedybeef4/hwdef.dat
@ -146,5 +146,5 @@ define OSD_ENABLED 1
				@@ -146,5 +146,5 @@ define OSD_ENABLED 1
 define HAL_OSD_TYPE_DEFAULT 1
 ROMFS_WILDCARD libraries/AP_OSD/fonts/font*.bin

-# minimal GPS drivers to reduce flash usage
-include ../include/minimal_GPS.inc
+# minimal drivers to reduce flash usage
+include ../include/minimal.inc