fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-21 14:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix style

Browse Source
This commit is contained in:
Julian Oes
2021-11-09 16:05:25 +01:00
committed by Matthias Grob
parent 71d6aa913d
commit 08e58a44e9
5 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/Commander.cpp
+2
View File
@@ -973,6 +973,7 @@ Commander::handle_command(const vehicle_command_s &cmd)
} else {
if (cmd_from_manual_stick) {
arming_res = arm(arm_disarm_reason_t::rc_stick, !forced);
} else {
arming_res = arm(arm_disarm_reason_t::command_internal, !forced);
}
@@ -985,6 +986,7 @@ Commander::handle_command(const vehicle_command_s &cmd)
} else {
if (cmd_from_manual_stick) {
arming_res = disarm(arm_disarm_reason_t::rc_stick);
} else {
arming_res = disarm(arm_disarm_reason_t::command_internal);
}
src/modules/commander/ManualControl.cpp
+2 -1
View File
@@ -66,7 +66,8 @@ bool ManualControl::wantsOverride(const vehicle_control_mode_s &vehicle_control_
const bool override_auto_mode = (_param_rc_override.get() & static_cast<int32_t>(OverrideBits::OVERRIDE_AUTO_MODE_BIT))
&& vehicle_control_mode.flag_control_auto_enabled;
const bool override_offboard_mode = (_param_rc_override.get() & static_cast<int32_t>(OverrideBits::OVERRIDE_OFFBOARD_MODE_BIT))
const bool override_offboard_mode = (_param_rc_override.get() & static_cast<int32_t>
(OverrideBits::OVERRIDE_OFFBOARD_MODE_BIT))
&& vehicle_control_mode.flag_control_offboard_enabled;
// in Descend manual override is enbaled independently of COM_RC_OVERRIDE