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

FIX: cp_position call in rocket.draw to work with mach dependent cp_position #453

Merged
merged 1 commit into from
Nov 7, 2023

Conversation

giovaniceotto
Copy link
Member

Pull request type

  • Code changes (bugfix, features)

Checklist

  • N.A. Tests for the changes have been added (if needed)
  • N.A. Docs have been reviewed and added / updated
  • Lint (black rocketpy/ tests/) has passed locally
  • All tests (pytest --runslow) have passed locally

Current behavior

Since the introduction of Rocket.draw and the change of Rocket.cp_position as a Mach dependent function were done in parallel (both merged with only one day difference, without proper rebasing or merging the develop branch before approval), a specific part of the code introduced in #419 was not up to date with the changes made in #377.

This made it so a bug was created where Rocket.draw failed.

New behavior

The bug was fixed.

Breaking change

  • No

@Gui-FernandesBR
Copy link
Member

#436 solves the same thing.

We should be careful with merging conflicts

@MateusStano MateusStano merged commit c7c3e2a into develop Nov 7, 2023
@MateusStano MateusStano deleted the fix/cp_position_in_rocket_draw branch November 7, 2023 12:03
@Gui-FernandesBR Gui-FernandesBR added this to the Release v1.X.0 milestone Nov 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Closed
Development

Successfully merging this pull request may close these issues.

3 participants