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 b8bc8ef5d0718980f0838d49a86e8ec37163db89..63c707ef9bc840957445ccfe6d5f03a598a2a5ce 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,6 +19,7 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
+
   public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
 
@@ -26,10 +28,23 @@ public class Robot extends IterativeRobot {
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
       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();
-    oi = new OI();
+    // driveTrain = new DriveTrain();
+    gyro = new FirebotGyro(I2C.Port.kOnboard, (byte) 0x68);
+    // oi = new OI();
 
     shooter = new Shooter();
     scaler = new Scaler();
@@ -133,7 +148,6 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-    Robot.driveTrain.initializeGyro();
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 3d70d006f9e8c9948879df9b397d4bf219b2fa93..935b430221d76f22ccf566b5f7910dad27ea1ab8 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -1,7 +1,6 @@
 package org.usfirst.frc.team3501.robot.subsystems;
 
 import org.usfirst.frc.team3501.robot.Constants;
-import org.usfirst.frc.team3501.robot.FirebotGyro;
 import org.usfirst.frc.team3501.robot.Lidar;
 
 import edu.wpi.first.wpilibj.AnalogInput;
@@ -35,18 +34,6 @@ public class DriveTrain extends Subsystem {
 
   public AnalogInput channel;
 
-  // 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;
-
   public DriveTrain() {
     frontLeft = new CANTalon(Constants.DriveTrain.FRONT_LEFT);
     frontRight = new CANTalon(Constants.DriveTrain.FRONT_RIGHT);
@@ -63,8 +50,6 @@ public class DriveTrain extends Subsystem {
     leftEncoder.setDistancePerPulse(INCHES_PER_PULSE);
     rightEncoder.setDistancePerPulse(INCHES_PER_PULSE);
 
-    gyro = new FirebotGyro(I2C.Port.kOnboard, (byte) 0x68);
-    gyro.initialize();
   }
 
   @Override