From 93241e25b57f6a7e7f64207682246957cd47e353 Mon Sep 17 00:00:00 2001 From: Harel Dor Date: Mon, 22 Feb 2016 20:26:26 -0800 Subject: [PATCH] Add (BAD) shooter code. Very temporary. --- src/org/usfirst/frc/team3501/robot/Constants.java | 2 +- src/org/usfirst/frc/team3501/robot/OI.java | 4 ++-- src/org/usfirst/frc/team3501/robot/Robot.java | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java index 6ed06963..657fc285 100644 --- a/src/org/usfirst/frc/team3501/robot/Constants.java +++ b/src/org/usfirst/frc/team3501/robot/Constants.java @@ -101,7 +101,7 @@ public class Constants { } public static class Shooter { - public static final int PORT = 0; + public static final int PORT = 4; public static final int PUNCH_FORWARD = 5; public static final int PUNCH_REVERSE = 1; public static final int ANGLE_ADJUSTER_PORT = 0; diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index cb7e12d9..bde311bd 100644 --- a/src/org/usfirst/frc/team3501/robot/OI.java +++ b/src/org/usfirst/frc/team3501/robot/OI.java @@ -42,8 +42,8 @@ public class OI { leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT); rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT); - toggleGear = new JoystickButton(rightJoystick, - Constants.OI.RIGHT_JOYSTICK_TRIGGER_PORT); + toggleGear = new JoystickButton(leftJoystick, + Constants.OI.LEFT_JOYSTICK_TRIGGER_PORT); toggleGear.toggleWhenPressed(new ChangeGear()); // passPortcullis = new DigitalButton( diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java index 46ef8069..d0516b8e 100644 --- a/src/org/usfirst/frc/team3501/robot/Robot.java +++ b/src/org/usfirst/frc/team3501/robot/Robot.java @@ -126,6 +126,11 @@ public class Robot extends IterativeRobot { @Override public void teleopPeriodic() { Scheduler.getInstance().run(); + if (OI.rightJoystick.getTrigger()) { + Robot.shooter.setSpeed(1); + } else { + Robot.shooter.setSpeed(0); + } } } -- 2.30.2