AP_Parachute: remove AUX_FUNC entries based on feature defines

ArduPilot · Aug 19, 2024 · 69816da · 69816da
1 parent c98e021
commit 69816da
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/libraries/AP_Parachute/AP_Parachute.h b/libraries/AP_Parachute/AP_Parachute.h
@@ -2,6 +2,10 @@
 /// @brief  Parachute release library
 #pragma once
 
+#include "AP_Parachute_config.h"
+
+#if HAL_PARACHUTE_ENABLED
+
 #include <AP_Param/AP_Param.h>
 #include <AP_Common/AP_Common.h>
 
@@ -22,13 +26,6 @@
 #define AP_PARACHUTE_CRITICAL_SINK_DEFAULT      0      // default critical sink speed in m/s to trigger emergency parachute
 #define AP_PARACHUTE_OPTIONS_DEFAULT            0      // default parachute options: enabled disarm after parachute release
 
-#ifndef HAL_PARACHUTE_ENABLED
-// default to parachute enabled to match previous configs
-#define HAL_PARACHUTE_ENABLED 1
-#endif
-
-#if HAL_PARACHUTE_ENABLED
-
 /// @class  AP_Parachute
 /// @brief  Class managing the release of a parachute
 class AP_Parachute {

diff --git a/libraries/AP_Parachute/AP_Parachute_config.h b/libraries/AP_Parachute/AP_Parachute_config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <AP_HAL/AP_HAL_Boards.h>
+
+#ifndef HAL_PARACHUTE_ENABLED
+// default to parachute enabled to match previous configs
+#define HAL_PARACHUTE_ENABLED 1
+#endif