Bag day staging - Githubissues

FRO5401 / PowerUp2018

2 stars 0 forks source link

Bag day staging #48

Open jxfireruby opened 6 years ago

jxfireruby commented 6 years ago

STATUS

REVIEW

DESCRIPTION

This merges the STAGING on 2/17/18 into Master branch. Current features that are included: DriveBase with teleop movement with Drive gear shift, dummy camera with stream, Compressor

FILES THAT CONTAINTED MERGE CONFLICTS

None

TO DO

[x] On Robot testing
[x] Resolved Merge Conflicts
[ ] Reviewed by Peers
[ ] Reviewed by Senior Dev

ptoil commented 6 years ago

ArmWrist has code in it; however, I don't think it is the code from the ArmWrist Testing. The code in the ArmWrist in this branch does not seem to be tested.