Change shooter to function off of two pistons, remove punch, shooter motors, and...

[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 154c5c715655b54e14261a88bc177271765d4211..473ceea020e60b41df523807c6cbcccac22a0fb2 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,6 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.Constants.Defense;
+import org.usfirst.frc.team3501.robot.commands.shooter.ResetCatapult;
 import org.usfirst.frc.team3501.robot.subsystems.DefenseArm;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
@@ -16,32 +17,29 @@ 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.
   SendableChooser positionChooser;
   SendableChooser positionOneDefense, positionTwoDefense, positionThreeDefense,
-      positionFourDefense,
-      positionFiveDefense;
+      positionFourDefense, positionFiveDefense;
 
   @Override
   public void robotInit() {
     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
     initializeSendableChoosers();
     addPositionChooserOptions();
-    addDefensesToAllDefenseSendableChooosers();
+    addDefensesToAllDefenseSendableChoosers();
     sendSendableChoosersToSmartDashboard();
 
   }
@@ -63,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);
@@ -92,6 +90,14 @@ public class Robot extends IterativeRobot {
         .putData("Position Four Defense Chooser", 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
@@ -102,18 +108,16 @@ public class Robot extends IterativeRobot {
     Integer chosenPosition = (Integer) positionChooser.getSelected();
     Integer chosenDefense = 0;
 
-    switch (chosenPosition) {
-    case 1:
+    if (chosenPosition == 1)
       chosenDefense = (Integer) positionOneDefense.getSelected();
-    case 2:
+    else if (chosenPosition == 2)
       chosenDefense = (Integer) positionTwoDefense.getSelected();
-    case 3:
+    else if (chosenPosition == 3)
       chosenDefense = (Integer) positionThreeDefense.getSelected();
-    case 4:
+    else if (chosenPosition == 4)
       chosenDefense = (Integer) positionFourDefense.getSelected();
-    case 5:
+    else if (chosenPosition == 5)
       chosenDefense = (Integer) positionFiveDefense.getSelected();
-    }
 
     System.out.println("Chosen Position: " + chosenPosition);
     System.out.println("Chosen Defense: " + chosenDefense);
@@ -126,11 +130,13 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    Scheduler.getInstance().add(new ResetCatapult()); // Reset catapult at start
+                                                      // of each match.
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
+
 }