mirror of
https://gitee.com/mirrors_PX4/PX4-Autopilot.git
synced 2026-04-14 10:07:39 +08:00
3b0dac6840
* RTL Direct: fix rlt time prediction in final lanidng phase It was previously checking if RTL was already running through active(), which though actually is coming from the mission mode that rtl_direct inherits from. Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL Direct: remove unnecessary active() check As the method setRtlPosition() is anyway not called when RTL is active, plus it checks the wrong thing, as it is the active() method from the Mission mode. Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL Direct: remove unnecessary land_detector_sub.update() It is already getting updated just before the .get() Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL time estiate: do not distinguish land from sink for MC To avoid rtl time prediction jump when entering LAND phase due to no correct handling of loiter altitude (LAND phase doesn't have to start only when lower then RTL_DESCND_ALT). Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * Revert "RTL Direct: remove unnecessary active() check" This reverts commit d5165ba902e65839e792cc13197761c7f77748f9. * Revert "RTL Direct: fix rlt time prediction in final lanidng phase" This reverts commit 5af7c928fbf86d560dcd35dd9aea3e38f1e4c735. * RTL: Make sure to call the initialilze function of the Navigator RTL modes * RTL: use the navigator_mode run function instead of the on_xxx function directly * RTL: Make sure that for vtol the right vehicle type is used for each RTL state * RTL: move to loiter distance estimate should substract the loiter radius for fixed wing * RTL: time prediction: do not assume VTOL is in FW at start of RTL Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL: time estimation: fix is_in_climbing_submode Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL: time estimation: subtract loiter radius from distance in rtl_direct_mission_land Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * RTL direct: poll important topics also on_inactive such that time estimate is correct Signed-off-by: Silvan Fuhrer <silvan@auterion.com> * navigator rtl: fix setter spacing * navigator rtl: check pointer before dereferencing * RTL: only subract loiter radius when in FW Signed-off-by: Silvan Fuhrer <silvan@auterion.com> --------- Signed-off-by: Silvan Fuhrer <silvan@auterion.com> Co-authored-by: Konrad <konrad@auterion.com> Co-authored-by: Matthias Grob <maetugr@gmail.com>