X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=c608b86b8d1767a8eeab2c2b268693ef6ce74d0e;hb=aec45ad9b8988b554695c3677b0dab0eac3d07f8;hp=32ec06253e7be998195641cdaf87c114c52f935d;hpb=cef1f36da71950bc32d74d2ba0477a51f478f209;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 32ec062..c608b86 100644
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,10 +1,11 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.climber.MaintainClimbedPosition;
-import org.usfirst.frc.team3501.robot.commands.climber.RunWinchContinuous;
+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;
+import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
+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;
@@ -18,7 +19,6 @@ public class OI {
   public static Joystick leftJoystick;
   public static Joystick rightJoystick;
   public static Button toggleWinch;
-  private boolean isClimbing = false;
 
   public static Button runIndexWheel;
   public static Button reverseIndexWheel;
@@ -29,19 +29,22 @@ public class OI {
   public static Button runIntake;
   public static Button reverseIntake;
 
+  public static Button increaseShooterSpeed;
+  public static Button decreaseShooterSpeed;
+
   public OI() {
     leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
     rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
 
-    runIndexWheel = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_INDEXWHEEL_PORT);
+    runIndexWheel = new JoystickButton(rightJoystick,
+        Constants.OI.RUN_INDEXWHEEL_PORT);
     runIndexWheel.whileHeld(new RunIndexWheelContinuous());
 
-    reverseIndexWheel = new JoystickButton(leftJoystick,
+    reverseIndexWheel = new JoystickButton(rightJoystick,
         Constants.OI.REVERSE_INDEXWHEEL_PORT);
     reverseIndexWheel.whileHeld(new ReverseIndexWheelContinuous());
 
-    toggleFlyWheel = new JoystickButton(leftJoystick,
+    toggleFlyWheel = new JoystickButton(rightJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
     toggleFlyWheel.toggleWhenPressed(new RunFlyWheelContinuous());
 
@@ -49,8 +52,7 @@ public class OI {
         Constants.OI.TOGGLE_GEAR_PORT);
     toggleGear.whenPressed(new ToggleGear());
 
-    runIntake = new JoystickButton(leftJoystick,
-        Constants.OI.TOGGLE_INTAKE_PORT);
+    runIntake = new JoystickButton(leftJoystick, Constants.OI.RUN_INTAKE_PORT);
     runIntake.whileHeld(new RunIntakeContinuous());
 
     reverseIntake = new JoystickButton(leftJoystick,
@@ -59,13 +61,15 @@ public class OI {
 
     toggleWinch = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_WINCH_PORT);
-    if (!isClimbing) {
-      toggleWinch.whenPressed(new RunWinchContinuous());
-      isClimbing = true;
-    } else {
-      toggleWinch.whenPressed(new MaintainClimbedPosition());
-      isClimbing = false;
-    }
+    toggleWinch.whenPressed(new ToggleWinch());
+
+    increaseShooterSpeed = new JoystickButton(leftJoystick,
+        Constants.OI.INCREASE_SHOOTER_SPEED_PORT);
+    increaseShooterSpeed.whenPressed(new IncreaseShootingSpeed());
+
+    decreaseShooterSpeed = new JoystickButton(leftJoystick,
+        Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
+    decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
   }
 
   public static OI getOI() {