Swap left and right, add option to do nothing in auton

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index e5c4c4e78d82b1d446dbd72b3ef42f860702a152..7729a2ff29c02e50325e483bd50c3da278daf345 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -45,10 +45,10 @@ public class Constants {
     public static final double kADJUST = 8;
 
     // Drivetrain Motor related ports
-    public static final int DRIVE_FRONT_LEFT = 1;
-    public static final int DRIVE_REAR_LEFT = 2;
-    public static final int DRIVE_FRONT_RIGHT = 6;
-    public static final int DRIVE_REAR_RIGHT = 5;
+    public static final int DRIVE_FRONT_LEFT = 6;
+    public static final int DRIVE_REAR_LEFT = 5;
+    public static final int DRIVE_FRONT_RIGHT = 1;
+    public static final int DRIVE_REAR_RIGHT = 2;
 
     // Drivetrain shifter related ports
     public static final int LEFT_SHIFT_MODULE = PCM_MODULE_B;

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index bb06782c47770182203ece05cf56f676cf9e3e9d..7cde18d7854b34da626e72e2ec12395a85c21923 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -47,7 +47,8 @@ public class Robot extends IterativeRobot {
   }
 
   private void addPositionChooserOptions() {
-    positionChooser.addDefault("Position 1", 1);
+    positionChooser.addDefault("None", 0);
+    positionChooser.addObject("Position 1", 1);
     positionChooser.addObject("Position 2", 2);
     positionChooser.addObject("Position 3", 3);
     positionChooser.addObject("Position 4", 4);
@@ -100,8 +101,11 @@ public class Robot extends IterativeRobot {
     else if (chosenPosition == 5)
       chosenDefense = (Defense) positionFiveDefense.getSelected();
 
-    Scheduler.getInstance().add(
-        new ChooseStrategy(chosenPosition, chosenDefense));
+    if (chosenPosition != 0)
+      Scheduler.getInstance().add(
+          new ChooseStrategy(chosenPosition, chosenDefense));
+
+    // Scheduler.getInstance().add(new TimeDrive(.6, 4));
   }
 
   @Override