Fix deleted stuff that shouldn't have been deleted

[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 999098041131bb7d1ca99d8a339abf2095a15ea0..23412d6c41078e6a668de7eb126d6c825f308f49 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,5 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.AnotherGyroClass.Rotation;
 import org.usfirst.frc.team3501.robot.Constants.Defense;
 import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
@@ -20,7 +19,6 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
 
   public static Scaler scaler;
-  double then;
 
   public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
@@ -28,38 +26,26 @@ public class Robot extends IterativeRobot {
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-      positionFourDefense, positionFiveDefense;
+  positionFourDefense, positionFiveDefense;
 
   // Gyro stuff
-  short rawValue;
-  public AnotherGyroClass gyro;
-
-  double now;
-  double degreesIncreased;
-  double degrees;
-
-  Rotation rotation;
+  public GyroLib gyro;
 
   @Override
   public void robotInit() {
-    // driveTrain = new DriveTrain();
-    gyro = new AnotherGyroClass(I2C.Port.kOnboard, false);
-    // oi = new OI();
+    driveTrain = new DriveTrain();
+    oi = new OI();
+    gyro = new GyroLib(I2C.Port.kOnboard, false);
 
     shooter = new Shooter();
     scaler = new Scaler();
     defenseArm = new DefenseArm();
     intakeArm = new IntakeArm();
 
-    // 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
-    // make the Sendable Choosers
-    // initializeSendableChoosers();
-    // addPositionChooserOptions();
-    // addDefensesToAllDefenseSendableChooosers();
-    // sendSendableChoosersToSmartDashboard();
+    initializeSendableChoosers();
+    addPositionChooserOptions();
+    addDefensesToAllDefenseSendableChoosers();
+    sendSendableChoosersToSmartDashboard();
 
   }
 
@@ -80,7 +66,7 @@ public class Robot extends IterativeRobot {
     positionChooser.addObject("Position 5", 5);
   }
 
-  private void addDefensesToAllDefenseSendableChooosers() {
+  private void addDefensesToAllDefenseSendableChoosers() {
     addDefenseOptions(positionOneDefense);
     addDefenseOptions(positionTwoDefense);
     addDefenseOptions(positionThreeDefense);
@@ -151,12 +137,17 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+
+    gyro.start();
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
 
+    System.out.println("Degrees: " + gyro.getRotationZ().getAngle());
+
   }
 
 }