Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-21 23:33:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

GCS_MAVLink: handld MAV_CMD_DO_FENCE_ENABLE as both long and int

Browse Source
This commit is contained in:
Peter Barker 2023-10-19 10:19:47 +11:00 committed by Andrew Tridgell
parent c3c7784c23
commit 25846eb2bc
3 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

@ -658,7 +658,7 @@ protected:
MAV_RESULT handle_command_do_sprayer(const mavlink_command_long_t &packet);
MAV_RESULT handle_command_do_set_mode(const mavlink_command_int_t &packet);
MAV_RESULT handle_command_get_home_position(const mavlink_command_int_t &packet);
MAV_RESULT handle_command_do_fence_enable(const mavlink_command_long_t &packet);
MAV_RESULT handle_command_do_fence_enable(const mavlink_command_int_t &packet);
MAV_RESULT handle_command_debug_trap(const mavlink_command_int_t &packet);
MAV_RESULT handle_command_set_ekf_source_set(const mavlink_command_int_t &packet);
MAV_RESULT handle_command_airframe_configuration(const mavlink_command_int_t &packet);

11
libraries/GCS_MAVLink/GCS_Common.cpp
View File

@ -4727,12 +4727,6 @@ MAV_RESULT GCS_MAVLINK::handle_command_long_packet(const mavlink_command_long_t
switch (packet.command) {
#if AP_FENCE_ENABLED
case MAV_CMD_DO_FENCE_ENABLE:
result = handle_command_do_fence_enable(packet);
break;
#endif
#if HAL_HIGH_LATENCY2_ENABLED
case MAV_CMD_CONTROL_HIGH_LATENCY:
result = handle_control_high_latency(packet);
@ -5085,6 +5079,11 @@ MAV_RESULT GCS_MAVLINK::handle_command_int_packet(const mavlink_command_int_t &p
case MAV_CMD_DO_AUX_FUNCTION:
return handle_command_do_aux_function(packet);
#if AP_FENCE_ENABLED
case MAV_CMD_DO_FENCE_ENABLE:
return handle_command_do_fence_enable(packet);
#endif
case MAV_CMD_DO_FLIGHTTERMINATION:
return handle_flight_termination(packet);

2
libraries/GCS_MAVLink/GCS_Fence.cpp
View File

@ -9,7 +9,7 @@
#include <AC_Avoidance/AC_Avoid.h>
#include <AP_Vehicle/AP_Vehicle_Type.h>
MAV_RESULT GCS_MAVLINK::handle_command_do_fence_enable(const mavlink_command_long_t &packet)
MAV_RESULT GCS_MAVLINK::handle_command_do_fence_enable(const mavlink_command_int_t &packet)
{
AC_Fence *fence = AP::fence();
if (fence == nullptr) {