Fix code changes

[3501/2017steamworks] / 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 76d9a7f2f2a664d18c6c9b436237178602f93896..4ea52e6bc798ffa95ab29e59ae90309024350cad 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,7 +1,8 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.climber.ToggleWinch;
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleDrivePiston;
+import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons;
+import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons;
+
 import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
 import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
@@ -11,6 +12,7 @@ import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuo
 import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
 import org.usfirst.frc.team3501.robot.commands.shooter.RunIndexWheelContinuous;
 import org.usfirst.frc.team3501.robot.commands.shooter.ToggleIndexerPiston;
+import org.usfirst.frc.team3501.robot.utils.ChangeCameraView;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -20,7 +22,6 @@ public class OI /* implements KeyListener */ {
   private static OI oi;
   public static Joystick leftJoystick;
   public static Joystick rightJoystick;
-  public static Button toggleWinch;
 
   public static Button runIndexWheel;
   public static Button reverseIndexWheel;
@@ -39,6 +40,9 @@ public class OI /* implements KeyListener */ {
   private static Button togglePiston;
   private static Button toggleDriveTrainPiston;
 
+  public static Button brakeCANTalons;
+  public static Button coastCANTalons;
+
   public OI() {
 
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
@@ -46,14 +50,7 @@ public class OI /* implements KeyListener */ {
 
     runIndexWheel = new JoystickButton(rightJoystick,
         Constants.OI.RUN_INDEXWHEEL_PORT);
-    runIndexWheel.whileHeld(
-        new RunIndexWheelContinuous()); /*
-                                         * { double shooterSpeed =
-                                         * (Robot.getShooter()).getShooterRPM();
-                                         * if (shooterSpeed > 0) {
-                                         * Robot.getShooter().runIndexWheel(); }
-                                         * });
-                                         */
+    runIndexWheel.whileHeld(new RunIndexWheelContinuous());
 
     reverseIndexWheel = new JoystickButton(rightJoystick,
         Constants.OI.REVERSE_INDEXWHEEL_PORT);
@@ -74,10 +71,6 @@ public class OI /* implements KeyListener */ {
         Constants.OI.REVERSE_INTAKE_PORT);
     reverseIntake.whileHeld(new ReverseIntakeContinuous());
 
-    toggleWinch = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_WINCH_PORT);
-    toggleWinch.whenPressed(new ToggleWinch());
-
     increaseShooterSpeed = new JoystickButton(leftJoystick,
         Constants.OI.INCREASE_SHOOTER_SPEED_PORT);
     increaseShooterSpeed.whenPressed(new IncreaseShootingSpeed());
@@ -86,19 +79,25 @@ public class OI /* implements KeyListener */ {
         Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
     decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
 
-    /*
-     * changeCam = new JoystickButton(rightJoystick,
-     * Constants.OI.CHANGE_CAMERA_VIEW); changeCam.toggleWhenPressed(new
-     * ChangeCameraView());
-     */
+    changeCam = new JoystickButton(rightJoystick,
+        Constants.OI.CHANGE_CAMERA_VIEW);
+    changeCam.toggleWhenPressed(new ChangeCameraView());
 
     togglePiston = new JoystickButton(rightJoystick,
         Constants.Shooter.TOGGLE_INDEXER);
-    togglePiston.whenPressed(new ToggleIndexerPiston());
+    togglePiston.toggleWhenPressed(new ToggleIndexerPiston());
 
     toggleDriveTrainPiston = new JoystickButton(rightJoystick,
         Constants.DriveTrain.TOGGLE_DRIVE_PISTON);
-    toggleDriveTrainPiston.whenPressed(new ToggleDrivePiston());
+    toggleDriveTrainPiston.whenPressed(new ToggleGear());
+
+    brakeCANTalons = new JoystickButton(rightJoystick,
+        Constants.OI.BRAKE_CANTALONS_PORT);
+    brakeCANTalons.whenPressed(new BrakeCANTalons());
+
+    coastCANTalons = new JoystickButton(rightJoystick,
+        Constants.OI.COAST_CANTALONS_PORT);
+    coastCANTalons.whenPressed(new CoastCANTalons());
   }
 
   public static OI getOI() {
@@ -118,5 +117,4 @@ public class OI /* implements KeyListener */ {
    *
    * @Override public void keyTyped(KeyEvent e) { }
    */
-
 }