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

Orbit approach fixes #15292

Merged
merged 3 commits into from
Jul 21, 2020
Merged

Orbit approach fixes #15292

merged 3 commits into from
Jul 21, 2020

Conversation

MaEtUgR
Copy link
Member

@MaEtUgR MaEtUgR commented Jul 8, 2020

Describe problem solved by this pull request
Credits got to @RomanBapst for finding all of these issues and helping me to fix them:

  1. sending a new orbit command during approach lead to finishing the old approach and jumping to the new circle
  2. changing the radius during approach lead to approaching to the old radius and jumping to the new one
  3. the way setpoint output was not wrapped and could exceed the range
    it showed in the log but still executed fine since sin() and cos() work properly also outside of [-pi, pi]

Describe your solution

  1. reset the approach when a new orbit is commanded
  2. reset the approach when the radius is changed
  3. wrap the yaw setpoint before it's sent out

Test data / coverage
I SITL tested.

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Jul 9, 2020

@RomanBapst "Code looks good to me. Tested, works as expected."

Can we proceed? I'm not allowed anymore to merge in this state.

@dayjaby
Copy link
Contributor

dayjaby commented Jul 9, 2020

If this gets merged I will create another rebase on #13426

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Jul 9, 2020

@dayjaby Thank you. Sorry for taking so long on it, I literally just reminded myself to bring the pr in. I can rebase and check if you want.

@MaEtUgR
Copy link
Member Author

MaEtUgR commented Jul 14, 2020

I rebased on master after merging #13426.

@jkflying jkflying merged commit 9ba2539 into master Jul 21, 2020
@jkflying jkflying deleted the orbit-approach-fix branch July 21, 2020 08:27
This pull request was closed.
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