From 0a3ff72fd82d7490d6482688d70a334abc4c7a29 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 19 Apr 2024 08:50:53 +1000 Subject: [PATCH] AP_Baro: correct placement of field elevation #endif wind compensation and field elevation should be unrelated --- libraries/AP_Baro/AP_Baro.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/AP_Baro/AP_Baro.cpp b/libraries/AP_Baro/AP_Baro.cpp index 77feaab0f28d3f..0938cad303b4bb 100644 --- a/libraries/AP_Baro/AP_Baro.cpp +++ b/libraries/AP_Baro/AP_Baro.cpp @@ -217,12 +217,13 @@ const AP_Param::GroupInfo AP_Baro::var_info[] = { // @Path: AP_Baro_Wind.cpp AP_SUBGROUPINFO(sensors[1].wind_coeff, "2_WCF_", 19, AP_Baro, WindCoeff), #endif - #if BARO_MAX_INSTANCES > 2 // @Group: 3_WCF_ // @Path: AP_Baro_Wind.cpp AP_SUBGROUPINFO(sensors[2].wind_coeff, "3_WCF_", 20, AP_Baro, WindCoeff), #endif +#endif // HAL_BARO_WIND_COMP_ENABLED + #if AP_FIELD_ELEVATION_ENABLED // @Param: _FIELD_ELV // @DisplayName: field elevation @@ -233,7 +234,6 @@ const AP_Param::GroupInfo AP_Baro::var_info[] = { // @User: Advanced AP_GROUPINFO("_FIELD_ELV", 22, AP_Baro, _field_elevation, 0), #endif -#endif #if APM_BUILD_COPTER_OR_HELI || APM_BUILD_TYPE(APM_BUILD_ArduPlane) // @Param: _ALTERR_MAX