X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=8beb817d189bba11dd761c6f2f3da5ffa05a60a2;hb=a28e24c71f76b39e7ab73fb3e8932acb0c694ae8;hp=c40b9ba6dcd9bd274bf7c9c9b3e9fd247dfc68ce;hpb=d06ee698388fcf76323a71d424ca1aef15dd4bc8;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index c40b9ba6..8beb817d 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,13 +1,13 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.Constants.Defense;
+import org.usfirst.frc.team3501.robot.commands.driving.JoystickDrive;
 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;
 
-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;
@@ -28,32 +28,18 @@ 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 degreesIncreased;
-  double degrees;
-
   @Override
   public void robotInit() {
-    // driveTrain = new DriveTrain();
-    gyro = new FirebotGyro(I2C.Port.kOnboard, (byte) 0x68);
-    // oi = new OI();
+    driveTrain = new DriveTrain();
+    oi = new OI();
 
-    shooter = new Shooter();
-    scaler = new Scaler();
-    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
+    // shooter = new Shooter();
+    // scaler = new Scaler();
+    // intakeArm = new IntakeArm();
+    //
     // initializeSendableChoosers();
     // addPositionChooserOptions();
-    // addDefensesToAllDefenseSendableChooosers();
+    // addDefensesToAllDefenseSendableChoosers();
     // sendSendableChoosersToSmartDashboard();
 
   }
@@ -75,7 +61,7 @@ public class Robot extends IterativeRobot {
     positionChooser.addObject("Position 5", 5);
   }
 
-  private void addDefensesToAllDefenseSendableChooosers() {
+  private void addDefensesToAllDefenseSendableChoosers() {
     addDefenseOptions(positionOneDefense);
     addDefenseOptions(positionTwoDefense);
     addDefenseOptions(positionThreeDefense);
@@ -118,34 +104,42 @@ public class Robot extends IterativeRobot {
   public void autonomousInit() {
     Scheduler.getInstance().run();
 
-    // get options chosen from drop down menu
-    Integer chosenPosition = (Integer) positionChooser.getSelected();
-    Integer chosenDefense = 0;
-
-    switch (chosenPosition) {
-    case 1:
-      chosenDefense = (Integer) positionOneDefense.getSelected();
-    case 2:
-      chosenDefense = (Integer) positionTwoDefense.getSelected();
-    case 3:
-      chosenDefense = (Integer) positionThreeDefense.getSelected();
-    case 4:
-      chosenDefense = (Integer) positionFourDefense.getSelected();
-    case 5:
-      chosenDefense = (Integer) positionFiveDefense.getSelected();
-    }
-
-    System.out.println("Chosen Position: " + chosenPosition);
-    System.out.println("Chosen Defense: " + chosenDefense);
+    // // get options chosen from drop down menu
+    // Integer chosenPosition = (Integer) positionChooser.getSelected();
+    // Integer chosenDefense = 0;
+    //
+    // if (chosenPosition == 1)
+    // chosenDefense = (Integer) positionOneDefense.getSelected();
+    // else if (chosenPosition == 2)
+    // chosenDefense = (Integer) positionTwoDefense.getSelected();
+    // else if (chosenPosition == 3)
+    // chosenDefense = (Integer) positionThreeDefense.getSelected();
+    // else if (chosenPosition == 4)
+    // chosenDefense = (Integer) positionFourDefense.getSelected();
+    // else if (chosenPosition == 5)
+    // chosenDefense = (Integer) positionFiveDefense.getSelected();
+    //
+    // System.out.println("Chosen Position: " + chosenPosition);
+    // System.out.println("Chosen Defense: " + chosenDefense);
   }
 
   @Override
   public void autonomousPeriodic() {
     Scheduler.getInstance().run();
+    // Scheduler.getInstance().add(new DriveDistance(24, 5));
+    // Scheduler.getInstance().add(new DriveForTime(2, 0.3));
+    // Scheduler.getInstance().add(new TurnForAngle(90, 5));
+    // Scheduler.getInstance().add(
+    // new TurnForTime(3, Constants.Direction.RIGHT, 0.3));
+    // Scheduler.getInstance().add(
+    // new TurnForTime(3, Constants.Direction.LEFT, 0.3));
+    // Scheduler.getInstance().add(new Turn180());
   }
 
   @Override
   public void teleopInit() {
+    Scheduler.getInstance().add(new JoystickDrive());
+
   }
 
   @Override