fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-17 01:43:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename parameter MPC_OBS_AVOID to COM_OBS_AVOID and change the location to commander.

Browse Source
This commit is contained in:
baumanta
2019-03-12 11:24:33 +01:00
committed by Beat Küng
parent f42b378b9b
commit d42b9205f9
7 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.cpp
+1 -1
View File
@@ -227,7 +227,7 @@ bool FlightTaskAuto::_evaluateTriplets()
_mission_gear = _sub_triplet_setpoint->get().current.landing_gear;
}
if (MPC_OBS_AVOID.get() && _sub_vehicle_status->get().is_rotary_wing) {
if (COM_OBS_AVOID.get() && _sub_vehicle_status->get().is_rotary_wing) {
_checkAvoidanceProgress();
}
src/lib/FlightTasks/tasks/Auto/FlightTaskAuto.hpp
+1 -1
View File
@@ -109,7 +109,7 @@ protected:
(ParamFloat<px4::params::MPC_CRUISE_90>) MPC_CRUISE_90, // speed at corner when angle is 90 degrees move to line
(ParamFloat<px4::params::NAV_MC_ALT_RAD>) NAV_MC_ALT_RAD, //vertical acceptance radius at which waypoints are updated
(ParamInt<px4::params::MPC_YAW_MODE>) MPC_YAW_MODE, // defines how heading is executed,
(ParamInt<px4::params::MPC_OBS_AVOID>) MPC_OBS_AVOID // obstacle avoidance active
(ParamInt<px4::params::COM_OBS_AVOID>) COM_OBS_AVOID // obstacle avoidance active
);
private: