Switch all methods of gyro to Robot class so DriveTrain does not have to be depended...

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index e97472d2cacf1d8c652a3675ee22871756eb4ce4..63f83b6b11a9b64e090e7697a41d1a397e43eb77 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -7,6 +7,7 @@ import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Scaler;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
+import edu.wpi.first.wpilibj.I2C;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 import edu.wpi.first.wpilibj.smartdashboard.SendableChooser;
@@ -18,18 +19,30 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
-
-  public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
+  public static IntakeArm intakeArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-      positionFourDefense, positionFiveDefense;
+  positionFourDefense, positionFiveDefense;
+
+  // Gyro stuff
+  private final static double NANOSECONDS_PER_SECOND = 1000000000;
+  short rawValue;
+  public FirebotGyro gyro;
+
+  double initialSpeedNanoseconds;
+  double finalSpeedNanoseconds;
+  double initialSpeedSeconds;
+  double finalSpeedSeconds;
+  double deltaSpeed;
+  double degrees;
 
   @Override
   public void robotInit() {
     driveTrain = new DriveTrain();
+    gyro = new FirebotGyro(I2C.Port.kOnboard, (byte) 0x68);
     oi = new OI();
     shooter = new Shooter();
     scaler = new Scaler();
@@ -93,14 +106,12 @@ public class Robot extends IterativeRobot {
         positionFourDefense);
     SmartDashboard.putData("Position Five Defense Chooser",
         positionFiveDefense);
-
     SmartDashboard.putData("Position Four Defense Chooser",
         positionFourDefense);
     SmartDashboard.putData("Position Five Defense Chooser",
         positionFiveDefense);
 
     shooter = new Shooter();
-
   }
 
   @Override
@@ -135,6 +146,7 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    Robot.driveTrain.initializeGyro();
   }
 
   @Override
@@ -142,5 +154,4 @@ public class Robot extends IterativeRobot {
     Scheduler.getInstance().run();
 
   }
-
 }