Fix ports and unusuable code to make shooter test work

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / OI.java

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 8de027b73502223533f8b786c11f1804909ca53a..07c47e8405422f77149aa54fabaf7c0cc81b0559 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,7 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.commands.driving.ChangeGear;
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleCompressor;
+import org.usfirst.frc.team3501.robot.commands.shooter.Shoot;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -35,7 +35,6 @@ public class OI {
   public static Button intakeBoulder;
   public static Button shootBoulder;
   public static Button toggleGear;
-  public static Button toggleCompressor;
 
   // button to change robot to the scaling mode
   public static DigitalButton toggleScaling;
@@ -44,13 +43,13 @@ public class OI {
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
 
-    toggleGear = new JoystickButton(rightJoystick,
-        Constants.OI.RIGHT_JOYSTICK_TRIGGER_PORT);
+    toggleGear = new JoystickButton(leftJoystick,
+        Constants.OI.LEFT_JOYSTICK_TOP_CENTER_PORT);
     toggleGear.toggleWhenPressed(new ChangeGear());
 
-    toggleCompressor = new JoystickButton(rightJoystick,
-        Constants.OI.TOGGLE_COMPRESSOR_PORT);
-    toggleCompressor.whenPressed(new ToggleCompressor());
+    shootBoulder = new JoystickButton(leftJoystick,
+        Constants.OI.LEFT_JOYSTICK_TRIGGER_PORT);
+    shootBoulder.whenPressed(new Shoot());
 
     // passPortcullis = new DigitalButton(
     // new DigitalInput(Constants.OI.PASS_PORTCULLIS_PORT));