projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add everything all commands to specific packages
[3501/stronghold-2016]
/
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 0bf9e3a4db2b4d82807d79441f9f4c1d469336a0..1c891af08f5e26dcf2b9e9bb7a3baae61b3ec938 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-1,5
+1,8
@@
package org.usfirst.frc.team3501.robot;
package org.usfirst.frc.team3501.robot;
+import org.usfirst.frc.team3501.robot.commands.shooter.ChangeShooterSpeed;
+import org.usfirst.frc.team3501.robot.commands.shooter.SetShooterSpeed;
+
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
@@
-7,21
+10,29
@@
import edu.wpi.first.wpilibj.buttons.JoystickButton;
public class OI {
public static Joystick leftJoystick;
public static Joystick rightJoystick;
public class OI {
public static Joystick leftJoystick;
public static Joystick rightJoystick;
- public static Button leftSilverButton;
- public static Button rightSilverButton;
+ public static Button decrementShooterSpeed;
+ public static Button incrementShooterSpeed;
+ public static Button outputCurrentShooterSpeed;
+ public static Button trigger;
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
rightJoystick = new Joystick(Constants.OI.RIGHT_STICK_PORT);
-
leftSilverButton
= new JoystickButton(rightJoystick,
- Constants.OI.
RIGHT_STICK_LEFT_SILVER_BUTTON
);
- ;
+
decrementShooterSpeed
= new JoystickButton(rightJoystick,
+ Constants.OI.
DECREMENT_SHOOTER_SPEED_PORT
);
+
decrementShooterSpeed.whenPressed(new ChangeShooterSpeed(-0.1))
;
-
rightSilverButton
= new JoystickButton(rightJoystick,
- Constants.OI.
RIGHT_STICK_RIGHT_SILVER_BUTTON
);
- ;
+
incrementShooterSpeed
= new JoystickButton(rightJoystick,
+ Constants.OI.
INCREMENT_SHOOTER_SPEED_PORT
);
+
incrementShooterSpeed.whenPressed(new ChangeShooterSpeed(0.1))
;
- }
+ outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
+ Constants.OI.SHOOT_PORT);
+ trigger = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
+ trigger.whenPressed(new SetShooterSpeed(0.5));
+ trigger.whenReleased(new SetShooterSpeed(0.0));
+
+ }
}
}