Skip to content

[1.17] Bugfix: Let user take over from a degraded failsafe#26269

Merged
farhangnaderi merged 3 commits intorelease/1.17from
maetugr/fix-failsafe-takeover-1.17
Jan 15, 2026
Merged

[1.17] Bugfix: Let user take over from a degraded failsafe#26269
farhangnaderi merged 3 commits intorelease/1.17from
maetugr/fix-failsafe-takeover-1.17

Conversation

@MaEtUgR
Copy link
Member

@MaEtUgR MaEtUgR commented Jan 14, 2026

Solved Problem

Based on the discussion in the ongoing PX4 dev call I'm backporting the fix:
#26237
It will not be backported to 1.16.

Note: The fix is the condition on the last line of the diff, the rest is unit testing and comment.

Changelog Entry

Bugfix: Let user take over from a degraded failsafe

@MaEtUgR MaEtUgR requested a review from mrpollo January 14, 2026 16:31
@MaEtUgR MaEtUgR self-assigned this Jan 14, 2026
dakejahl and others added 3 commits January 14, 2026 17:39
…ailsafes 2 not cause immediate takeover when failsafe happens because of mode switch

The first test makes sure the user can take over when an RTL failsafe was triggered but degraded to a Land.

The second test rules out the easiest fix of removing the condition `_selected_action == selected_action` which causes the problem for test one but is there for a reason.
@MaEtUgR MaEtUgR force-pushed the maetugr/fix-failsafe-takeover-1.17 branch from dd0e908 to 868632e Compare January 14, 2026 16:40
@farhangnaderi farhangnaderi merged commit e841fe0 into release/1.17 Jan 15, 2026
71 of 72 checks passed
@farhangnaderi farhangnaderi deleted the maetugr/fix-failsafe-takeover-1.17 branch January 15, 2026 19:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants