From b9c4d40c4600144caafcf9ade682690fc2076268 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Tue, 20 Jul 2021 22:16:21 +1000 Subject: [PATCH] AP_NMEA_Output: remove ability to use DCM as AHRS --- libraries/AP_NMEA_Output/AP_NMEA_Output.cpp | 4 ++-- libraries/AP_NMEA_Output/AP_NMEA_Output.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/AP_NMEA_Output/AP_NMEA_Output.cpp b/libraries/AP_NMEA_Output/AP_NMEA_Output.cpp index 2cf816c7ee..602e0cf250 100644 --- a/libraries/AP_NMEA_Output/AP_NMEA_Output.cpp +++ b/libraries/AP_NMEA_Output/AP_NMEA_Output.cpp @@ -19,7 +19,7 @@ #include "AP_NMEA_Output.h" -#if !HAL_MINIMIZE_FEATURES && AP_AHRS_NAVEKF_AVAILABLE +#if !HAL_MINIMIZE_FEATURES #include #include @@ -187,4 +187,4 @@ void AP_NMEA_Output::update() } } -#endif // !HAL_MINIMIZE_FEATURES && AP_AHRS_NAVEKF_AVAILABLE +#endif // !HAL_MINIMIZE_FEATURES diff --git a/libraries/AP_NMEA_Output/AP_NMEA_Output.h b/libraries/AP_NMEA_Output/AP_NMEA_Output.h index afd0192e29..1eaf4c1bc2 100644 --- a/libraries/AP_NMEA_Output/AP_NMEA_Output.h +++ b/libraries/AP_NMEA_Output/AP_NMEA_Output.h @@ -22,7 +22,7 @@ #include #include -#if !HAL_MINIMIZE_FEATURES && AP_AHRS_NAVEKF_AVAILABLE +#if !HAL_MINIMIZE_FEATURES #include @@ -50,4 +50,4 @@ private: uint32_t _last_run_ms; }; -#endif // !HAL_MINIMIZE_FEATURES && AP_AHRS_NAVEKF_AVAILABLE +#endif // !HAL_MINIMIZE_FEATURES