Moderately streamline imports of constants

[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 bcce7bcdc2df74ff7de1491ff96cb5dc12d97b51..95d69af9358eb7f59041255c0a993272400ddb38 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -1,12 +1,8 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.sensors.Lidar;
 
-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;
 
 /***
@@ -14,82 +10,32 @@ import edu.wpi.first.wpilibj.command.Subsystem;
  * 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 CANTalon angleAdjuster;
-  private DoubleSolenoid hood, punch;
-  private Encoder encoder;
-  private Lidar lidar;
+  private DoubleSolenoid catapult1, catapult2;
 
   public Shooter() {
-    shooter = new CANTalon(Constants.Shooter.PORT);
-    angleAdjuster = new CANTalon(Constants.Shooter.ANGLE_ADJUSTER_PORT);
-    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);
-  }
-
-  /***
-   * 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() {
-    return true;
-  }
-
-  public void setSpeed(double speed) {
-    if (speed > 1.0)
-      shooter.set(1.0);
-    else if (speed < -1.0)
-      shooter.set(-1.0);
-    else
-      shooter.set(speed);
-  }
-
-  public void stop() {
-    this.setSpeed(0.0);
-  }
-
-  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 = getSpeed() + change;
-    setSpeed(newSpeed);
+    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);
   }
 
-  // Punch Commands
-  public void extendPunch() {
-    punch.set(Constants.Shooter.punch);
+  // Catapult Commands
+  public void fireCatapult() {
+    catapult1.set(Constants.Shooter.SHOOT);
+    catapult2.set(Constants.Shooter.SHOOT);
   }
 
-  public void retractPunch() {
-    punch.set(Constants.Shooter.retract);
+  public void resetCatapult() {
+    catapult1.set(Constants.Shooter.RESET);
+    catapult2.set(Constants.Shooter.RESET);
   }
 
   @Override