Re-order FixedwingMetrics fields for backward compatibility

Author: Jon Reeves

proto

@@ -811,12 +811,12 @@ class Telemetry : public PluginBase {
     struct FixedwingMetrics {
         float airspeed_m_s{
             float(NAN)}; /**< @brief Current indicated airspeed (IAS) in metres per second */
+        float throttle_percentage{float(NAN)}; /**< @brief Current throttle setting (0 to 100) */
+        float climb_rate_m_s{float(NAN)}; /**< @brief Current climb rate in metres per second */
         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 throttle_percentage{float(NAN)}; /**< @brief Current throttle setting (0 to 100) */
         float altitude_msl{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
-        float climb_rate_m_s{float(NAN)}; /**< @brief Current climb rate in metres per second */
     };
 
     /**

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

@@ -1319,28 +1319,28 @@ bool operator==(const Telemetry::FixedwingMetrics& lhs, const Telemetry::Fixedwi
 {
     return ((std::isnan(rhs.airspeed_m_s) && std::isnan(lhs.airspeed_m_s)) ||
             rhs.airspeed_m_s == lhs.airspeed_m_s) &&
+           ((std::isnan(rhs.throttle_percentage) && std::isnan(lhs.throttle_percentage)) ||
+            rhs.throttle_percentage == lhs.throttle_percentage) &&
+           ((std::isnan(rhs.climb_rate_m_s) && std::isnan(lhs.climb_rate_m_s)) ||
+            rhs.climb_rate_m_s == lhs.climb_rate_m_s) &&
            ((std::isnan(rhs.groundspeed_m_s) && std::isnan(lhs.groundspeed_m_s)) ||
             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.throttle_percentage) && std::isnan(lhs.throttle_percentage)) ||
-            rhs.throttle_percentage == lhs.throttle_percentage) &&
            ((std::isnan(rhs.altitude_msl) && std::isnan(lhs.altitude_msl)) ||
-            rhs.altitude_msl == lhs.altitude_msl) &&
-           ((std::isnan(rhs.climb_rate_m_s) && std::isnan(lhs.climb_rate_m_s)) ||
-            rhs.climb_rate_m_s == lhs.climb_rate_m_s);
+            rhs.altitude_msl == lhs.altitude_msl);
 }
 
 std::ostream& operator<<(std::ostream& str, Telemetry::FixedwingMetrics const& fixedwing_metrics)
 {
     str << std::setprecision(15);
     str << "fixedwing_metrics:" << '\n' << "{\n";
     str << "    airspeed_m_s: " << fixedwing_metrics.airspeed_m_s << '\n';
+    str << "    throttle_percentage: " << fixedwing_metrics.throttle_percentage << '\n';
+    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 << "    throttle_percentage: " << fixedwing_metrics.throttle_percentage << '\n';
     str << "    altitude_msl: " << fixedwing_metrics.altitude_msl << '\n';
-    str << "    climb_rate_m_s: " << fixedwing_metrics.climb_rate_m_s << '\n';
     str << '}';
     return str;
 }

src/mavsdk/plugins/telemetry/telemetry.cpp

@@ -755,12 +755,12 @@ class TelemetryServer : public ServerPluginBase {
     struct FixedwingMetrics {
         float airspeed_m_s{
             float(NAN)}; /**< @brief Current indicated airspeed (IAS) in metres per second */
+        float throttle_percentage{float(NAN)}; /**< @brief Current throttle setting (0 to 100) */
+        float climb_rate_m_s{float(NAN)}; /**< @brief Current climb rate in metres per second */
         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 throttle_percentage{float(NAN)}; /**< @brief Current throttle setting (0 to 100) */
         float altitude_msl{float(NAN)}; /**< @brief Current altitude in metres (MSL) */
-        float climb_rate_m_s{float(NAN)}; /**< @brief Current climb rate in metres per second */
     };
 
     /**

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

@@ -648,16 +648,16 @@ bool operator==(
 {
     return ((std::isnan(rhs.airspeed_m_s) && std::isnan(lhs.airspeed_m_s)) ||
             rhs.airspeed_m_s == lhs.airspeed_m_s) &&
+           ((std::isnan(rhs.throttle_percentage) && std::isnan(lhs.throttle_percentage)) ||
+            rhs.throttle_percentage == lhs.throttle_percentage) &&
+           ((std::isnan(rhs.climb_rate_m_s) && std::isnan(lhs.climb_rate_m_s)) ||
+            rhs.climb_rate_m_s == lhs.climb_rate_m_s) &&
            ((std::isnan(rhs.groundspeed_m_s) && std::isnan(lhs.groundspeed_m_s)) ||
             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.throttle_percentage) && std::isnan(lhs.throttle_percentage)) ||
-            rhs.throttle_percentage == lhs.throttle_percentage) &&
            ((std::isnan(rhs.altitude_msl) && std::isnan(lhs.altitude_msl)) ||
-            rhs.altitude_msl == lhs.altitude_msl) &&
-           ((std::isnan(rhs.climb_rate_m_s) && std::isnan(lhs.climb_rate_m_s)) ||
-            rhs.climb_rate_m_s == lhs.climb_rate_m_s);
+            rhs.altitude_msl == lhs.altitude_msl);
 }
 
 std::ostream&
@@ -666,11 +666,11 @@ operator<<(std::ostream& str, TelemetryServer::FixedwingMetrics const& fixedwing
     str << std::setprecision(15);
     str << "fixedwing_metrics:" << '\n' << "{\n";
     str << "    airspeed_m_s: " << fixedwing_metrics.airspeed_m_s << '\n';
+    str << "    throttle_percentage: " << fixedwing_metrics.throttle_percentage << '\n';
+    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 << "    throttle_percentage: " << fixedwing_metrics.throttle_percentage << '\n';
     str << "    altitude_msl: " << fixedwing_metrics.altitude_msl << '\n';
-    str << "    climb_rate_m_s: " << fixedwing_metrics.climb_rate_m_s << '\n';
     str << '}';
     return str;
 }