PR feedback: altitude_msl -> absolute_altitude_m

Author: Jon Reeves

proto

@@ -267,7 +267,7 @@ void print_fixedwing_metrics(Telemetry::FixedwingMetrics fixedwing_metrics)
               << "Groundspeed: " << fixedwing_metrics.groundspeed_m_s << " m/s, "
               << "Heading: " << fixedwing_metrics.heading_deg << " deg, "
               << "Throttle: " << fixedwing_metrics.throttle_percentage << " %, "
-              << "Altitude: " << fixedwing_metrics.altitude_msl << " m (MSL), "
+              << "Altitude: " << fixedwing_metrics.absolute_altitude_m << " m (MSL), "
               << "Climb: " << fixedwing_metrics.climb_rate_m_s << " m/s" << '\n';
     _received_fixedwing_metrics = true;
 }

src/integration_tests/telemetry_async.cpp

@@ -816,7 +816,7 @@ class Telemetry : public PluginBase {
         float groundspeed_m_s{float(NAN)}; /**< @brief Current groundspeed metres per second */
         float heading_deg{
             float(NAN)}; /**< @brief Current heading in compass units (0-360, 0=north) */
-        float altitude_msl{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
+        float absolute_altitude_m{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
     };
 
     /**

src/mavsdk/plugins/telemetry/include/plugins/telemetry/telemetry.h

@@ -1327,8 +1327,8 @@ bool operator==(const Telemetry::FixedwingMetrics& lhs, const Telemetry::Fixedwi
             rhs.groundspeed_m_s == lhs.groundspeed_m_s) &&
            ((std::isnan(rhs.heading_deg) && std::isnan(lhs.heading_deg)) ||
             rhs.heading_deg == lhs.heading_deg) &&
-           ((std::isnan(rhs.altitude_msl) && std::isnan(lhs.altitude_msl)) ||
-            rhs.altitude_msl == lhs.altitude_msl);
+           ((std::isnan(rhs.absolute_altitude_m) && std::isnan(lhs.absolute_altitude_m)) ||
+            rhs.absolute_altitude_m == lhs.absolute_altitude_m);
 }
 
 std::ostream& operator<<(std::ostream& str, Telemetry::FixedwingMetrics const& fixedwing_metrics)
@@ -1340,7 +1340,7 @@ std::ostream& operator<<(std::ostream& str, Telemetry::FixedwingMetrics const& f
     str << "    climb_rate_m_s: " << fixedwing_metrics.climb_rate_m_s << '\n';
     str << "    groundspeed_m_s: " << fixedwing_metrics.groundspeed_m_s << '\n';
     str << "    heading_deg: " << fixedwing_metrics.heading_deg << '\n';
-    str << "    altitude_msl: " << fixedwing_metrics.altitude_msl << '\n';
+    str << "    absolute_altitude_m: " << fixedwing_metrics.absolute_altitude_m << '\n';
     str << '}';
     return str;
 }

src/mavsdk/plugins/telemetry/telemetry.cpp

@@ -997,7 +997,7 @@ void TelemetryImpl::process_fixedwing_metrics(const mavlink_message_t& message)
     new_fixedwing_metrics.groundspeed_m_s = vfr_hud.groundspeed;
     new_fixedwing_metrics.heading_deg = vfr_hud.heading;
     new_fixedwing_metrics.throttle_percentage = vfr_hud.throttle * 1e-2f;
-    new_fixedwing_metrics.altitude_msl = vfr_hud.alt;
+    new_fixedwing_metrics.absolute_altitude_m = vfr_hud.alt;
     new_fixedwing_metrics.climb_rate_m_s = vfr_hud.climb;
 
     set_fixedwing_metrics(new_fixedwing_metrics);

src/mavsdk/plugins/telemetry/telemetry_impl.cpp

@@ -760,7 +760,7 @@ class TelemetryServer : public ServerPluginBase {
         float groundspeed_m_s{float(NAN)}; /**< @brief Current groundspeed metres per second */
         float heading_deg{
             float(NAN)}; /**< @brief Current heading in compass units (0-360, 0=north) */
-        float altitude_msl{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
+        float absolute_altitude_m{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
     };
 
     /**

src/mavsdk/plugins/telemetry_server/include/plugins/telemetry_server/telemetry_server.h

@@ -656,8 +656,8 @@ bool operator==(
             rhs.groundspeed_m_s == lhs.groundspeed_m_s) &&
            ((std::isnan(rhs.heading_deg) && std::isnan(lhs.heading_deg)) ||
             rhs.heading_deg == lhs.heading_deg) &&
-           ((std::isnan(rhs.altitude_msl) && std::isnan(lhs.altitude_msl)) ||
-            rhs.altitude_msl == lhs.altitude_msl);
+           ((std::isnan(rhs.absolute_altitude_m) && std::isnan(lhs.absolute_altitude_m)) ||
+            rhs.absolute_altitude_m == lhs.absolute_altitude_m);
 }
 
 std::ostream&
@@ -670,7 +670,7 @@ operator<<(std::ostream& str, TelemetryServer::FixedwingMetrics const& fixedwing
     str << "    climb_rate_m_s: " << fixedwing_metrics.climb_rate_m_s << '\n';
     str << "    groundspeed_m_s: " << fixedwing_metrics.groundspeed_m_s << '\n';
     str << "    heading_deg: " << fixedwing_metrics.heading_deg << '\n';
-    str << "    altitude_msl: " << fixedwing_metrics.altitude_msl << '\n';
+    str << "    absolute_altitude_m: " << fixedwing_metrics.absolute_altitude_m << '\n';
     str << '}';
     return str;
 }

src/mavsdk/plugins/telemetry_server/telemetry_server.cpp

@@ -563,7 +563,7 @@ TelemetryServer::Result TelemetryServerImpl::publish_visual_flight_rules_hud(
                        fixed_wing_metrics.groundspeed_m_s,
                        static_cast<uint16_t>(std::round(fixed_wing_metrics.heading_deg)),
                        static_cast<uint16_t>(std::round(fixed_wing_metrics.throttle_percentage)),
-                       fixed_wing_metrics.altitude_msl,
+                       fixed_wing_metrics.absolute_altitude_m,
                        fixed_wing_metrics.climb_rate_m_s);
                    return message;
                }) ?