diff --git a/src/main/java/com/stuypulse/robot/commands/launcher/LaunchPrepare.java b/src/main/java/com/stuypulse/robot/commands/launcher/LaunchPrepare.java index 789a9f0..6a1f3f7 100644 --- a/src/main/java/com/stuypulse/robot/commands/launcher/LaunchPrepare.java +++ b/src/main/java/com/stuypulse/robot/commands/launcher/LaunchPrepare.java @@ -18,6 +18,6 @@ public LaunchPrepare() { @Override public void initialize() { - launcher.setLaunchSpeed(Settings.Launcher.kLauncherSpeed); + launcher.setLaunchSpeed(Settings.Launcher.LAUNCH_LAUNCHER_SPEED); } } diff --git a/src/main/java/com/stuypulse/robot/constants/Settings.java b/src/main/java/com/stuypulse/robot/constants/Settings.java index 340fa9b..59d620a 100644 --- a/src/main/java/com/stuypulse/robot/constants/Settings.java +++ b/src/main/java/com/stuypulse/robot/constants/Settings.java @@ -16,19 +16,19 @@ */ public interface Settings { public interface Drivetrain { - int kCurrentLimit = 60; + int CURRENT_LIMIT = 60; } public interface Launcher { - int kLauncherCurrentLimit = 80; - int kFeedCurrentLimit = 80; + int LAUNCHER_CURRENT_LIMIT = 80; + int FEEDER_CURRENT_LIMIT = 80; // Speeds for wheels when intaking and launching. Intake speeds are negative to run the wheels // in reverse - double kLauncherSpeed = 1; - double kLaunchFeederSpeed = 1; - double kIntakeLauncherSpeed = -1; - double kIntakeFeederSpeed = -.2; + double LAUNCH_LAUNCHER_SPEED = 1; + double LAUNCH_FEEDER_SPEED = 1; + double INTAKE_LAUNCHER_SPEED = -1; + double INTAKE_FEEDER_SPEED = -.2; double kLauncherDelay = 1; } diff --git a/src/main/java/com/stuypulse/robot/subsystems/Launcher.java b/src/main/java/com/stuypulse/robot/subsystems/Launcher.java index 51ae3a8..4ce26cd 100644 --- a/src/main/java/com/stuypulse/robot/subsystems/Launcher.java +++ b/src/main/java/com/stuypulse/robot/subsystems/Launcher.java @@ -22,8 +22,8 @@ public Launcher() { feeder = new CANSparkMax(Ports.Launcher.FEEDER, MotorType.kBrushed); launcher = new CANSparkMax(Ports.Launcher.LAUNCHER, MotorType.kBrushed); - feeder.setSmartCurrentLimit(Settings.Launcher.kFeedCurrentLimit); - launcher.setSmartCurrentLimit(Settings.Launcher.kLauncherCurrentLimit); + feeder.setSmartCurrentLimit(Settings.Launcher.FEEDER_CURRENT_LIMIT); + launcher.setSmartCurrentLimit(Settings.Launcher.LAUNCHER_CURRENT_LIMIT); } //********** SETTERS ********** @@ -40,14 +40,14 @@ public void stop() { setFeederSpeed(0); } - public void launch() { - launcher.set(Settings.Launcher.kLauncherSpeed); - feeder.set(Settings.Launcher.kLaunchFeederSpeed); + public void intake() { + launcher.set(Settings.Launcher.INTAKE_LAUNCHER_SPEED); + feeder.set(Settings.Launcher.INTAKE_FEEDER_SPEED); } - public void intake() { - launcher.set(Settings.Launcher.kIntakeLauncherSpeed); - feeder.set(Settings.Launcher.kIntakeFeederSpeed); + public void launch() { + launcher.set(Settings.Launcher.LAUNCH_LAUNCHER_SPEED); + feeder.set(Settings.Launcher.LAUNCH_FEEDER_SPEED); } //********** GETTERS **********