diff --git a/SeriouslyCommonLib b/SeriouslyCommonLib index bbe28f61..715a8022 160000 --- a/SeriouslyCommonLib +++ b/SeriouslyCommonLib @@ -1 +1 @@ -Subproject commit bbe28f6124bf69309ef8fb64557780c67fd1854e +Subproject commit 715a802215408f612343150f63288da967f16835 diff --git a/src/main/java/competition/subsystems/arm/ArmSubsystem.java b/src/main/java/competition/subsystems/arm/ArmSubsystem.java index 25979a1c..ba0a4a1f 100644 --- a/src/main/java/competition/subsystems/arm/ArmSubsystem.java +++ b/src/main/java/competition/subsystems/arm/ArmSubsystem.java @@ -131,6 +131,9 @@ public ArmSubsystem(PropertyFactory pf, XCANSparkMax.XCANSparkMaxFactory sparkMa this.getPrefix() + "ArmEncoder", contract.getArmEncoderInverted()); + armMotorLeft.setSmartCurrentLimit(20); + armMotorRight.setSmartCurrentLimit(20); + // Enable hardware limits armMotorLeft.setForwardLimitSwitch(SparkLimitSwitch.Type.kNormallyOpen, true); armMotorLeft.setReverseLimitSwitch(SparkLimitSwitch.Type.kNormallyOpen, true); @@ -274,8 +277,8 @@ public LimitState getLimitState(XCANSparkMax motor) { boolean lowerHit = false; if (contract.isArmReady()) { - upperHit = motor.getForwardLimitSwitchPressed(SparkLimitSwitch.Type.kNormallyOpen); - lowerHit = motor.getReverseLimitSwitchPressed(SparkLimitSwitch.Type.kNormallyOpen); + upperHit = motor.getForwardLimitSwitchPressed(); + lowerHit = motor.getReverseLimitSwitchPressed(); } if (upperHit && lowerHit) {