origin/main #6
Merged
origin/main #6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # src/main/kotlin/frc/team449/RobotLoop.kt # src/main/kotlin/frc/team449/commands/PIDPoseAlign.kt
also merged jj changes manually cuz something went wrong
…ories" This reverts commit 812340d
…ories" This reverts commit edcc16f.
This reverts commit dae5464.
This reverts commit cfd1b3a.
This reverts commit e958707.
This reverts commit 4f48885
This reverts commit 022026f.
This reverts commit e13066f
This reverts commit c37d4f9
… in the SwerveDrive.kt" This reverts commit e7c3836.
This reverts commit 9e9de78
This reverts commit e4ae440.
need custom feedforward (cherry picked from commit b838890)
(cherry picked from commit 08fb882)
(cherry picked from commit a5857d3)
(cherry picked from commit f2c34db)
(cherry picked from commit c66a480)
(cherry picked from commit d90afd5)
(cherry picked from commit f39815b)
(cherry picked from commit 2e21cdd)
(cherry picked from commit 493b4be)
(cherry picked from commit ecbdd60)
(cherry picked from commit 6a00f71)
(cherry picked from commit dfa0590)
(cherry picked from commit a33f895)
# 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
approved these changes
Jan 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pull main into maplesim