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 243e330f5b7b1c041cd6989140d3caf989e2656c..4ea52e6bc798ffa95ab29e59ae90309024350cad 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,6 +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.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;
@@ -9,16 +11,17 @@ import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
 import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
 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;
 import edu.wpi.first.wpilibj.buttons.JoystickButton;
 
-public class OI {
+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;
@@ -34,7 +37,14 @@ public class OI {
 
   private static Button changeCam;
 
+  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);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
 
@@ -61,10 +71,6 @@ public class OI {
         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());
@@ -76,6 +82,22 @@ public class OI {
     changeCam = new JoystickButton(rightJoystick,
         Constants.OI.CHANGE_CAMERA_VIEW);
     changeCam.toggleWhenPressed(new ChangeCameraView());
+
+    togglePiston = new JoystickButton(rightJoystick,
+        Constants.Shooter.TOGGLE_INDEXER);
+    togglePiston.toggleWhenPressed(new ToggleIndexerPiston());
+
+    toggleDriveTrainPiston = new JoystickButton(rightJoystick,
+        Constants.DriveTrain.TOGGLE_DRIVE_PISTON);
+    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() {
@@ -83,4 +105,16 @@ public class OI {
       oi = new OI();
     return oi;
   }
+
+  /*
+   * @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() ==
+   * KeyEvent.VK_Z) { // Robot.swapCameraFeed();
+   * Robot.getShooter().runIndexWheel(); } }
+   *
+   * @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() ==
+   * KeyEvent.VK_Z) { // Robot.swapCameraFeed();
+   * Robot.getShooter().stopIndexWheel(); } }
+   *
+   * @Override public void keyTyped(KeyEvent e) { }
+   */
 }