Remove useless variables and commented stuff in Robot.java

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ce4d31d605a64e9e6d3fe1723ce221558974fc84..8453e1cc39a3f86aeed50c5399dc35c8f19fa492 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -19,7 +19,11 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
+<<<<<<< HEAD
   double then;
+=======
+
+>>>>>>> Remove useless variables and commented stuff in Robot.java
   public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
 
@@ -29,6 +33,7 @@ public class Robot extends IterativeRobot {
       positionFourDefense, positionFiveDefense;
 
   // Gyro stuff
+<<<<<<< HEAD
   private final static double NANOSECONDS_PER_SECOND = 1000000000;
   short rawValue;
   public GyroClass gyro;
@@ -38,18 +43,31 @@ public class Robot extends IterativeRobot {
   double degrees;
 
   Rotation rotation;
+=======
+<<<<<<< HEAD
+  short rawValue;
+  public AnotherGyroClass gyro;
+=======
+  public GyroLib gyro;
+>>>>>>> Remove useless variables and commented stuff in Robot.java
+>>>>>>> Remove useless variables and commented stuff in Robot.java
 
   @Override
   public void robotInit() {
+<<<<<<< HEAD
     // driveTrain = new DriveTrain();
     gyro = new GyroClass(I2C.Port.kOnboard, gyro.ITG3200_ADDRESS_AD0_LOW);
     // oi = new OI();
+=======
+    gyro = new GyroLib(I2C.Port.kOnboard, false);
+>>>>>>> Remove useless variables and commented stuff in Robot.java
 
     shooter = new Shooter();
     scaler = new Scaler();
     defenseArm = new DefenseArm();
     intakeArm = new IntakeArm();
 
+<<<<<<< HEAD
     // Sendable Choosers allows the driver to select the position of the robot
     // and the positions of the defenses from a drop-down menu on the Smart
     // Dashboard
@@ -59,6 +77,8 @@ public class Robot extends IterativeRobot {
     addDefensesToAllDefenseSendableChooosers();
     sendSendableChoosersToSmartDashboard();
 
+=======
+>>>>>>> Remove useless variables and commented stuff in Robot.java
   }
 
   private void initializeSendableChoosers() {