Add buttons to OI class

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 7c9d216e382645c5e9e4086c163e298759e40684..bf265a4fea8ced0142b226ae055c79de7b77f902 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -12,6 +12,7 @@ public class Constants {
     public final static int RIGHT_STICK_PORT = 1;
     public final static int TOGGLE_WINCH_PORT = 0;
 
+    public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
   }

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
   }
 
 }

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 2a5ccbede9710e1e9ce2a3c711afb5dff2517c67..377f4aadc16ab55897762f2f3a4f34ca3a96fb12 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,7 +54,12 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
+<<<<<<< 7fe535d58b388a1d87b3728095d8a38786865468
     return false;
+=======
+    // TODO
+    return Robot.getOI().toggleIndexWheel.get();
+>>>>>>> Add buttons to OI class
   }
 
 }