X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=880894f810c81705e164e0e1edeb922b0b4cb493;hb=6bc81b557f637fa81f73c33161e82cba049235f3;hp=07ad53c765b9f50318f9cb024d4a46c1344e02e1;hpb=dd4a87932b7956021f78c8e86cff6adf0187aa8f;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 07ad53c..880894f 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,6 +1,5 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.climber.ToggleWinch;
 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;
@@ -20,7 +19,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 +37,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);
@@ -67,10 +68,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());
@@ -90,6 +87,14 @@ public class OI /* implements KeyListener */ {
     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() {