Change shooter to function off of two pistons, remove punch, shooter motors, and...

[3501/stronghold-2016] / 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 1d7fdb3cdfd62d678ab981125f2e5e638491d6b0..8649045aa2d8119e5ff9a173ed1030d7d96a74b7 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -1,78 +1,71 @@
-package org.usfirst.frc.team3501.robot.subsystems;\r
-\r
-import org.usfirst.frc.team3501.robot.Constants;\r
-import org.usfirst.frc.team3501.robot.Constants.Shooter.State;\r
-import org.usfirst.frc.team3501.robot.Robot;\r
-\r
-import edu.wpi.first.wpilibj.CANTalon;\r
-import edu.wpi.first.wpilibj.command.Subsystem;\r
-\r
-public class Shooter extends Subsystem {\r
-  private CANTalon shooter;\r
-  private State state;\r
-\r
-  public Shooter() {\r
-    shooter = new CANTalon(Constants.Shooter.PORT);\r
-    state = State.STOPPED;\r
-  }\r
-\r
-  public double getCurrentSpeed() {\r
-    return shooter.get();\r
-  }\r
-\r
-  public void setSpeed(double speed) {\r
-    state = State.RUNNING;\r
-    shooter.set(speed);\r
-  }\r
-\r
-  public void shooterButtonsPressed() {\r
-\r
-    if (Robot.oi.rightJoystick\r
-        .getRawButton(Constants.OI.INCREMENT_SHOOTER_PORT)) {\r
-      changeSpeed(0.1);\r
-    }\r
-\r
-    if (Robot.oi.rightJoystick\r
-        .getRawButton(Constants.OI.DECREMENT_SHOOTER_PORT)) {\r
-      changeSpeed(-0.1);\r
-    }\r
-\r
-    if (Robot.oi.rightJoystick.getRawButton(Constants.OI.TRIGGER_PORT)) {\r
-      if (this.getState() == State.STOPPED)\r
-        this.setSpeed(0.5);\r
-    } else {\r
-      if (this.getState() == State.RUNNING) {\r
-        this.stop();\r
-      }\r
-    }\r
-\r
-    if (Robot.oi.rightJoystick.getRawButton(Constants.OI.PRINT_PORT)) {\r
-      System.out.println("Current Shooter Speed: " + getCurrentSpeed());\r
-    }\r
-  }\r
-\r
-  private void stop() {\r
-    this.setSpeed(0.0);\r
-  }\r
-\r
-  private State getState() {\r
-    return state;\r
-  }\r
-\r
-  // Use negative # for decrement. Positive for increment.\r
-  public void changeSpeed(double change) {\r
-    if (getCurrentSpeed() + change >= 1.0)\r
-      shooter.set(1.0);\r
-    else if (getCurrentSpeed() + change <= -1.0)\r
-      shooter.set(-1.0);\r
-    else {\r
-      double newSpeed = getCurrentSpeed() + change;\r
-      setSpeed(newSpeed);\r
-    }\r
-    this.state = State.RUNNING;\r
-  }\r
-\r
-  @Override\r
-  protected void initDefaultCommand() {\r
-  }\r
-}\r
+package org.usfirst.frc.team3501.robot.subsystems;
+
+import org.usfirst.frc.team3501.robot.Constants;
+import org.usfirst.frc.team3501.robot.sensors.Photogate;
+
+import edu.wpi.first.wpilibj.DoubleSolenoid;
+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 DoubleSolenoid catapult1, catapult2;
+  private Photogate photogate;
+  private boolean usePhotoGate;
+
+  public Shooter() {
+    catapult1 = new DoubleSolenoid(Constants.Shooter.CATAPULT1_MODULE,
+        Constants.Shooter.CATAPULT1_FORWARD,
+        Constants.Shooter.CATAPULT1_REVERSE);
+    catapult2 = new DoubleSolenoid(Constants.Shooter.CATAPULT2_MODULE,
+        Constants.Shooter.CATAPULT2_FORWARD,
+        Constants.Shooter.CATAPULT2_REVERSE);
+    usePhotoGate = false;
+  }
+
+  /***
+   * 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 true;
+  }
+
+  // Catapult Commands
+  public void fireCatapult() {
+    catapult1.set(Constants.Shooter.shoot);
+    catapult2.set(Constants.Shooter.shoot);
+  }
+
+  public void resetCatapult() {
+    catapult1.set(Constants.Shooter.reset);
+    catapult2.set(Constants.Shooter.reset);
+  }
+
+  public boolean usePhotogate() {
+    return this.usePhotoGate;
+  }
+
+  public void togglePhotoGate() {
+    this.usePhotoGate = !this.usePhotoGate;
+  }
+
+  @Override
+  protected void initDefaultCommand() {
+  }
+}