diff --git a/src/main/java/frc/robot/subsystems/shooter/Pivot.java b/src/main/java/frc/robot/subsystems/shooter/Pivot.java index a74b5ecc..eff10fbe 100644 --- a/src/main/java/frc/robot/subsystems/shooter/Pivot.java +++ b/src/main/java/frc/robot/subsystems/shooter/Pivot.java @@ -50,7 +50,7 @@ public void setAngle(double angle) { /** * TODO: Make gear ratio constant and put it here */ - (angle / ShooterConstants.PIVOT_MAX_ANGLE) + (angle / ShooterConstants.PIVOT_MAX_ANGLE_DEGREES) ); } @@ -70,7 +70,7 @@ public Command setAngleCommand(double angle) { * The function sets the pivot angle to the rest angle constant */ public void setRestAngle() { - this.setAngle(ShooterConstants.PIVOT_REST_ANGLE); + this.setAngle(ShooterConstants.PIVOT_REST_ANGLE_DEGREES); } /** @@ -80,7 +80,7 @@ public void setRestAngle() { * @return The method is returning a Command object. */ public Command setRestAngleCommand() { - return setAngleCommand(ShooterConstants.PIVOT_REST_ANGLE); + return setAngleCommand(ShooterConstants.PIVOT_REST_ANGLE_DEGREES); } /** diff --git a/src/main/java/frc/robot/util/Constants.java b/src/main/java/frc/robot/util/Constants.java index 19913508..f7e3616a 100644 --- a/src/main/java/frc/robot/util/Constants.java +++ b/src/main/java/frc/robot/util/Constants.java @@ -115,7 +115,8 @@ public static final class ShooterConstants { public static final double PIVOT_MIN_OUTPUT = -1; public static final double PIVOT_MAX_OUTPUT = 1; - public static final double PIVOT_MAX_ANGLE = 360.0; + public static final double PIVOT_MAX_ANGLE_DEGREES = 360.0; + public static final double PIVOT_REST_ANGLE_DEGREES = 10.0; public static final double MEASUREMENT_INTERVAL_FEET = 1.0; /**