aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GCS_MAVLink: remove no-longer-required location_from_command_t(command_long)

Browse Source
This commit is contained in:
Peter Barker 2023-11-08 21:25:39 +11:00 committed by Peter Barker
parent 485fa80f1c
commit 9ff9f8d216
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/GCS_MAVLink/GCS.h
View File

@ -732,8 +732,7 @@ protected:
// initialised. // initialised.
virtual void convert_COMMAND_LONG_to_COMMAND_INT(const mavlink_command_long_t &in, mavlink_command_int_t &out, MAV_FRAME frame = MAV_FRAME_GLOBAL_RELATIVE_ALT); virtual void convert_COMMAND_LONG_to_COMMAND_INT(const mavlink_command_long_t &in, mavlink_command_int_t &out, MAV_FRAME frame = MAV_FRAME_GLOBAL_RELATIVE_ALT);
// methods to extract a Location object from a command_long or command_int // methods to extract a Location object from a command_int
bool location_from_command_t(const mavlink_command_long_t &in, MAV_FRAME in_frame, Location &out);
bool location_from_command_t(const mavlink_command_int_t &in, Location &out); bool location_from_command_t(const mavlink_command_int_t &in, Location &out);
private: private:

8
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -4751,14 +4751,6 @@ MAV_RESULT GCS_MAVLINK::try_command_long_as_command_int(const mavlink_command_lo
return handle_command_int_packet(command_int, msg); return handle_command_int_packet(command_int, msg);
} }
bool GCS_MAVLINK::location_from_command_t(const mavlink_command_long_t &in, MAV_FRAME in_frame, Location &out)
{
mavlink_command_int_t command_int;
convert_COMMAND_LONG_to_COMMAND_INT(in, command_int, in_frame);
return location_from_command_t(command_int, out);
}
bool GCS_MAVLINK::location_from_command_t(const mavlink_command_int_t &in, Location &out) bool GCS_MAVLINK::location_from_command_t(const mavlink_command_int_t &in, Location &out)
{ {
if (!command_long_stores_location((MAV_CMD)in.command)) { if (!command_long_stores_location((MAV_CMD)in.command)) {