fix indexing piston code

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 8a640e78951bb7ba007ae6e0f8c764126616127a..1bf1309583fd06a0e5553ce95a2f1ac800d34094 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/shooter/RunIndexWheelContinuous.java
@@ -4,7 +4,6 @@ import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import org.usfirst.frc.team3501.robot.Robot;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 

-import edu.wpi.first.wpilibj.Timer;

 import edu.wpi.first.wpilibj.command.Command;
 
 /**
 import edu.wpi.first.wpilibj.command.Command;
 
 /**


@@ -21,7 +20,6 @@ import edu.wpi.first.wpilibj.command.Command;
  */
 public class RunIndexWheelContinuous extends Command {
   private Shooter shooter = Robot.getShooter();
  */
 public class RunIndexWheelContinuous extends Command {
   private Shooter shooter = Robot.getShooter();

-  private Timer t = new Timer();

 
   /**
    * See JavaDoc comment in class for details
 
   /**
    * See JavaDoc comment in class for details


@@ -32,12 +30,11 @@ public class RunIndexWheelContinuous extends Command {
 
   @Override
   protected void initialize() {
 
   @Override
   protected void initialize() {

-    t.reset();

   }
 
   @Override
   protected void execute() {
   }
 
   @Override
   protected void execute() {

-    if (t.get() % 1 == 0) {
+    if (timeSinceInitialized() % 1 == 0) {

       if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
         Shooter.getShooter().setHighGear();
       } else {
       if (Shooter.getShooter().getPistonValue() == Constants.Shooter.LOW_GEAR) {
         Shooter.getShooter().setHighGear();
       } else {

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index a3242d9bdd1acecc2770ea3cd41d73766923dae2..531e485014ad72db5239612355b854e0ac6f9e9e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -36,7 +36,7 @@ public class Shooter extends Subsystem {
 
     hallEffect = new HallEffectSensor(Constants.Shooter.HALL_EFFECT_PORT, 1);
 
 
     hallEffect = new HallEffectSensor(Constants.Shooter.HALL_EFFECT_PORT, 1);
 

-    piston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER,
+    piston = new DoubleSolenoid(Constants.Shooter.MODULE_NUMBER,

         Constants.Shooter.PISTON_FORWARD, Constants.Shooter.PISTON_REVERSE);
   }
 
         Constants.Shooter.PISTON_FORWARD, Constants.Shooter.PISTON_REVERSE);
   }