diff options
| author | Matt Beall <matt.beall@greypointcorp.com> | 2015-02-25 14:25:28 -0700 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2015-02-28 15:19:16 +0100 |
| commit | 220fb19eb74b330bd3e97efc628aeb1bda510dcf (patch) | |
| tree | 8e301637b76e75bff02aa4c8bac7923c12fc9090 /src/modules/commander/commander.cpp | |
| parent | d7dc3a3ee85e3a3c28d97ef49d53026f254d3650 (diff) | |
| download | px4-firmware-220fb19eb74b330bd3e97efc628aeb1bda510dcf.tar.gz px4-firmware-220fb19eb74b330bd3e97efc628aeb1bda510dcf.tar.bz2 px4-firmware-220fb19eb74b330bd3e97efc628aeb1bda510dcf.zip | |
Removed actuator_control_mode flags...Using pre-existing flags instead
Diffstat (limited to 'src/modules/commander/commander.cpp')
| -rw-r--r-- | src/modules/commander/commander.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp index 024e6c18a..2c5e0aa88 100644 --- a/src/modules/commander/commander.cpp +++ b/src/modules/commander/commander.cpp @@ -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: |