projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fix compile errors that somehow got into master
[3501/stronghold-2016]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
Robot.java
diff --git
a/src/org/usfirst/frc/team3501/robot/Robot.java
b/src/org/usfirst/frc/team3501/robot/Robot.java
index ea7910b607f05090ca31e46446fa6f0f33ee2654..154c5c715655b54e14261a88bc177271765d4211 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/
src/org/usfirst/frc/team3501/robot/Robot.java
@@
-18,6
+18,7
@@
public class Robot extends IterativeRobot {
public static Shooter shooter;
public static Scaler scaler;
public static IntakeArm intakeArm;
+ public static DefenseArm defenseArm;
// Sendable Choosers send a drop down menu to the Smart Dashboard.
SendableChooser positionChooser;