competition fixes

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / subsystems / Shooter.java

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 531e485014ad72db5239612355b854e0ac6f9e9e..ab36fddee10a8be135c5589ef4c1a8b5baa8d0e2 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -7,8 +7,6 @@ import org.usfirst.frc.team3501.robot.utils.PIDController;
 
 import com.ctre.CANTalon;
 
-import edu.wpi.first.wpilibj.DoubleSolenoid;
-import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Shooter extends Subsystem {
@@ -21,23 +19,19 @@ public class Shooter extends Subsystem {
 
   private static final double RPM_THRESHOLD = 10;
   private static final double DEFAULT_INDEXING_MOTOR_VALUE = 0.75;
-  private static final double DEFAULT_SHOOTING_SPEED = 2800; // rpm
+  private static final double REVERSE_FLYWHEEL_MOTOR_VALUE = -0.75;
+  private static final double DEFAULT_SHOOTING_SPEED = 2700; // rpm
   private static final double SHOOTING_SPEED_INCREMENT = 50;
 
   private double targetShootingSpeed = DEFAULT_SHOOTING_SPEED;
   private double currentShooterMotorValue = 0;
 
-  private final DoubleSolenoid piston;
-
   private Shooter() {
     flyWheel1 = new CANTalon(Constants.Shooter.FLY_WHEEL1);
     flyWheel2 = new CANTalon(Constants.Shooter.FLY_WHEEL2);
     indexWheel = new CANTalon(Constants.Shooter.INDEX_WHEEL);
 
     hallEffect = new HallEffectSensor(Constants.Shooter.HALL_EFFECT_PORT, 1);
-
-    piston = new DoubleSolenoid(Constants.Shooter.MODULE_NUMBER,
-        Constants.Shooter.PISTON_FORWARD, Constants.Shooter.PISTON_REVERSE);
   }
 
   /**
@@ -59,7 +53,7 @@ public class Shooter extends Subsystem {
    *          motor value from -1 to 1(fastest forward)
    */
   public void setFlyWheelMotorVal(double val) {
-    val = MathLib.restrictToRange(val, 0.0, 1.0);
+    val = MathLib.restrictToRange(val, -1.0, 1.0);
     flyWheel1.set(val);
     flyWheel2.set(val);
   }
@@ -148,19 +142,7 @@ public class Shooter extends Subsystem {
     this.currentShooterMotorValue = 0;
   }
 
-  public Value getPistonValue() {
-    return piston.get();
-  }
-
-  public void setHighGear() {
-    changeGear(Constants.Shooter.HIGH_GEAR);
-  }
-
-  public void setLowGear() {
-    changeGear(Constants.Shooter.LOW_GEAR);
-  }
-
-  private void changeGear(DoubleSolenoid.Value gear) {
-    piston.set(gear);
+  public void reverseFlyWheel() {
+    this.setFlyWheelMotorVal(shooter.REVERSE_FLYWHEEL_MOTOR_VALUE);
   }
 }