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 5e916ac9559e5869d5c76ac4c6489316c98313b6..19fa056a857c635282ca337eed87d1db08ca4a96 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,14 +1,13 @@
 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.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;
@@ -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,36 +26,20 @@ public class Robot extends IterativeRobot {
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-      positionFourDefense, positionFiveDefense;
-
-  // Gyro stuff
-  short rawValue;
-  public AnotherGyroClass gyro;
-
-  double now;
-  double degreesIncreased;
-  double degrees;
-
-  Rotation rotation;
+  positionFourDefense, positionFiveDefense;
 
   @Override
   public void robotInit() {
-    // driveTrain = new DriveTrain();
-    gyro = new AnotherGyroClass(I2C.Port.kOnboard, false);
-    // 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();
 
   }
@@ -79,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);
@@ -122,25 +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;
-
-    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);
+    // 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
@@ -150,12 +121,13 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    Scheduler.getInstance().add(new JoystickDrive());
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 
 }