projects / 3501 / 2017steamworks / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 14ff536)
Delete repeat shooter methods
authorshainachen <shaina.sierra@gmail.com>
Sat, 21 Jan 2017 19:50:12 +0000 (11:50 -0800)
committerCindy Zhang <cindyzyx9@gmail.com>
Wed, 25 Jan 2017 03:40:39 +0000 (19:40 -0800)
src/org/usfirst/frc/team3501/robot/commands/shooter/RunFlyWheelContinuous.java patch | blob | blame | history
src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java patch | blob | blame | history

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