diff --git a/src/main/java/org/carlmontrobotics/Constants.java b/src/main/java/org/carlmontrobotics/Constants.java index cf53b183..0534923b 100644 --- a/src/main/java/org/carlmontrobotics/Constants.java +++ b/src/main/java/org/carlmontrobotics/Constants.java @@ -36,9 +36,8 @@ public static final class Arm { public static final boolean MOTOR_INVERTED_FOLLOWER = false; public static final double ROTATION_TO_RAD = 2 * Math.PI; public static final boolean ENCODER_INVERTED = false; - public static final double ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD = 0; //placeholder - public static final double POS_TOLERANCE_RAD = 0; //placeholder - public static final double VEL_TOLERANCE_RAD_P_SEC = 0; //placeholder + + public static final int MAX_VOLTAGE = 12; public static final double ENCODER_OFFSET_RAD = 0; @@ -69,18 +68,21 @@ public static final class Arm { //if needed public static final double COM_ARM_LENGTH_METERS = 0.381 ; public static final double ARM_MASS_KG = 9.59302503; - public static final double UPPER_ANGLE_LIMIT = Units.degreesToRadians(70); - public static final double LOWER_ANGLE_LIMIT = Units.degreesToRadians(0); - public static final double ARM_DISCONT_RAD = (LOWER_ANGLE_LIMIT + UPPER_ANGLE_LIMIT) /2 - Math.PI; + + public static TrapezoidProfile.Constraints TRAP_CONSTRAINTS = new TrapezoidProfile.Constraints(MAX_FF_VEL, MAX_FF_ACCEL); //other0; public static final double MARGIN_OF_ERROR = Math.PI/18; //Boundaries - - - //Arm buttons + public static final double UPPER_ANGLE_LIMIT = Units.degreesToRadians(70); + public static final double LOWER_ANGLE_LIMIT = Units.degreesToRadians(0); + public static final double ARM_DISCONT_RAD = (LOWER_ANGLE_LIMIT + UPPER_ANGLE_LIMIT) /2 - Math.PI; + public static final double ARM_TELEOP_MAX_GOAL_DIFF_FROM_CURRENT_RAD = 0; //placeholder + public static final double POS_TOLERANCE_RAD = 0; //placeholder + public static final double VEL_TOLERANCE_RAD_P_SEC = 0; //placeholder + }