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

fw pos ctrl: rework landing abort status

Browse Source 
abort boolean and reasons no longer separated, single status field with corresponding abort triggers
This commit is contained in:
Thomas Stastny
2022-07-19 22:37:09 -04:00
committed by Daniel Agar
parent 694d36050a
commit 121cc1fce8
5 changed files with 76 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/navigator/navigator_main.cpp
+1 -1
View File
@@ -1407,7 +1407,7 @@ bool Navigator::abort_landing()
// landing status from position controller must be newer than navigator's last position setpoint
if (_pos_ctrl_landing_status_sub.copy(&landing_status)) {
if (landing_status.timestamp > _pos_sp_triplet.timestamp) {
should_abort = landing_status.abort_landing;
should_abort = (landing_status.abort_status > 0);
}
}
}