diff --git a/src/main/java/com/stuypulse/robot/commands/shooter/ShooterToAmp.java b/src/main/java/com/stuypulse/robot/commands/shooter/ShooterToAmp.java new file mode 100644 index 00000000..497113fc --- /dev/null +++ b/src/main/java/com/stuypulse/robot/commands/shooter/ShooterToAmp.java @@ -0,0 +1,10 @@ +package com.stuypulse.robot.commands.shooter; + +import com.stuypulse.robot.constants.Settings; + +public class ShooterToAmp extends ShooterSetRPM { + + public ShooterToAmp() { + super(Settings.Shooter.AMP_LEFT_RPM, Settings.Shooter.AMP_RIGHT_RPM); + } +} diff --git a/src/main/java/com/stuypulse/robot/constants/Settings.java b/src/main/java/com/stuypulse/robot/constants/Settings.java index a0d6f787..eff91d98 100644 --- a/src/main/java/com/stuypulse/robot/constants/Settings.java +++ b/src/main/java/com/stuypulse/robot/constants/Settings.java @@ -196,19 +196,21 @@ public interface Turn { public interface Shooter { double MOMENT_OF_INERTIA = 1; - SmartNumber PODIUM_SHOT_LEFT_RPM = new SmartNumber("Shooter/Podium Shot Right RPM", 0); - SmartNumber PODIUM_SHOT_RIGHT_RPM = new SmartNumber("Shooter/Podium Shot Left RPM", 0); + SmartNumber PODIUM_SHOT_LEFT_RPM = new SmartNumber("Shooter/Podium Shot Left RPM", 0); + SmartNumber PODIUM_SHOT_RIGHT_RPM = new SmartNumber("Shooter/Podium Shot Right RPM", 0); + SmartNumber AMP_LEFT_RPM = new SmartNumber("Shooter/To Amp Left RPM", 0); + SmartNumber AMP_RIGHT_RPM = new SmartNumber("Shooter/To Amp Right RPM", 0); public interface Feedforward { - SmartNumber kV = new SmartNumber("Shooter/Feedforward/kV",0); - SmartNumber kA = new SmartNumber("Shooter/Feedforward/kA",0); - SmartNumber kS = new SmartNumber("Shooter/Feedforward/kS",0); //CHANGE LATER + SmartNumber kV = new SmartNumber("Shooter/Feedforward/kV",0.0); + SmartNumber kA = new SmartNumber("Shooter/Feedforward/kA",0.0); + SmartNumber kS = new SmartNumber("Shooter/Feedforward/kS",0.0); //CHANGE LATER } public interface PID { - SmartNumber kP = new SmartNumber("Shooter/PID/kP", 0); - SmartNumber kI = new SmartNumber("Shooter/PID/kI", 0); - SmartNumber kD = new SmartNumber("Shooter/PID/kD", 0); + SmartNumber kP = new SmartNumber("Shooter/PID/kP", 0.0); + SmartNumber kI = new SmartNumber("Shooter/PID/kI", 0.0); + SmartNumber kD = new SmartNumber("Shooter/PID/kD", 0.0); } }