From 2f17b00606cfa7efc607327a78878d6cb8e94189 Mon Sep 17 00:00:00 2001 From: EvanYap Date: Thu, 21 Jan 2016 19:49:06 -0800 Subject: [PATCH] Change buttons pressed to use OI initialized buttons --- .../usfirst/frc/team3501/robot/subsystems/Shooter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java index 1d7fdb3c..5727cc28 100755 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Shooter.java @@ -27,17 +27,15 @@ public class Shooter extends Subsystem { public void shooterButtonsPressed() { - if (Robot.oi.rightJoystick - .getRawButton(Constants.OI.INCREMENT_SHOOTER_PORT)) { + if (Robot.oi.incrementSpeed.get()) { changeSpeed(0.1); } - if (Robot.oi.rightJoystick - .getRawButton(Constants.OI.DECREMENT_SHOOTER_PORT)) { + if (Robot.oi.decrementSpeed.get()) { changeSpeed(-0.1); } - if (Robot.oi.rightJoystick.getRawButton(Constants.OI.TRIGGER_PORT)) { + if (Robot.oi.trigger.get()) { if (this.getState() == State.STOPPED) this.setSpeed(0.5); } else { @@ -46,7 +44,7 @@ public class Shooter extends Subsystem { } } - if (Robot.oi.rightJoystick.getRawButton(Constants.OI.PRINT_PORT)) { + if (Robot.oi.outputCurrentShooterSpeed.get()) { System.out.println("Current Shooter Speed: " + getCurrentSpeed()); } } -- 2.30.2