Fix gear ports, swap low/high trigger

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 7729a2ff29c02e50325e483bd50c3da278daf345..a6c7f06f379b6fbfbf68d3db367973b0539950db 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -52,8 +52,8 @@ public class Constants {
 
     // Drivetrain shifter related ports
     public static final int LEFT_SHIFT_MODULE = PCM_MODULE_B;
-    public static final int LEFT_SHIFT_FORWARD = 3;
-    public static final int LEFT_SHIFT_REVERSE = 6;
+    public static final int LEFT_SHIFT_FORWARD = 6;
+    public static final int LEFT_SHIFT_REVERSE = 3;
     public static final int RIGHT_SHIFT_MODULE = PCM_MODULE_B;
     public static final int RIGHT_SHIFT_FORWARD = 2;
     public static final int RIGHT_SHIFT_REVERSE = 7;

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 474ea9835237b8f5b01e3170890f05a536bd2a86..2412a36db7000f2a96f12bdf507bcb81dc7e6e76 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -40,8 +40,8 @@ public class OI {
     // Left joystick
     gearShift = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_GEAR_SHIFT_PORT);
-    gearShift.whenPressed(new SetLowGear());
-    gearShift.whenReleased(new SetHighGear());
+    gearShift.whenPressed(new SetHighGear());
+    gearShift.whenReleased(new SetLowGear());
 
     extendIntake1 = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_EXTEND_INTAKE_1_PORT);

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 7cde18d7854b34da626e72e2ec12395a85c21923..bd22a7244942de053f25cdf5b112b1d745d9647d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -2,7 +2,7 @@ package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.Constants.Defense;
 import org.usfirst.frc.team3501.robot.commands.auton.ChooseStrategy;
-import org.usfirst.frc.team3501.robot.commands.driving.SetHighGear;
+import org.usfirst.frc.team3501.robot.commands.driving.SetLowGear;
 import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.IntakeArm;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
@@ -115,7 +115,7 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-    Scheduler.getInstance().add(new SetHighGear());
+    Scheduler.getInstance().add(new SetLowGear());
   }
 
   @Override