Fix code changes

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

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 062da20f01a5dd73c36a3dcfcd34f2c227f9a420..c3a23e5820bd7c8c1f2a05b49c7a9bb471db39ef 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -1,12 +1,7 @@
 package org.usfirst.frc.team3501.robot.commands.shooter;
 
 import org.usfirst.frc.team3501.robot.Robot;
-import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
-<<<<<<< HEAD
-=======
-
->>>>>>> Remove getters for shift pistons
 import edu.wpi.first.wpilibj.Timer;
 import edu.wpi.first.wpilibj.command.Command;
 
@@ -35,25 +30,19 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected void initialize() {
-<<<<<<< HEAD
     t.start();
-=======
-    t.reset();
->>>>>>> Remove getters for shift pistons
   }
 
   @Override
   protected void execute() {
-    if (t.get() > 1) {
-      if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
-        Shooter.getShooter().setHighGear();
-      } else {
-        Shooter.getShooter().setLowGear();
-      }
-      t.reset();
-    }
+    /*
+     * if (t.get() >= 1) { if (Shooter.getShooter().getPistonValue() ==
+     * Constants.Shooter.LOW_GEAR) { Shooter.getShooter().setHighGear(); } else
+     * { Shooter.getShooter().setLowGear(); } t.reset(); }
+     */
 
-    if (shooter.isShooterRPMWithinRangeOfTargetSpeed(25))
+    // if (shooter.isShooterRPMWithinRangeOfTargetSpeed(25))
+    if (shooter.getShooterRPM() > 0)
       shooter.runIndexWheel();
 
   }