Add buttons to OI class

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / shooter / RunFlyWheelContinuous.java

diff --git a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
index ca5f90d78262065dad305b8e5c7255f01bb4249f..ce77450e5fba276f5472035ad906f43166852692 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java
@@ -54,7 +54,12 @@ public class RunFlyWheelContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
+<<<<<<< 7fe535d58b388a1d87b3728095d8a38786865468
     return false;
+=======
+    // TODO
+    return !Robot.getOI().toggleFlyWheel.get();
+>>>>>>> Add buttons to OI class
   }
 
 }