Switch left and right side of robot, remove capability to switch front temporarily

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index ebef7502d1b0dcf1fe63ea25ee3f2cd2f11b01c6..a6543a8fa70ab872c15afad6eaf48cf3a3302d76 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 = 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;
+    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;
 
     // 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 2f97c9ad36f58f9cf91af5a6c21cda66fe624088..6bf02a4cd1017acc57873e7070deced1c454e017 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -69,8 +69,7 @@ public class Robot extends IterativeRobot {
     chooser.addObject("Sally Port", Defense.SALLY_PORT);
     chooser.addObject("Rough Terrain" + Auton.ROUGH_TERRAIN_SPEED + " "
         + Auton.ROUGH_TERRAIN_TIME, Defense.ROUGH_TERRAIN);
-    chooser.addObject("Low Bar" + Auton.LOW_BAR_SPEED + " "
-        + Auton.LOW_BAR_TIME, Defense.LOW_BAR);
+    chooser.addObject("Low Bar" + " Will probably work...", Defense.LOW_BAR);
     chooser.addObject("Chival De Frise", Defense.CHIVAL_DE_FRISE);
     chooser.addObject("Drawbridge", Defense.DRAWBRIDGE);
     chooser.addObject("Moat" + Auton.MOAT_SPEED + " " + Auton.MOAT_TIME,

diff --git a/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
index 272085af28af6a352fa3f432dfb964829df0790e..83d934f3be7ce696a54b4c48f7f6b89f973cc468 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/auton/PassLowBar.java
@@ -1,7 +1,8 @@
 package org.usfirst.frc.team3501.robot.commands.auton;
 
-import org.usfirst.frc.team3501.robot.Constants.Auton;
+import org.usfirst.frc.team3501.robot.Constants.IntakeArm;
 import org.usfirst.frc.team3501.robot.commands.driving.TimeDrive;
+import org.usfirst.frc.team3501.robot.commands.intakearm.MoveIntakeArm;
 
 import edu.wpi.first.wpilibj.command.CommandGroup;
 
@@ -11,6 +12,8 @@ import edu.wpi.first.wpilibj.command.CommandGroup;
 public class PassLowBar extends CommandGroup {
 
   public PassLowBar() {
-    addSequential(new TimeDrive(Auton.LOW_BAR_SPEED, Auton.LOW_BAR_TIME));
+    addSequential(new TimeDrive(.3, 1));
+    addSequential(new MoveIntakeArm(IntakeArm.EXTEND));
+    addSequential(new TimeDrive(.5, 3));
   }
 }

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
index 0f52e115d8eda7dca2cfbf7b04cc8a49fb08084b..1a4e6e5b96c04dfc58689e377aa2ec5ba9dd1ae8 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DriveTrain.java
@@ -222,7 +222,7 @@ public class DriveTrain extends PIDSubsystem {
 
   public void setMotorSpeeds(double left, double right) {
     double k = (isFlipped() ? -1 : 1);
-    robotDrive.tankDrive(-left * k, -right * k);
+    robotDrive.tankDrive(-left, -right);
   }
 
   /**