Prepare for intake arm test

[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 71e156b6988aec38d24e6a40a9f4edcf6fb0fac1..a060c88e8c0a42745edfc61b7aae67fb374b3f6b 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -33,11 +33,9 @@ public class Robot extends IterativeRobot {
     oi = new OI();
 
     shooter = new Shooter();
+    scaler = new Scaler();
+    intakeArm = new IntakeArm();
 
-    // shooter = new Shooter();
-    // scaler = new Scaler();
-    // intakeArm = new IntakeArm();
-    //
     // initializeSendableChoosers();
     // addPositionChooserOptions();
     // addDefensesToAllDefenseSendableChoosers();
@@ -103,14 +101,23 @@ public class Robot extends IterativeRobot {
   public void autonomousInit() {
     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());
+    // // 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
@@ -136,7 +143,6 @@ public class Robot extends IterativeRobot {
       Robot.shooter.extendPunch();
     } else {
       Robot.shooter.retractPunch();
-
     }
   }