Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add bottom_clearance to altitude in telemetry #1930

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proto
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,9 @@ class Telemetry : public PluginBase {
float altitude_local_m{float(NAN)}; /**< @brief Local altitude in meters */
float altitude_relative_m{float(NAN)}; /**< @brief Altitude above home position in meters */
float altitude_terrain_m{float(NAN)}; /**< @brief Altitude above terrain in meters */
float bottom_clearance_m{
float(NAN)}; /**< @brief This is not the altitude, but the clear space below the system
according to the fused clearance estimate in meters. */
};

/**
Expand Down
5 changes: 4 additions & 1 deletion src/mavsdk/plugins/telemetry/telemetry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1486,7 +1486,9 @@ bool operator==(const Telemetry::Altitude& lhs, const Telemetry::Altitude& rhs)
((std::isnan(rhs.altitude_relative_m) && std::isnan(lhs.altitude_relative_m)) ||
rhs.altitude_relative_m == lhs.altitude_relative_m) &&
((std::isnan(rhs.altitude_terrain_m) && std::isnan(lhs.altitude_terrain_m)) ||
rhs.altitude_terrain_m == lhs.altitude_terrain_m);
rhs.altitude_terrain_m == lhs.altitude_terrain_m) &&
((std::isnan(rhs.bottom_clearance_m) && std::isnan(lhs.bottom_clearance_m)) ||
rhs.bottom_clearance_m == lhs.bottom_clearance_m);
}

std::ostream& operator<<(std::ostream& str, Telemetry::Altitude const& altitude)
Expand All @@ -1498,6 +1500,7 @@ std::ostream& operator<<(std::ostream& str, Telemetry::Altitude const& altitude)
str << " altitude_local_m: " << altitude.altitude_local_m << '\n';
str << " altitude_relative_m: " << altitude.altitude_relative_m << '\n';
str << " altitude_terrain_m: " << altitude.altitude_terrain_m << '\n';
str << " bottom_clearance_m: " << altitude.bottom_clearance_m << '\n';
str << '}';
return str;
}
Expand Down
1 change: 1 addition & 0 deletions src/mavsdk/plugins/telemetry/telemetry_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,7 @@ void TelemetryImpl::process_altitude(const mavlink_message_t& message)
new_altitude.altitude_local_m = mavlink_altitude.altitude_local;
new_altitude.altitude_relative_m = mavlink_altitude.altitude_relative;
new_altitude.altitude_terrain_m = mavlink_altitude.altitude_terrain;
new_altitude.bottom_clearance_m = mavlink_altitude.bottom_clearance;

set_altitude(new_altitude);

Expand Down
501 changes: 269 additions & 232 deletions src/mavsdk_server/src/generated/telemetry/telemetry.pb.cc

Large diffs are not rendered by default.

31 changes: 31 additions & 0 deletions src/mavsdk_server/src/generated/telemetry/telemetry.pb.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,8 @@ class TelemetryServiceImpl final : public rpc::telemetry::TelemetryService::Serv

rpc_obj->set_altitude_terrain_m(altitude.altitude_terrain_m);

rpc_obj->set_bottom_clearance_m(altitude.bottom_clearance_m);

return rpc_obj;
}

Expand All @@ -1285,6 +1287,8 @@ class TelemetryServiceImpl final : public rpc::telemetry::TelemetryService::Serv

obj.altitude_terrain_m = altitude.altitude_terrain_m();

obj.bottom_clearance_m = altitude.bottom_clearance_m();

return obj;
}

Expand Down