-
Notifications
You must be signed in to change notification settings - Fork 16.9k
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: fix RTL_SPEED from affecting vehicle speed in Auto #10331
Conversation
This hopefully clarifies that the default speed is returned and not the current speed
Also rely on AC_PosControl to store current target up and down speeds so wpnav's defaults are not affected by do-change-speed requests
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tested successfully on SITL and approved!
@khancyr, great, thanks very much! I'll give it another 12hrs in case any one else wants to comment and then I'll merge. txs again. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've pushed an autotest onto this which fails on master but passes here.
@peterbarker, cool, thanks! |
.. hmm.. it seems to keep failing travis but it's not clear to me from looking at the travis output why it's failing.. |
7d88edf
to
c8a502e
Compare
On Wed, 30 Jan 2019, Randy Mackay wrote:
.. hmm.. it seems to keep failing travis but it's not clear to me from looking at the travis output why it's failing..
Well, that would be because I'm an idiot:
Unable to load
/home/travis/build/ArduPilot/ardupilot/Tools/autotest/copter_rtl_speed.txt
I've amended the commit and force-pushed.
|
@peterbarker, thanks! |
This is an alternative solution to this PR which solves this issue.
The issue is that with the proper sequence of mode changes, the RTL_SPEED could be used in Auto mode. This is how to reproduce the issue:
The PR resolves the issue by
These changes have been tested in SITL. For the horizontal test, a mission was created like below
The vehicle was flown in Auto, switched to RTL, then back to Auto. In master we see the vehicle flies at 2m/s the 2nd time it enters Auto (it should fly at 8m/s)
Below is the after view and we can see the vehicle flies at full speed after entering Auto the 2nd time.
To test the climb rate issue a vertical mission was created in SITL like below:
Below are before and after pics of the climb rate: