From be737818e5f043c6c08cdcd8227aa397bcd446d7 Mon Sep 17 00:00:00 2001 From: EvanYap Date: Thu, 21 Jan 2016 19:48:44 -0800 Subject: [PATCH] Add shooter buttons per logan request --- src/org/usfirst/frc/team3501/robot/OI.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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); + } } -- 2.30.2