update code

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 908a52dcf0339b44735147d174f069500b873280..da4d82076860145cf7d0648703ad9bd0a51ed2f5 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,15 +1,12 @@
 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;
 
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
+import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 
 public class Robot extends IterativeRobot {
   private static DriveTrain driveTrain;
@@ -41,27 +38,28 @@ 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
+    driveTrain.setHighGear();
+    SmartDashboard.putNumber("I", -1);
   }
 
   @Override
   public void autonomousPeriodic() {
     Scheduler.getInstance().run();
+    DriveTrain.getDriveTrain().getDriveController().setConstants(
 
   }
 
   @Override
   public void teleopInit() {
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }