fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-06-26 06:30:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed actuator_control_mode flags...Using pre-existing flags instead

Browse Source
This commit is contained in:
Matt Beall
2015-02-25 14:25:28 -07:00
committed by Thomas Gubler
parent d7dc3a3ee8
commit 220fb19eb7
7 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/commander.cpp
-10
View File
@@ -2302,7 +2302,6 @@ set_control_mode()
control_mode.flag_external_manual_override_ok = (!status.is_rotary_wing && !status.is_vtol);
control_mode.flag_system_hil_enabled = status.hil_state == vehicle_status_s::HIL_STATE_ON;
control_mode.flag_control_offboard_enabled = false;
control_mode.flag_control_offboard_actuator_control_enabled = false;
switch (status.nav_state) {
case vehicle_status_s::NAVIGATION_STATE_MANUAL:
@@ -2442,7 +2441,6 @@ set_control_mode()
!offboard_control_mode.ignore_velocity ||
!offboard_control_mode.ignore_acceleration_force;
control_mode.flag_control_velocity_enabled = !offboard_control_mode.ignore_velocity ||
!offboard_control_mode.ignore_position;
@@ -2453,14 +2451,6 @@ set_control_mode()
control_mode.flag_control_altitude_enabled = !offboard_control_mode.ignore_position;
control_mode.flag_control_offboard_actuator_control_enabled = offboard_control_mode.ignore_thrust &&
offboard_control_mode.ignore_attitude &&
offboard_control_mode.ignore_bodyrate &&
offboard_control_mode.ignore_position &&
offboard_control_mode.ignore_velocity &&
offboard_control_mode.ignore_acceleration_force &&
offboard_control_mode.actuator_control_mode;
break;
default: