X-Git-Url: http://challenge-bot.com/repos/?p=3501%2F2017steamworks;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=db5e469ff3be6a031e0efbfc571c6a9a13727cfd;hp=908a52dcf0339b44735147d174f069500b873280;hb=538715b1e58e3217a6411fab2471716700350b51;hpb=7935bf262ed52d56431a191e55fd5cfb8d1f49c2

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 908a52d..db5e469 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,9 +1,6 @@
 package org.usfirst.frc.team3501.robot;
 
-<<<<<<< HEAD
-=======
 import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
->>>>>>> fix bugs
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@ -41,12 +38,15 @@ public class Robot extends IterativeRobot {
     return Intake.getIntake();
   }
 
+  // If the gear values do not match in the left and right piston, then they are
+  // both set to high gear
   @Override
   public void autonomousInit() {
-<<<<<<< HEAD
-=======
     Scheduler.getInstance().add(new DriveDistance(25, 10));
->>>>>>> fix bugs
+    if (driveTrain.getLeftGearPistonValue() != driveTrain
+        .getRightGearPistonValue()) {
+      driveTrain.setHighGear();
+    }
   }
 
   @Override
@@ -57,6 +57,7 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+
   }
 
   @Override