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

updated rtl parameter descriptions. #12470

Merged
merged 3 commits into from
Oct 21, 2019
Merged

updated rtl parameter descriptions. #12470

merged 3 commits into from
Oct 21, 2019

Conversation

RomanBapst
Copy link
Contributor

Adjusted comments after adding support for RTL cone in #12382

@hamishwillee FYI

*
* Altitude to fly back in RTL in meters
* Relative altitude above home at which the vehicle will return during RTL mode.
Copy link
Contributor

@hamishwillee hamishwillee Jul 15, 2019

Choose a reason for hiding this comment

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

Perhaps "Default minimum altitude above home for return flight in return mode."

  1. Altitude above home is by definition relative.
  2. We're using Return mode in QGC. RTL is of course embedded in the psych!

@@ -59,7 +60,7 @@ PARAM_DEFINE_FLOAT(RTL_RETURN_ALT, 60);


/**
* Return mode loiter altitude
* Return to home relative loiter altitude.
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps

Return mode loiter altitude (relative to home).

@@ -89,11 +90,11 @@ PARAM_DEFINE_FLOAT(RTL_DESCEND_ALT, 30);
PARAM_DEFINE_FLOAT(RTL_LAND_DELAY, -1.0f);

/**
* Minimum distance to trigger rising to a safe altitude
* Maximum horizontal distance to home position below which vehicle will use
Copy link
Contributor

Choose a reason for hiding this comment

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

Much better but perhaps ...

Maximum horizontal distance from home, below which RTL_DESCEND_ALT is used as return mode altitude.

If the vehicle is less than this horizontal distance from home when return mode is activated it will ascend to RTL_DESCEND_ALT for the return journey (rather than the altitude set by RTL_RETURN_ALT and RTL_CONE_ANG).

@RomanBapst
Copy link
Contributor Author

@hamishwillee Finally got a chance to update this. I liked your suggestions, please have a final look.

@hamishwillee
Copy link
Contributor

@RomanBapst I think I fixed all my complaints, but now you get to review those changes.

@hamishwillee
Copy link
Contributor

Note, the docs for RTL_TYPE=1 may also be incorrect. If you look at #13107 it indicate there is a mission check that says that you must have a landing patter defined in this case. If so, then the docs need to say that.

@RomanBapst
Copy link
Contributor Author

@hamishwillee I went over it once more and I'm generally happy. I was just a bit unclear about your last suggestion about changing two words, could you please elaborate?

@RomanBapst
Copy link
Contributor Author

@hamishwillee Oh crap, I did a rebase and forced pushed without pulling in your last changes :-/
Please tell me you still have those changes?

@hamishwillee
Copy link
Contributor

Gone :-(
I just did a few fixes, but might not be right.

@hamishwillee
Copy link
Contributor

FYI, this still needs thinking about

  • Note, the docs for RTL_TYPE=1 may also be incorrect. If you look at Fixedwing mission clear noise #13107 it indicate there is a mission check that says that you must have a landing patter defined in this case. If so, then the docs need to say that.

@Antiheavy
Copy link
Contributor

@hamishwillee yes you are correct. a statement should be added to the docs for RTL_TYPE=1 saying soemthing along the lines of "If Mission Landing is selected as the Return Mode type, Mission Feasibility Checker on the autopilot will reject any missions uploaded without a valid landing pattern." Note that the requirements for a valid landing pattern are already defined in the docs in this same section.

https://docs.px4.io/master/en/flight_modes/return.html#mission_landing_return

@hamishwillee
Copy link
Contributor

@RomanBapst I think this is OK to merge. We can revisit again when the rally points go in.

@RomanBapst RomanBapst merged commit 177da1f into master Oct 21, 2019
@RomanBapst RomanBapst deleted the pr-rtl_params branch October 21, 2019 06:08
@RomanBapst
Copy link
Contributor Author

@hamishwillee Done. Thanks for your help on this one.

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