search

Team2890HawkCollective / Quetzalcoatl

2019 Season FRC Robot code for Team 2890 - The Hawk Collective
2 stars 2 forks source link

Merge code branches into master #24

Closed Valance23322 closed 5 years ago

Valance23322 commented 5 years ago

Incorporate added functionality into the current control setup when branches are merged

Team2890 commented 5 years ago

DriveTrainJoystick has been merged into DriveTrain branch

Team2890 commented 5 years ago

Merged DriveTrain into ArmManipulator

Team2890 commented 5 years ago

Merged ArmManipulator into GrabberTesting

Team2890 commented 5 years ago

Merged GrabberTesting into LiftTesting

Team2890 commented 5 years ago

Merged PixyCam into master

Valance23322 commented 5 years ago

Deleted a number of merged branches, not sure if it worked, may need to revisit this

Team2890 commented 5 years ago

Master SHOULD be up to date. It has the auton code and drivetrain code.