projects
/
3501
/
2017steamworks
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
competition fixes
[3501/2017steamworks]
/
src
/
org
/
usfirst
/
frc
/
team3501
/
robot
/
OI.java
diff --git
a/src/org/usfirst/frc/team3501/robot/OI.java
b/src/org/usfirst/frc/team3501/robot/OI.java
index 9f8ea7ae594b5d33d07fa18bcb79935745041915..61f39c3702c1d39331495e7d7ba73611d36d7b8f 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-8,6
+8,7
@@
import org.usfirst.frc.team3501.robot.commands.intake.ReverseIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.intake.RunIntakeContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.DecreaseShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.shooter.IncreaseShootingSpeed;
+import org.usfirst.frc.team3501.robot.commands.shooter.ResetShootingSpeed;
import org.usfirst.frc.team3501.robot.commands.shooter.ReverseFlyWheelContinuous;
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.ReverseFlyWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.ReverseIndexWheelContinuous;
import org.usfirst.frc.team3501.robot.commands.shooter.RunFlyWheelContinuous;
@@
-36,6
+37,7
@@
public class OI {
public static Button increaseShooterSpeed;
public static Button decreaseShooterSpeed;
public static Button increaseShooterSpeed;
public static Button decreaseShooterSpeed;
+ public static Button resetShooterSpeed;
public static Button brakeCANTalons;
public static Button coastCANTalons;
public static Button brakeCANTalons;
public static Button coastCANTalons;
@@
-84,6
+86,10
@@
public class OI {
Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
Constants.OI.DECREASE_SHOOTER_SPEED_PORT);
decreaseShooterSpeed.whenPressed(new DecreaseShootingSpeed());
+ resetShooterSpeed = new JoystickButton(gamePad,
+ Constants.OI.RESET_SHOOTER_SPEED_PORT);
+ resetShooterSpeed.whenPressed(new ResetShootingSpeed());
+
brakeCANTalons = new JoystickButton(rightJoystick,
Constants.OI.BRAKE_CANTALONS_PORT);
brakeCANTalons.whenPressed(new BrakeCANTalons());
brakeCANTalons = new JoystickButton(rightJoystick,
Constants.OI.BRAKE_CANTALONS_PORT);
brakeCANTalons.whenPressed(new BrakeCANTalons());