X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;fp=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=880894f810c81705e164e0e1edeb922b0b4cb493;hb=6bc81b557f637fa81f73c33161e82cba049235f3;hp=a1abe0ad63a7b3e3a1fd22c450c5b547402d0a71;hpb=cb8e86cb498c12dcf4e2b7a5916fc6f4926b77cf;p=3501%2F2017steamworks diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index a1abe0a..880894f 100644 --- a/src/org/usfirst/frc/team3501/robot/OI.java +++ b/src/org/usfirst/frc/team3501/robot/OI.java @@ -1,7 +1,5 @@ package org.usfirst.frc.team3501.robot; -import org.usfirst.frc.team3501.robot.commands.driving.BrakeCANTalons; -import org.usfirst.frc.team3501.robot.commands.driving.CoastCANTalons; 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; @@ -10,12 +8,14 @@ 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; +import org.usfirst.frc.team3501.robot.commands.shooter.ToggleIndexerPiston; +import org.usfirst.frc.team3501.robot.utils.ChangeCameraView; import edu.wpi.first.wpilibj.Joystick; import edu.wpi.first.wpilibj.buttons.Button; import edu.wpi.first.wpilibj.buttons.JoystickButton; -public class OI { +public class OI /* implements KeyListener */ { private static OI oi; public static Joystick leftJoystick; public static Joystick rightJoystick; @@ -32,10 +32,16 @@ public class OI { public static Button increaseShooterSpeed; public static Button decreaseShooterSpeed; + private static Button changeCam; + + 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); rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT); @@ -70,6 +76,18 @@ public class OI { Constants.OI.DECREASE_SHOOTER_SPEED_PORT); decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed()); + changeCam = new JoystickButton(rightJoystick, + Constants.OI.CHANGE_CAMERA_VIEW); + changeCam.toggleWhenPressed(new ChangeCameraView()); + + togglePiston = new JoystickButton(rightJoystick, + Constants.Shooter.TOGGLE_INDEXER); + togglePiston.whenPressed(new ToggleIndexerPiston()); + + 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()); @@ -84,4 +102,17 @@ public class OI { oi = new OI(); return oi; } + + /* + * @Override public void keyPressed(KeyEvent e) { if (e.getKeyCode() == + * KeyEvent.VK_Z) { // Robot.swapCameraFeed(); + * Robot.getShooter().runIndexWheel(); } } + * + * @Override public void keyReleased(KeyEvent e) { if (e.getKeyCode() == + * KeyEvent.VK_Z) { // Robot.swapCameraFeed(); + * Robot.getShooter().stopIndexWheel(); } } + * + * @Override public void keyTyped(KeyEvent e) { } + */ + }