Make methods to convert DegreesPerSecond to Degrees

[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 71685c51327524058ee33760c112549a40dde356..b8bc8ef5d0718980f0838d49a86e8ec37163db89 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -3,6 +3,7 @@ package org.usfirst.frc.team3501.robot;
 import org.usfirst.frc.team3501.robot.Constants.Defense;
 import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
+import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Scaler;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
@@ -15,7 +16,9 @@ public class Robot extends IterativeRobot {
   public static OI oi;
   public static DriveTrain driveTrain;
   public static Shooter shooter;
+
   public static Scaler scaler;
+  public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
@@ -27,11 +30,13 @@ public class Robot extends IterativeRobot {
   public void robotInit() {
     driveTrain = new DriveTrain();
     oi = new OI();
+
     shooter = new Shooter();
     scaler = new Scaler();
-    defenseArm = new DefenseArm();
+    intakeArm = new IntakeArm();
 
-    // Sendable Choosers allows the driver to select the position of the robot
+    // 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
@@ -88,6 +93,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
@@ -122,11 +133,11 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    Robot.driveTrain.initializeGyro();
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }