Change turning to using arcade drive turning to be smoother

[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 99f66213b193728ddf53e4f1927785d979df62e9..19fa056a857c635282ca337eed87d1db08ca4a96 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,7 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.Constants.Defense;
-import org.usfirst.frc.team3501.robot.sensors.Photogate;
+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;
@@ -23,8 +23,6 @@ public class Robot extends IterativeRobot {
   public static IntakeArm intakeArm;
   public static DefenseArm defenseArm;
 
-  public static Photogate photogate;
-
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
@@ -35,14 +33,14 @@ public class Robot extends IterativeRobot {
     driveTrain = new DriveTrain();
     oi = new OI();
 
-    shooter = new Shooter();
-    scaler = new Scaler();
-    intakeArm = new IntakeArm();
-
-    initializeSendableChoosers();
-    addPositionChooserOptions();
-    addDefensesToAllDefenseSendableChoosers();
-    sendSendableChoosersToSmartDashboard();
+    // shooter = new Shooter();
+    // scaler = new Scaler();
+    // intakeArm = new IntakeArm();
+    //
+    // initializeSendableChoosers();
+    // addPositionChooserOptions();
+    // addDefensesToAllDefenseSendableChoosers();
+    // sendSendableChoosersToSmartDashboard();
 
   }
 
@@ -106,23 +104,14 @@ 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;
-
-    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);
+    // 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
@@ -132,6 +121,8 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    Scheduler.getInstance().add(new JoystickDrive());
+
   }
 
   @Override