Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: handle control-high-latency as both long and int

This commit is contained in:
Peter Barker 2023-10-24 13:24:07 +11:00 committed by Peter Barker
parent 5e55e143cc
commit 740b939aa5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/GCS_MAVLink/GCS.h
View File

@ -706,7 +706,7 @@ protected:
virtual uint8_t high_latency_wind_direction() const { return 0; }
int8_t high_latency_air_temperature() const;
MAV_RESULT handle_control_high_latency(const mavlink_command_long_t &packet);
MAV_RESULT handle_control_high_latency(const mavlink_command_int_t &packet);
#endif // HAL_HIGH_LATENCY2_ENABLED

13
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -4734,12 +4734,6 @@ MAV_RESULT GCS_MAVLINK::handle_command_long_packet(const mavlink_command_long_t
switch (packet.command) {
#if HAL_HIGH_LATENCY2_ENABLED
case MAV_CMD_CONTROL_HIGH_LATENCY:
result = handle_control_high_latency(packet);
break;
#endif // HAL_HIGH_LATENCY2_ENABLED
case MAV_CMD_START_RX_PAIR:
result = handle_rc_bind(packet);
break;
@ -5081,6 +5075,11 @@ MAV_RESULT GCS_MAVLINK::handle_command_int_packet(const mavlink_command_int_t &p
return handle_can_forward(packet, msg);
#endif
#if HAL_HIGH_LATENCY2_ENABLED
case MAV_CMD_CONTROL_HIGH_LATENCY:
return handle_control_high_latency(packet);
#endif // HAL_HIGH_LATENCY2_ENABLED
case MAV_CMD_DEBUG_TRAP:
return handle_command_debug_trap(packet);
@ -6714,7 +6713,7 @@ int8_t GCS_MAVLINK::high_latency_air_temperature() const
Enable or disable any marked (via SERIALn_PROTOCOL) high latency connections
*/
MAV_RESULT GCS_MAVLINK::handle_control_high_latency(const mavlink_command_long_t &packet)
MAV_RESULT GCS_MAVLINK::handle_control_high_latency(const mavlink_command_int_t &packet)
{
// high latency mode is enabled if param1=1 or disabled if param1=0
if (is_equal(packet.param1, 0.0f)) {