Changes of min_distance =>mininum_distance_m

mavlink · Oct 12, 2020 · 12940c5 · 12940c5
1 parent 35bfb5d
commit 12940c5
Show file tree

Hide file tree

Showing 7 changed files with 251 additions and 251 deletions.
diff --git a/proto b/proto
diff --git a/src/backend/src/generated/telemetry/telemetry.pb.cc b/src/backend/src/generated/telemetry/telemetry.pb.cc
diff --git a/src/backend/src/generated/telemetry/telemetry.pb.h b/src/backend/src/generated/telemetry/telemetry.pb.h
diff --git a/src/backend/src/plugins/telemetry/telemetry_service_impl.h b/src/backend/src/plugins/telemetry/telemetry_service_impl.h
@@ -762,7 +762,7 @@ class TelemetryServiceImpl final : public rpc::telemetry::TelemetryService::Serv
 
         rpc_obj->set_minimum_distance_m(distance_sensor.minimum_distance_m);
 
-        rpc_obj->set_maximum_distance(distance_sensor.maximum_distance);
+        rpc_obj->set_maximum_distance_m(distance_sensor.maximum_distance_m);
 
         rpc_obj->set_current_distance_m(distance_sensor.current_distance_m);
 
@@ -776,7 +776,7 @@ class TelemetryServiceImpl final : public rpc::telemetry::TelemetryService::Serv
 
         obj.minimum_distance_m = distance_sensor.minimum_distance_m();
 
-        obj.maximum_distance = distance_sensor.maximum_distance();
+        obj.maximum_distance_m = distance_sensor.maximum_distance_m();
 
         obj.current_distance_m = distance_sensor.current_distance_m();
 

diff --git a/src/plugins/telemetry/include/plugins/telemetry/telemetry.h b/src/plugins/telemetry/include/plugins/telemetry/telemetry.h
@@ -554,7 +554,7 @@ class Telemetry : public PluginBase {
     struct DistanceSensor {
         float minimum_distance_m{
             float(NAN)}; /**< @brief Minimum distance the sensor can measure, NaN if unknown. */
-        float maximum_distance{
+        float maximum_distance_m{
             float(NAN)}; /**< @brief Maximum distance the sensor can measure, NaN if unknown. */
         float current_distance_m{
             float(NAN)}; /**< @brief Current distance reading, NaN if unknown. */

diff --git a/src/plugins/telemetry/telemetry.cpp b/src/plugins/telemetry/telemetry.cpp
@@ -829,8 +829,8 @@ bool operator==(const Telemetry::DistanceSensor& lhs, const Telemetry::DistanceS
 {
     return ((std::isnan(rhs.minimum_distance_m) && std::isnan(lhs.minimum_distance_m)) ||
             rhs.minimum_distance_m == lhs.minimum_distance_m) &&
-           ((std::isnan(rhs.maximum_distance) && std::isnan(lhs.maximum_distance)) ||
-            rhs.maximum_distance == lhs.maximum_distance) &&
+           ((std::isnan(rhs.maximum_distance_m) && std::isnan(lhs.maximum_distance_m)) ||
+            rhs.maximum_distance_m == lhs.maximum_distance_m) &&
            ((std::isnan(rhs.current_distance_m) && std::isnan(lhs.current_distance_m)) ||
             rhs.current_distance_m == lhs.current_distance_m);
 }
@@ -840,7 +840,7 @@ std::ostream& operator<<(std::ostream& str, Telemetry::DistanceSensor const& dis
     str << std::setprecision(15);
     str << "distance_sensor:" << '\n' << "{\n";
     str << "    minimum_distance_m: " << distance_sensor.minimum_distance_m << '\n';
-    str << "    maximum_distance: " << distance_sensor.maximum_distance << '\n';
+    str << "    maximum_distance_m: " << distance_sensor.maximum_distance_m << '\n';
     str << "    current_distance_m: " << distance_sensor.current_distance_m << '\n';
     str << '}';
     return str;

diff --git a/src/plugins/telemetry/telemetry_impl.cpp b/src/plugins/telemetry/telemetry_impl.cpp
@@ -1108,9 +1108,9 @@ void TelemetryImpl::process_distance_sensor(const mavlink_message_t& message)
 
     Telemetry::DistanceSensor distance_sensor_struct{};
 
-    distance_sensor_struct.min_distance = distance_sensor_msg.min_distance;
-    distance_sensor_struct.max_distance = distance_sensor_msg.max_distance;
-    distance_sensor_struct.current_distance = distance_sensor_msg.current_distance;
+    distance_sensor_struct.minimum_distance_m = distance_sensor_msg.minimum_distance_m;
+    distance_sensor_struct.maximum_distance_m = distance_sensor_msg.maximum_distance_m;
+    distance_sensor_struct.current_distance_m = distance_sensor_msg.current_distance_m;
 
     set_distance_sensor(distance_sensor_struct);