X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FDriveTrain.java;h=9852848e1c1a49fac411fe0ae876f1ffe302d51b;hp=96f1d1150fd5d87a2d5e5531f8515fcf10302e4f;hb=600a1a1c0e90c03a198c6036de8e5157b7f96af3;hpb=9728080f491e9fb09795494349dba1297f447c0f

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 96f1d115..9852848e 100644
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -227,10 +227,16 @@ public class DriveTrain extends PIDSubsystem {
   }
 
   /*
-   * Checks the drive mode
+   * Checks the drive mode <<<<<<< 9728080f491e9fb09795494349dba1297f447c0f
    *
    * @return the current state of the robot in each state Average distance from
    * both sides of tank drive for Encoder Mode Angle from the gyro in GYRO_MODE
+   * =======
+   *
+   * @return the current state of the robot in each state Average distance from
+   * both sides of tank drive for Encoder Mode Angle from the gyro in GYRO_MODE
+   * >>>>>>> Move all constants in DeadReckoning to Auton class because it makes
+   * more sense
    */
   private double sensorFeedback() {
     if (DRIVE_MODE == Constants.DriveTrain.ENCODER_MODE)
@@ -360,4 +366,8 @@ public class DriveTrain extends PIDSubsystem {
     leftGearPiston.set(gear);
     rightGearPiston.set(gear);
   }
+
+  public void toggleTimeDeadReckoning() {
+    Constants.Auton.isUsingTimeToPassDefense = !Constants.Auton.isUsingTimeToPassDefense;
+  }
 }