AP_ExternalAHRS: Allow InertialLabs to be used as build option properly

build_options cannot autodetect InertialLabs since the feature is extracted as AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED (without the underscore). This allows you to define in/out InertialLabs properly.
ArduPilot · Aug 12, 2024 · 6c2f658 · 6c2f658
1 parent c3b6127
commit 6c2f658
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/libraries/AP_ExternalAHRS/AP_ExternalAHRS.cpp b/libraries/AP_ExternalAHRS/AP_ExternalAHRS.cpp
@@ -124,7 +124,7 @@ void AP_ExternalAHRS::init(void)
         return;
 #endif
 
-#if AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#if AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
     case DevType::InertialLabs:
         backend = NEW_NOTHROW AP_ExternalAHRS_InertialLabs(this, state);
         return;

diff --git a/libraries/AP_ExternalAHRS/AP_ExternalAHRS.h b/libraries/AP_ExternalAHRS/AP_ExternalAHRS.h
@@ -49,7 +49,7 @@ class AP_ExternalAHRS {
 #if AP_EXTERNAL_AHRS_MICROSTRAIN5_ENABLED
         MicroStrain5 = 2,
 #endif
-#if AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#if AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
         InertialLabs = 5,
 #endif
         // 3 reserved for AdNav

diff --git a/libraries/AP_ExternalAHRS/AP_ExternalAHRS_InertialLabs.cpp b/libraries/AP_ExternalAHRS/AP_ExternalAHRS_InertialLabs.cpp
@@ -18,7 +18,7 @@
 
 #include "AP_ExternalAHRS_config.h"
 
-#if AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#if AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
 
 #include "AP_ExternalAHRS_InertialLabs.h"
 #include <AP_Math/AP_Math.h>
@@ -692,5 +692,5 @@ void AP_ExternalAHRS_InertialLabs::send_status_report(GCS_MAVLINK &link) const
                                        mag_var, 0, 0);
 }
 
-#endif  // AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#endif  // AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
 
diff --git a/libraries/AP_ExternalAHRS/AP_ExternalAHRS_InertialLabs.h b/libraries/AP_ExternalAHRS/AP_ExternalAHRS_InertialLabs.h
@@ -20,7 +20,7 @@
 
 #include "AP_ExternalAHRS_config.h"
 
-#if AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#if AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
 
 #include "AP_ExternalAHRS_backend.h"
 
@@ -228,5 +228,5 @@ class AP_ExternalAHRS_InertialLabs : public AP_ExternalAHRS_backend {
     uint32_t last_gps_ms;
 };
 
-#endif  // AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
+#endif  // AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
 
diff --git a/libraries/AP_ExternalAHRS/AP_ExternalAHRS_config.h b/libraries/AP_ExternalAHRS/AP_ExternalAHRS_config.h
@@ -26,6 +26,6 @@
 #define AP_EXTERNAL_AHRS_VECTORNAV_ENABLED AP_EXTERNAL_AHRS_BACKEND_DEFAULT_ENABLED
 #endif
 
-#ifndef AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED
-#define AP_EXTERNAL_AHRS_INERTIAL_LABS_ENABLED AP_EXTERNAL_AHRS_BACKEND_DEFAULT_ENABLED
+#ifndef AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED
+#define AP_EXTERNAL_AHRS_INERTIALLABS_ENABLED AP_EXTERNAL_AHRS_BACKEND_DEFAULT_ENABLED
 #endif