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

[3501/stronghold-2016] / 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 9e5980437f33774cb3c4723ba972b4b360f8a420..18f5fd5af30a032d3267df813d7148b783f32139 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -19,13 +19,14 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
-  public static DefenseArm defenseArm;
+
   public static IntakeArm intakeArm;
+  public static DefenseArm defenseArm;
 
   // 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;
@@ -152,5 +153,6 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+
   }
 }