X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FShooter.java;h=91793d8aebd2546c6733f1cd05f98302d72a6ae5;hb=2485099662fecd9ccb9f6ac455b2f37fefc0ed97;hp=07948f2f144579922ccf35da7fdc11507fe16630;hpb=5932d8339e4e4f02a0689aecf77cd7fd9b72e854;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
index 07948f2f..91793d8a 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -1,20 +1,58 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.Constants.Shooter.State;
+import org.usfirst.frc.team3501.robot.sensors.Lidar;
+import org.usfirst.frc.team3501.robot.sensors.Photogate;
 
 import edu.wpi.first.wpilibj.CANTalon;
+import edu.wpi.first.wpilibj.CounterBase.EncodingType;
+import edu.wpi.first.wpilibj.DoubleSolenoid;
+import edu.wpi.first.wpilibj.Encoder;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
+/***
+ * The Shooter consists of a platform and wheel, each controlled by separate
+ * motors. The piston controlling the platform pushes the ball onto the wheel.
+ * The wheel is controlled by a motor, which is running before the ball is
+ * pushed onto the wheel. The spinning wheel propels the ball.
+ *
+ * @author superuser
+ *
+ */
+
 public class Shooter extends Subsystem {
   private CANTalon shooter;
+  private DoubleSolenoid hood1, hood2, punch;
+  private Encoder encoder;
+  private Lidar lidar;
+  private Photogate photogate;
 
   public Shooter() {
     shooter = new CANTalon(Constants.Shooter.PORT);
+    hood1 = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
+        Constants.Shooter.HOOD_REVERSE);
+    hood2 = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
+        Constants.Shooter.HOOD_REVERSE);
+    punch = new DoubleSolenoid(Constants.Shooter.PUNCH_FORWARD,
+        Constants.Shooter.PUNCH_REVERSE);
+
+    encoder = new Encoder(Constants.Shooter.ENCODER_PORT_A,
+        Constants.Shooter.ENCODER_PORT_B, false, EncodingType.k4X);
   }
 
-  public double getCurrentSetPoint() {
-    return shooter.get();
+  /***
+   * This method checks to see if the ball has successfully passed through the
+   * intake rollers and is inside.
+   *
+   * @return whether the presence of the ball is true or false and returns the
+   *         state of the condition (true or false).
+   */
+
+  public boolean isBallInside() {
+    if (usePhotogate())
+      return photogate.isBallPresent();
+    else
+      return false;
   }
 
   public void setSpeed(double speed) {
@@ -30,20 +68,56 @@ public class Shooter extends Subsystem {
     this.setSpeed(0.0);
   }
 
-  public State getState() {
-    return (this.getCurrentSetPoint() == 0) ? State.RUNNING : State.STOPPED;
+  public double getSpeed() {
+    return encoder.getRate();
+  }
+
+  /*
+   * We are going to map a lidar distance to a shooter speed that will be set to
+   * the shooter. This function does not yet exist so we will just use y=x but
+   * when testing commences we shall create the function
+   */
+  public double getShooterSpeed() {
+    double distanceToGoal = lidar.getDistance();
+    double shooterSpeed = distanceToGoal; // Function to be determined
+    return shooterSpeed;
   }
 
   // Use negative # for decrement. Positive for increment.
+
   public void changeSpeed(double change) {
-    double newSpeed = getCurrentSetPoint() + change;
-    if (newSpeed > 1.0)
-      shooter.set(1.0);
-    else if (newSpeed < -1.0)
-      shooter.set(-1.0);
-    else {
-      setSpeed(newSpeed);
-    }
+    double newSpeed = getSpeed() + change;
+    setSpeed(newSpeed);
+  }
+
+  // Punch Commands
+  public void extendPunch() {
+    punch.set(Constants.Shooter.punch);
+  }
+
+  public void retractPunch() {
+    punch.set(Constants.Shooter.retract);
+  }
+
+  public void raiseHood() {
+    hood1.set(Constants.Shooter.open);
+    hood2.set(Constants.Shooter.open);
+  }
+
+  public void lowerHood() {
+    hood1.set(Constants.Shooter.closed);
+    hood2.set(Constants.Shooter.closed);
+  }
+
+  public boolean isHoodDown() {
+    if (hood1.get() == Constants.Shooter.open
+        && hood2.get() == Constants.Shooter.open)
+      return true;
+    return false;
+  }
+
+  public boolean usePhotogate() {
+    return true;
   }
 
   @Override