From: EvanYap Date: Fri, 22 Jan 2016 03:48:44 +0000 (-0800) Subject: Add shooter buttons per logan request X-Git-Url: http://challenge-bot.com/repos/?a=commitdiff_plain;h=be737818e5f043c6c08cdcd8227aa397bcd446d7;hp=e8986b9b9e0e1b4cb654960e1f891cbfc38642a8;p=3501%2Fstronghold-2016 Add shooter buttons per logan request --- diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index c93ce127..9a365a7c 100644 --- a/src/org/usfirst/frc/team3501/robot/OI.java +++ b/src/org/usfirst/frc/team3501/robot/OI.java @@ -1,8 +1,5 @@ package org.usfirst.frc.team3501.robot; -import org.usfirst.frc.team3501.robot.commands.runShooter; -import org.usfirst.frc.team3501.robot.commands.setShooterSpeed; - import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.buttons.Button; import edu.wpi.first.wpilibj.buttons.JoystickButton; @@ -13,7 +10,7 @@ public class OI { public static Button decrementSpeed; public static Button incrementSpeed; public static Button outputCurrentShooterSpeed; - public static Button runWheel; + public static Button trigger; public OI() { leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT); @@ -21,17 +18,15 @@ public class OI { decrementSpeed = new JoystickButton(rightJoystick, Constants.OI.DECREMENT_SHOOTER_PORT); - decrementSpeed.whenPressed(new setShooterSpeed(-0.1)); incrementSpeed = new JoystickButton(rightJoystick, Constants.OI.INCREMENT_SHOOTER_PORT); - incrementSpeed.whenPressed(new setShooterSpeed(0.1)); outputCurrentShooterSpeed = new JoystickButton(rightJoystick, Constants.OI.SHOOTER_PORT); - runWheel = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT); - runWheel.whenPressed(new runShooter()); + trigger = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT); + } }