From: Cindy Zhang Date: Mon, 20 Feb 2017 22:32:59 +0000 (-0800) Subject: fix indexing piston code X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=commitdiff_plain;h=82fa994f28297c05b15018003f4d0094d303f280 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 8a640e7..1bf1309 100644 --- 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 edu.wpi.first.wpilibj.Timer; 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(); - private Timer t = new Timer(); /** * See JavaDoc comment in class for details @@ -32,12 +30,11 @@ public class RunIndexWheelContinuous extends Command { @Override protected void initialize() { - t.reset(); } @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 { diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index a3242d9..531e485 100644 --- 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); - piston = new DoubleSolenoid(Constants.DriveTrain.MODULE_NUMBER, + piston = new DoubleSolenoid(Constants.Shooter.MODULE_NUMBER, Constants.Shooter.PISTON_FORWARD, Constants.Shooter.PISTON_REVERSE); }