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

Copter: Failsafe refactor and FS_OPTIONS parameter documentation #2102

Merged
merged 1 commit into from Nov 5, 2019

Conversation

Pedals2Paddles
Copy link
Contributor

Starting to update the copter wiki failsafe pages to follow ArduPilot/ardupilot#7432

@Hwurzburg Hwurzburg mentioned this pull request Oct 19, 2019
27 tasks
@Hwurzburg
Copy link
Contributor

Hwurzburg commented Oct 27, 2019

Matt, I have submitted a PR to your branch with my additions and edits and corrections or you could cherry-pick my fsoptions branch...I probably have guessed at one or two of the fs_option meanings incorrectly...but hopefully this will also serve as a basis for your updates to the other failsafe pages....thanks

let me know if I can help

@Pedals2Paddles
Copy link
Contributor Author

@Hwurzburg I did some more work on this today. I've updated the radio, gcs, and battery pages. You were pretty close on the bitmask, so I updated that as well. I don't have this PC setup to render the pages right now, so I'm only editing the code and preying the formatting is right. I also haven't gone through spelling with a fine tooth comb yet either. Please give this a quick run through if you have a moment as well.

@Hwurzburg
Copy link
Contributor

no problem...will build it and review it tomorrow...thank!

@Pedals2Paddles
Copy link
Contributor Author

I just ran the vagrant builder. Wow, much easier than the last time I tried to do this a few years ago. So I'm fixing up a few more things now too.

@Pedals2Paddles Pedals2Paddles changed the title Copter: Failsafe refactor and FS_OPTIONS parameter (WIP) Copter: Failsafe refactor and FS_OPTIONS parameter documentation Oct 29, 2019
- Set the Failsafe Options to one of the three options:
- **Disabled** (Value 0) will disable the radio failsafe entirely.
- **Enabled Always RTL** (Value 1) will switch the copter to RTL Mode. If the GPS position is not usable, the copter will change to Land Mode instead.
- **Enabled Continue with Mission in Auto Mode (Deprecated in 4.0+)** (Value 2) will ignore the failsafe in an Auto Mode mission. Otherwise, it will behave the same as *Enabled Always RTL*. This option no longer exists in ArduCopter 4.0. Instead, see the :ref:`FS_OPTIONS<FS_OPTIONS>` parameter for this function. Setting this value in Copter4.0 and later version will automatically be converted and set to (Value 1) and the :ref:`FS_OPTIONS<FS_OPTIONS>` will be modified to include bit () in the bitmask for "".
Copy link
Contributor

Choose a reason for hiding this comment

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

one addition needed...."will be modified to include bit (0) in the bitmask for "Continue if in AUTO Mode on Radio Failsafe".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I see a few spelling and grammar errorz in there too. I'll do that this evening.

Copy link
Contributor

@Hwurzburg Hwurzburg left a comment

Choose a reason for hiding this comment

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

Once the one addition above is resolved, this LGTM
I have built and tested the pages for format and build errors...@rmackay9 can merge if he's happy

@Pedals2Paddles
Copy link
Contributor Author

Fixed up squashed and pushed!

@Hwurzburg
Copy link
Contributor

builds fine...LGTM

@Pedals2Paddles
Copy link
Contributor Author

Could someone kindly merge this? The PR this covers in Copter 4 and master is in so this needs to go in.

@Hwurzburg
Copy link
Contributor

we a have review call tomorrow...it'll merge then unless someone has an issue with it...or Randy does it tonight, since he's the reviewer...

@rmackay9 rmackay9 merged commit f6c8dfd into ArduPilot:master Nov 5, 2019
@rmackay9
Copy link
Contributor

rmackay9 commented Nov 5, 2019

Merged, thanks!

@proficnc
Copy link
Contributor

proficnc commented Nov 5, 2019

Awesome!!!

@Pedals2Paddles
Copy link
Contributor Author

Thx!

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.

None yet

4 participants