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

merge main to choreo #7

Closed
wants to merge 50 commits into from
Closed

merge main to choreo #7

wants to merge 50 commits into from

Conversation

Tinbite-A
Copy link
Contributor

No description provided.

jpothen8 and others added 30 commits January 18, 2025 14:09
This reverts commit 022026f.
need custom feedforward

(cherry picked from commit b838890)
(cherry picked from commit 08fb882)
(cherry picked from commit a5857d3)
(cherry picked from commit c66a480)
(cherry picked from commit d90afd5)
(cherry picked from commit 6a00f71)
# Conflicts:
#	src/main/kotlin/frc/team449/Robot.kt
#	src/main/kotlin/frc/team449/auto/choreo/PIDPoseAlign.kt
#	src/main/kotlin/frc/team449/subsystems/elevator/Elevator.kt
#	src/main/kotlin/frc/team449/subsystems/elevator/ElevatorConstants.kt
#	src/main/kotlin/frc/team449/subsystems/pivot/PivotConstants.kt
#	src/main/kotlin/frc/team449/subsystems/superstructure/SuperstructureGoal.kt
@Adarondek Adarondek closed this Jan 31, 2025
@Adarondek Adarondek reopened this Jan 31, 2025
@Adarondek Adarondek closed this Jan 31, 2025
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.

4 participants