Open
Conversation
Sue branch robot
# Conflicts: # build/org/usfirst/frc/team708/robot/OI.class # sysProps.xml
This reverts commit 8dcc6a3. # Conflicts: # build/org/usfirst/frc/team708/robot/Constants.class # build/org/usfirst/frc/team708/robot/commands/autonomous/OneGearCenter.class # build/org/usfirst/frc/team708/robot/commands/autonomous/SixtyBalls.class # build/org/usfirst/frc/team708/robot/commands/autonomous/TenBalls.class # build/org/usfirst/frc/team708/robot/commands/shooter/ManualShoot.class # build/org/usfirst/frc/team708/robot/commands/shooter/MoveHoodHigh.class # build/org/usfirst/frc/team708/robot/commands/shooter/SpinShooter.class # src/org/usfirst/frc/team708/robot/commands/autonomous/OneGearCenter.java # sysProps.xml
Uncommented more stuff
Fixed imports, fixed references in the Drivetrain method, and removed unused imports.
This reverts commit 6394ad6.
changed multiple Talon methods to include the 2018 Talon libraries
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
james