Prepare for intake arm test

[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 75d6beff8c93e9e2de828ffe662fdf230f1045a1..5af84ac1bcc653c1f187781054fa1cb3e0cf7be4 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,9 +1,9 @@
 package org.usfirst.frc.team3501.robot;
 
 import org.usfirst.frc.team3501.robot.commands.driving.ChangeGear;
-import org.usfirst.frc.team3501.robot.commands.shooter.Shoot;
 import org.usfirst.frc.team3501.robot.commands.intakearm.RunBothIntakeMotors;
 import org.usfirst.frc.team3501.robot.commands.intakearm.RunIntakeMotor;
+import org.usfirst.frc.team3501.robot.commands.shooter.Shoot;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -44,6 +44,7 @@ public class OI {
   public static Button intakeBoulder;
   public static Button shootBoulder;
   public static Button toggleGear;
+
   //
   // // button to change robot to the scaling mode
   // public static DigitalButton toggleScaling;
@@ -60,39 +61,29 @@ public class OI {
         Constants.OI.LEFT_JOYSTICK_TRIGGER_PORT);
     shootBoulder.whenPressed(new Shoot());
 
-    recordPotAngle1 = new JoystickButton(leftJoystick,
-        Constants.OI.LEFT_JOYSTICK_TOP_LEFT_BUTTON);
-    recordPotAngle1.whenPressed(new RecordPotAngle(0));
-    recordPotAngle2 = new JoystickButton(leftJoystick,
-        Constants.OI.LEFT_JOYSTICK_TOP_CENTER_BUTTON);
-    recordPotAngle2.whenPressed(new RecordPotAngle(1));
-    recordPotAngle3 = new JoystickButton(leftJoystick,
-        Constants.OI.LEFT_JOYSTICK_TOP_RIGHT_BUTTON);
-    recordPotAngle3.whenPressed(new RecordPotAngle(2));
-    recordPotAngle4 = new JoystickButton(leftJoystick,
-        Constants.OI.LEFT_JOYSTICK_TOP_LOW_BUTTON);
-    recordPotAngle4.whenPressed(new RecordPotAngle(3));
-
     leftIntakeArmMotorUp = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_BOTTOM_LEFT_FORWARD_BUTTON);
-    leftIntakeArmMotorUp.whenPressed(new RunIntakeMotor(
-        Robot.intakeArm.getLeftIntakeArmMotor(),
-        Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
+    leftIntakeArmMotorUp
+        .whenPressed(new RunIntakeMotor(
+            Robot.intakeArm.getLeftIntakeArmMotor(),
+            Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
     leftIntakeArmMotorDown = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_BOTTOM_LEFT_BACK_BUTTON);
-    leftIntakeArmMotorDown.whenPressed(new RunIntakeMotor(
-        Robot.intakeArm.getLeftIntakeArmMotor(),
-        -Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
+    leftIntakeArmMotorDown
+        .whenPressed(new RunIntakeMotor(
+            Robot.intakeArm.getLeftIntakeArmMotor(),
+            -Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
 
     rightIntakeArmMotorUp = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_BOTTOM_RIGHT_FORWARD_BUTTON);
-    rightIntakeArmMotorUp.whenPressed(new RunIntakeMotor(
-        Robot.intakeArm.getRightIntakeArmMotor(),
-        Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
+    rightIntakeArmMotorUp
+        .whenPressed(new RunIntakeMotor(Robot.intakeArm
+            .getRightIntakeArmMotor(),
+            Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
     rightIntakeArmMotorDown = new JoystickButton(leftJoystick,
         Constants.OI.LEFT_JOYSTICK_BOTTOM_RIGHT_BACK_BUTTON);
-    rightIntakeArmMotorDown.whenPressed(new RunIntakeMotor(
-        Robot.intakeArm.getRightIntakeArmMotor(),
+    rightIntakeArmMotorDown.whenPressed(new RunIntakeMotor(Robot.intakeArm
+        .getRightIntakeArmMotor(),
         -Constants.IntakeArm.DEFAULT_INTAKE_ARM_SPEED));
 
     bothIntakeArmMotorUp = new JoystickButton(leftJoystick,