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

Failsafe params update to reflect current mode names #9429

Merged
merged 6 commits into from
May 8, 2018
Merged

Failsafe params update to reflect current mode names #9429

merged 6 commits into from
May 8, 2018

Conversation

hamishwillee
Copy link
Contributor

@hamishwillee hamishwillee commented May 7, 2018

@hamishwillee hamishwillee requested a review from bkueng May 7, 2018 07:02
* @value 5 Loiter
* @value 0 Position mode
* @value 1 Altitude mode
* @value 2 Manual/Stabilized
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be checked. I believe that this should be Manual-Stabilized mode in MC and Stabilized mode in FW (rather than Manual mode in FW, which would not be a sensible mode switch).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It actually goes into Manual, even in fixed-wing. Not sure if that's intended though.

Copy link
Contributor Author

@hamishwillee hamishwillee May 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So Manual for both cases (where MC Manual is actually Manual/Stabilized) I will change appropriately.

The manual is very hard to fly apparently in FW. Would have thought Stabilized made more sense for FW.

@@ -53,13 +53,13 @@
* @max 150
* @decimal 1
* @increment 0.5
* @group Return To Land
* @group Return mode
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bkueng Note I changed the group here (and below)- hope this is OK!

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm ok with that. Can you capitalize Mode?

@hamishwillee
Copy link
Contributor Author

Should be good to merge now.

Copy link
Member

@dagar dagar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Hamish

@hamishwillee
Copy link
Contributor Author

You're welcome @dagar - you or @bkueng will have to merge as I don't have the magic.

@bkueng bkueng merged commit 9a7195c into PX4:master May 8, 2018
@hamishwillee hamishwillee deleted the failsafe_params branch October 17, 2018 04:03
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