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

commander: CMD_COMPONENT_ARM_DISARM don't block disarm if maybe_landed

Browse Source
This commit is contained in:
Daniel Agar 2020-05-20 14:41:49 -04:00
parent 7b41ce4711
commit ade8a13203
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/commander/Commander.cpp
View File

@ -680,7 +680,7 @@ Commander::handle_command(vehicle_status_s *status_local, const vehicle_command_
const bool enforce = (static_cast<int>(roundf(cmd.param2)) == 21196);
if (!enforce) {
if (!_land_detector.landed && !is_ground_rover(&status)) {
if (!(_land_detector.landed || _land_detector.maybe_landed) && !is_ground_rover(&status)) {
if (cmd_arms) {
if (armed_local->armed) {
mavlink_log_warning(&mavlink_log_pub, "Arming denied! Already armed");