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

RC_Channel: don't use avoidance on plane

Browse Source
This commit is contained in:
Andrew Tridgell 2022-01-05 21:26:39 +11:00
parent 06dcd5a16f
commit 4733f57102
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/RC_Channel/RC_Channel.cpp
View File

@ -46,6 +46,7 @@ extern const AP_HAL::HAL& hal;
#include <AP_Mount/AP_Mount.h> #include <AP_Mount/AP_Mount.h>
#include <AP_VideoTX/AP_VideoTX.h> #include <AP_VideoTX/AP_VideoTX.h>
#include <AP_Torqeedo/AP_Torqeedo.h> #include <AP_Torqeedo/AP_Torqeedo.h>
#include <AP_Vehicle/AP_Vehicle_Type.h>
#define SWITCH_DEBOUNCE_TIME_MS 200 #define SWITCH_DEBOUNCE_TIME_MS 200
@ -689,6 +690,7 @@ void RC_Channel::do_aux_function_avoid_adsb(const AuxSwitchPos ch_flag)
void RC_Channel::do_aux_function_avoid_proximity(const AuxSwitchPos ch_flag) void RC_Channel::do_aux_function_avoid_proximity(const AuxSwitchPos ch_flag)
{ {
#if !APM_BUILD_TYPE(APM_BUILD_ArduPlane)
AC_Avoid *avoid = AP::ac_avoid(); AC_Avoid *avoid = AP::ac_avoid();
if (avoid == nullptr) { if (avoid == nullptr) {
return; return;
@ -705,6 +707,7 @@ void RC_Channel::do_aux_function_avoid_proximity(const AuxSwitchPos ch_flag)
avoid->proximity_avoidance_enable(false); avoid->proximity_avoidance_enable(false);
break; break;
} }
#endif // !APM_BUILD_ArduPlane
} }
void RC_Channel::do_aux_function_camera_trigger(const AuxSwitchPos ch_flag) void RC_Channel::do_aux_function_camera_trigger(const AuxSwitchPos ch_flag)