X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=820bc6a85c25f2429f5cf9c90153d48475914190;hb=6bc81b557f637fa81f73c33161e82cba049235f3;hp=75737a6f0ce2ebf828a96c48647c158ec7729e10;hpb=dd4a87932b7956021f78c8e86cff6adf0187aa8f;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 75737a6..820bc6a 100644
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -3,6 +3,7 @@ package org.usfirst.frc.team3501.robot.subsystems;
 import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.MathLib;
 import org.usfirst.frc.team3501.robot.utils.HallEffectSensor;
+import org.usfirst.frc.team3501.robot.utils.PIDController;
 
 import com.ctre.CANTalon;
 
@@ -11,17 +12,21 @@ import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Shooter extends Subsystem {
-  public double wheelP = 0.0001, wheelI = 0, wheelD = 0.0004;
+  public double wheelP = 0.00007, wheelI = 0, wheelD = 0.0008;
   private static Shooter shooter;
   private static HallEffectSensor hallEffect;
   private final CANTalon flyWheel1, flyWheel2, indexWheel;
 
-  private static final double DEFAULT_INDEXING_SPEED = -0.75;
-  private static final double DEFAULT_SHOOTING_SPEED = 2800; // rpm
-  private static final double SHOOTING_SPEED_INCREMENT = 25;
+  private PIDController wheelController;
+
+  private static final double RPM_THRESHOLD = 10;
+  private static final double DEFAULT_INDEXING_MOTOR_VALUE = -0.75;
+  private static final double DEFAULT_SHOOTING_SPEED = 3100; // rpm
+  private static final double SHOOTING_SPEED_INCREMENT = 50;
   private static final int ACCEPTABLE_SHOOTING_DEVIATION = 300;
 
-  private double currentShootingSpeed = DEFAULT_SHOOTING_SPEED;
+  private double targetShootingSpeed = DEFAULT_SHOOTING_SPEED;
+  private double currentShooterMotorValue = 0;
 
   private final DoubleSolenoid piston;
 
@@ -32,7 +37,7 @@ public class Shooter extends Subsystem {
 
     hallEffect = new HallEffectSensor(Constants.Shooter.HALL_EFFECT_PORT, 1);
 
-    piston = new DoubleSolenoid(Constants.Shooter.PISTON_MODULE,
+    piston = new DoubleSolenoid(Constants.Shooter.MODULE_NUMBER,
         Constants.Shooter.PISTON_FORWARD, Constants.Shooter.PISTON_REVERSE);
   }
 
@@ -91,36 +96,57 @@ public class Shooter extends Subsystem {
 
   }
 
+  public double getRPMThreshold() {
+    return RPM_THRESHOLD;
+  }
+
   public double getShooterRPM() {
     return hallEffect.getRPM();
   }
 
-  public void setCurrentShootingSpeed(double Value) {
-    currentShootingSpeed = Value;
+  public void setTargetShootingSpeed(double Value) {
+    targetShootingSpeed = Value;
   }
 
-  public void decrementCurrentShootingSpeed() {
-    this.currentShootingSpeed -= this.SHOOTING_SPEED_INCREMENT;
+  public void decrementTargetShootingSpeed() {
+    this.targetShootingSpeed -= this.SHOOTING_SPEED_INCREMENT;
   }
 
-  public void incrementCurrentShootingSpeed() {
-    this.currentShootingSpeed += this.SHOOTING_SPEED_INCREMENT;
+  public void incrementTargetShootingSpeed() {
+    this.targetShootingSpeed += this.SHOOTING_SPEED_INCREMENT;
   }
 
-  public void resetCurrentShootingSpeed() {
-    this.currentShootingSpeed = this.DEFAULT_SHOOTING_SPEED;
+  public void resetTargetShootingSpeed() {
+    this.targetShootingSpeed = this.DEFAULT_SHOOTING_SPEED;
   }
 
-  public double getCurrentShootingSpeed() {
-    return currentShootingSpeed;
+  public double getTargetShootingSpeed() {
+    return targetShootingSpeed;
   }
 
   public void reverseIndexWheel() {
-    this.setIndexWheelMotorVal(-DEFAULT_INDEXING_SPEED);
+    this.setIndexWheelMotorVal(-DEFAULT_INDEXING_MOTOR_VALUE);
   }
 
   public void runIndexWheel() {
-    this.setIndexWheelMotorVal(DEFAULT_INDEXING_SPEED);
+    this.setIndexWheelMotorVal(DEFAULT_INDEXING_MOTOR_VALUE);
+  }
+
+  public double calculateShooterSpeed() {
+    this.wheelController.setSetPoint(targetShootingSpeed);
+    double calculatedShooterIncrement = this.wheelController
+        .calcPID(this.getShooterRPM());
+    currentShooterMotorValue += calculatedShooterIncrement;
+    return currentShooterMotorValue;
+  }
+
+  public void initializePIDController() {
+    this.wheelController = new PIDController(wheelP, wheelI, wheelD);
+    this.wheelController.setDoneRange(10);
+    this.wheelController.setMaxOutput(1.0);
+    this.wheelController.setMinDoneCycles(3);
+    this.wheelController.setSetPoint(this.targetShootingSpeed);
+    this.currentShooterMotorValue = 0;
   }
 
   public Value getPistonValue() {