Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FailureDetector - Ignore attitude check for MC in acro and FW in manual, acro and rattitude modes #12655

Merged
merged 2 commits into from
Sep 24, 2019

Conversation

bresch
Copy link
Member

@bresch bresch commented Aug 7, 2019

The FailureDetector currently checks for attitude that exceeds a defined angle. This is done regardless the flight mode.

I added a check for acro in MC and acro+rattitude+manual mode in FW to ignore the attitude failure checks as the drone is expected to exceed the defined angles.

Briefly test in SITL.

@bresch bresch requested a review from dagar August 7, 2019 09:43
@bresch bresch self-assigned this Aug 7, 2019
@dagar
Copy link
Member

dagar commented Aug 8, 2019

What about using vehicle_control_mode directly? https://github.com/PX4/Firmware/blob/e43e37cc46ef74da0fa86bfe2a9b470c9c472467/msg/vehicle_control_mode.msg#L10

Rattitude would be the special case, but I think we could change it slightly to have flag_control_attitude_enabled = false for NAVIGATION_STATE_RATTITUDE, but still have the attitude controllers behave the same way they do now.

@bresch
Copy link
Member Author

bresch commented Sep 23, 2019

@dagar Since the check is fairly simple here, I don't see the advantage of changing the meaning of the flag_control_attitude_enabled (enable attitude controller), I think it should be good enough like that.

@bresch bresch force-pushed the pr-failure-acro-check branch 2 times, most recently from 9fb3dcc to e5b904b Compare September 24, 2019 11:31
pass vehicle_status from commander instead of subscribing to it.
@bresch bresch force-pushed the pr-failure-acro-check branch from e5b904b to 0279a79 Compare September 24, 2019 12:14
@bkueng bkueng merged commit 6139812 into master Sep 24, 2019
@bkueng bkueng deleted the pr-failure-acro-check branch September 24, 2019 12:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants