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

chore(release): merge back 8.2.0 release changes v58 to main #817

Merged
merged 4 commits into from
Dec 4, 2024

Conversation

y3rsh
Copy link
Member

@y3rsh y3rsh commented Dec 4, 2024

Steps

  1. git checkout main && git pull
  2. git checkout chore_release-8.2.0 && git pull
  3. git checkout release && git pull
  4. git merge --ff-only chore_release-8.2.0
  5. git push (PR existed for the merge of chore_release-8.2.0 to release)
  6. git switch -c merge-back-8.2.0
  7. git merge main
  8. git push
  9. open this PR

There were no merge conflicts.

sfoster1 and others added 4 commits November 7, 2024 09:20
)

* We don't need to clear the stepper ok field when we get a stop message.

* Ok i was wrong about how this worked. We don't want to leave the motor enable false we just want to turn the brake on for a bit then turn it back off to leave the motor enabled.

Co-authored-by: Ryan Howard <[email protected]>
* fix(motor-control): add a state to the motor control that maintains the difference between a never homed and a stopped gripper

* revert to the unhomed state during estop or collisions

* keep the older estop behavior
@y3rsh y3rsh self-assigned this Dec 4, 2024
Copy link
Member

@sfoster1 sfoster1 left a comment

Choose a reason for hiding this comment

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

Nice!

@y3rsh y3rsh merged commit b1d725e into main Dec 4, 2024
30 of 31 checks passed
@y3rsh y3rsh deleted the merge-back-8.2.0 branch December 4, 2024 18:47
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