More organization

DeepBlueRobotics · Mar 3, 2024 · 21f8ba9 · 21f8ba9
1 parent 84db8ea
commit 21f8ba9
Showing 1 changed file with 6 additions and 22 deletions.
diff --git a/src/main/java/org/carlmontrobotics/Constants.java b/src/main/java/org/carlmontrobotics/Constants.java
@@ -74,7 +74,13 @@ public static final class Arm {
 		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 trapConstraints = new TrapezoidProfile.Constraints(MAX_FF_VEL, MAX_FF_ACCEL);
+		//other0;
 
+		public static final double MARGIN_OF_ERROR = Math.PI/18;
+		public static final double ARM_LOWER_LIMIT_RAD = -3.569 + MARGIN_OF_ERROR;
+		public static final double ARM_UPPER_LIMIT_RAD = .36 - MARGIN_OF_ERROR;
+
+		public static final double ARM_DISCONTINUITY_RAD = (ARM_LOWER_LIMIT_RAD + ARM_UPPER_LIMIT_RAD) / 2 - Math.PI;
 		//Arm buttons
 		public static final int RAISE_TO_SPEAKER_POD_BUTTON = Button.kY.value;
 		public static final int RAISE_TO_AMP_BUTTON = Button.kB.value;
@@ -83,28 +89,6 @@ public static final class Arm {
 		public static final int RAISE_TO_GROUND_BUTTON = Button.kStart.value;
 		public static final int RAISE_TO_CLIMBER_BUTTON = Button.kLeftBumper.value;
 		public static final int LOWER_TO_CLIMBER_BUTTON = Button.kRightBumper.value;
-		//other0;
-
-		public static final double MARGIN_OF_ERROR = Math.PI/18;
-		public static final double ARM_LOWER_LIMIT_RAD = -3.569 + MARGIN_OF_ERROR;
-		public static final double ARM_UPPER_LIMIT_RAD = .36 - MARGIN_OF_ERROR;
-
-		public static final double ARM_DISCONTINUITY_RAD = (ARM_LOWER_LIMIT_RAD + ARM_UPPER_LIMIT_RAD) / 2 - Math.PI;
-
-
-
-
-
-
-
-
-		//Arm buttons
-
-		//other
-
-
-
-
 	}
 	public static final class IntakeShooter {
 		//in set() speed