X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=7245d5fead8910eb4342f964e24a5efeed5609bf;hp=2d3cd43d6212cd6aab39d692699d78db05cf2646;hb=600a1a1c0e90c03a198c6036de8e5157b7f96af3;hpb=9728080f491e9fb09795494349dba1297f447c0f

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 2d3cd43d..7245d5fe 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -124,29 +124,6 @@ public class Constants {
     }
   }
 
-  public static class DeadReckoning {
-    public static final double DEFAULT_SPEED = 0.5;
-    public static boolean isUsingTimeToPassDefense = true;
-
-    // dead reckoning time and speed constants for driving through defenses
-    public static double passRockWallTime = 0;
-    public static double passRockWallSpeed = 0;
-    public static double passRockWallDistance = 0;
-    public static double passLowBarTime = 0;
-    public static double passLowBarSpeed = 0;
-    public static double passLowBarDistance = 0;
-    public static double passMoatTime = 0;
-    public static double passMoatSpeed = 0;
-    public static double passMoatDistance = 0;
-    public static double passRampartTime = 0;
-    public static double passRampartSpeed = 0;
-    public static double passRampartDistance = 0;
-    public static double passRoughTerrainTime = 0;
-    public static double passRoughTerrainSpeed = 0;
-    public static double passRoughTerrainDistance = 0;
-
-  }
-
   public static class IntakeArm {
     public static final int ROLLER_PORT = 0;
     public static final int ARM_PORT = 1;
@@ -249,6 +226,28 @@ public class Constants {
     public static final double POS5_TURN1_TIME = 60;
     public static final double POS5_TURN_MAXSPEED = 0.5;
     public static final double POS5_DIST2_TIME = 0;
+
+    // Passing Defenses Constants
+
+    public static final double DEFAULT_SPEED = 0.5;
+    public static boolean isUsingTimeToPassDefense = true;
+
+    // dead reckoning time and speed constants for driving through defenses
+    public static double passRockWallTime = 0;
+    public static double passRockWallSpeed = 0;
+    public static double passRockWallDistance = 0;
+    public static double passLowBarTime = 0;
+    public static double passLowBarSpeed = 0;
+    public static double passLowBarDistance = 0;
+    public static double passMoatTime = 0;
+    public static double passMoatSpeed = 0;
+    public static double passMoatDistance = 0;
+    public static double passRampartTime = 0;
+    public static double passRampartSpeed = 0;
+    public static double passRampartDistance = 0;
+    public static double passRoughTerrainTime = 0;
+    public static double passRoughTerrainSpeed = 0;
+    public static double passRoughTerrainDistance = 0;
   }
 
   public enum Direction {