change angle contstants to use potValues array

[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 f01d8c2743c1ef50c89f09da92cadf1ddb39989d..0264c7578e5f34afb6ce0bdfea7abaab0a36fdec 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java
@@ -2,13 +2,11 @@ package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
 import org.usfirst.frc.team3501.robot.Lidar;
-import org.usfirst.frc.team3501.robot.MathLib;
 
 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.I2C;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 /***
@@ -23,21 +21,19 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Shooter extends Subsystem {
   private CANTalon shooter;
+  private CANTalon angleAdjuster;
   private DoubleSolenoid hood, punch;
   private Encoder encoder;
   private Lidar lidar;
 
   public Shooter() {
     shooter = new CANTalon(Constants.Shooter.PORT);
-    hood = new DoubleSolenoid(Constants.Shooter.HOOD_FORWARD,
-        Constants.Shooter.HOOD_REVERSE);
+    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);
-
-    lidar = new Lidar(I2C.Port.kMXP);
   }
 
   /***
@@ -53,8 +49,12 @@ public class Shooter extends Subsystem {
   }
 
   public void setSpeed(double speed) {
-    speed = MathLib.constrain(speed, -1, 1);
-    shooter.set(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() {
@@ -73,7 +73,7 @@ public class Shooter extends Subsystem {
   }
 
   // Punch Commands
-  public void punch() {
+  public void extendPunch() {
     punch.set(Constants.Shooter.punch);
   }
 
@@ -81,18 +81,6 @@ public class Shooter extends Subsystem {
     punch.set(Constants.Shooter.retract);
   }
 
-  public boolean isHoodOpen() {
-    return hood.get() == Constants.Shooter.open;
-  }
-
-  public void openHood() {
-    hood.set(Constants.Shooter.open);
-  }
-
-  public void closeHood() {
-    hood.set(Constants.Shooter.closed);
-  }
-
   @Override
   protected void initDefaultCommand() {
   }