diff --git a/src/main/java/frc/robot/Constants.java b/src/main/java/frc/robot/Constants.java index 16168d8..8d901c6 100644 --- a/src/main/java/frc/robot/Constants.java +++ b/src/main/java/frc/robot/Constants.java @@ -4,6 +4,8 @@ package frc.robot; +import java.security.PublicKey; + /** * The Constants class provides a convenient place for teams to hold robot-wide numerical or boolean * constants. This class should not be used for any other purpose. All constants should be declared @@ -66,4 +68,8 @@ public final class Constants { public static final int INTAKE_MOTOR_ID = 2; } + public static class HopperConstants { + public static final int KICKER_MOTOR_ID = 0; + public static final int SPINDEXER_MOTOR_ID = 1; + } } diff --git a/src/main/java/frc/robot/subsystems/HopperSubsystem.java b/src/main/java/frc/robot/subsystems/HopperSubsystem.java index bd36015..8dfe649 100644 --- a/src/main/java/frc/robot/subsystems/HopperSubsystem.java +++ b/src/main/java/frc/robot/subsystems/HopperSubsystem.java @@ -10,7 +10,7 @@ import org.fairportrobotics.frc.posty.test.PostTest; import com.ctre.phoenix6.hardware.TalonFX; import static org.fairportrobotics.frc.posty.assertions.Assertions.*; - +import frc.robot.Constants; import edu.wpi.first.wpilibj2.command.Command; public class HopperSubsystem extends TestableSubsystem { @@ -19,28 +19,23 @@ public class HopperSubsystem extends TestableSubsystem { private TalonFX kickerMotor; /** Creates a new HopperSubsystem. */ public HopperSubsystem() { - spindexerMotor = new TalonFX(0); - kickerMotor = new TalonFX(1); + spindexerMotor = new TalonFX(Constants.HopperConstants.SPINDEXER_MOTOR_ID); + kickerMotor = new TalonFX(Constants.HopperConstants.KICKER_MOTOR_ID); } - public void feed(){ - + public void feed() { kickerMotor.set(0.5); } - public void reverse(){ - + public void reverse() { kickerMotor.set(-0.5); - } - public void stop(){ - + public void stop() { kickerMotor.set(0); } - public void spin(double speed){ - + public void spin(double speed) { spindexerMotor.set(speed); }