diff --git a/src/main/java/frc4388/robot/Constants.java b/src/main/java/frc4388/robot/Constants.java index 642d0da..e09b86a 100644 --- a/src/main/java/frc4388/robot/Constants.java +++ b/src/main/java/frc4388/robot/Constants.java @@ -144,11 +144,11 @@ public final class Constants { } public static final class ClimberConstants { - public static final int CLIMBER_SPARK_ID = -10; + public static final int CLIMBER_SPARK_ID = 14; } public static final class LevelerConstants { - public static final int LEVELER_CAN_ID = -1; + public static final int LEVELER_CAN_ID = 15; } public static final class StorageConstants { @@ -157,7 +157,7 @@ public final class Constants { public static final double STORAGE_FULL_BALL = 7; public static final double STORAGE_SPEED = 0.5; public static final double STORAGE_TIMEOUT = 2000; - + /* Ball Indexes */ public static final int BEAM_SENSOR_DIO_0 = 0; public static final int BEAM_SENSOR_DIO_1 = 1; diff --git a/src/main/java/frc4388/robot/subsystems/Climber.java b/src/main/java/frc4388/robot/subsystems/Climber.java index f6c9339..e9adf86 100644 --- a/src/main/java/frc4388/robot/subsystems/Climber.java +++ b/src/main/java/frc4388/robot/subsystems/Climber.java @@ -31,10 +31,10 @@ public class Climber extends SubsystemBase { m_climberMotor.setIdleMode(IdleMode.kBrake); m_climberMotor.setInverted(false); - m_climberForwardLimit = m_climberMotor.getForwardLimitSwitch(LimitSwitchPolarity.kNormallyClosed); - m_climberReverseLimit = m_climberMotor.getReverseLimitSwitch(LimitSwitchPolarity.kNormallyClosed); - m_climberForwardLimit.enableLimitSwitch(false); - m_climberReverseLimit.enableLimitSwitch(false); + m_climberForwardLimit = m_climberMotor.getForwardLimitSwitch(LimitSwitchPolarity.kNormallyOpen); + m_climberReverseLimit = m_climberMotor.getReverseLimitSwitch(LimitSwitchPolarity.kNormallyOpen); + m_climberForwardLimit.enableLimitSwitch(true); + m_climberReverseLimit.enableLimitSwitch(true); } @Override diff --git a/src/main/java/frc4388/robot/subsystems/Intake.java b/src/main/java/frc4388/robot/subsystems/Intake.java index 6b716f4..f074b33 100644 --- a/src/main/java/frc4388/robot/subsystems/Intake.java +++ b/src/main/java/frc4388/robot/subsystems/Intake.java @@ -41,9 +41,9 @@ public class Intake extends SubsystemBase { m_extenderMotor.setInverted(false); m_extenderForwardLimit = m_extenderMotor.getForwardLimitSwitch(LimitSwitchPolarity.kNormallyClosed); - m_extenderReverseLimit = m_extenderMotor.getReverseLimitSwitch(LimitSwitchPolarity.kNormallyClosed); - m_extenderForwardLimit.enableLimitSwitch(false); - m_extenderReverseLimit.enableLimitSwitch(false); + m_extenderReverseLimit = m_extenderMotor.getReverseLimitSwitch(LimitSwitchPolarity.kNormallyOpen); + m_extenderForwardLimit.enableLimitSwitch(true); + m_extenderReverseLimit.enableLimitSwitch(true); } @Override