projects
/
3501
/
stronghold-2016
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
e8986b9
)
Add shooter buttons per logan request
author
EvanYap
<evanyap.14@gmail.com>
Fri, 22 Jan 2016 03:48:44 +0000
(19:48 -0800)
committer
Kevin Zhang
<icestormf1@gmail.com>
Sat, 23 Jan 2016 03:37:35 +0000
(19:37 -0800)
src/org/usfirst/frc/team3501/robot/OI.java
patch
|
blob
|
blame
|
history
diff --git
a/src/org/usfirst/frc/team3501/robot/OI.java
b/src/org/usfirst/frc/team3501/robot/OI.java
index c93ce127ac1cc777d3e7b696721143e17f6ab4ae..9a365a7c01e71a08c1ee19b9426c6b547ab1632a 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-1,8
+1,5
@@
package org.usfirst.frc.team3501.robot;
package org.usfirst.frc.team3501.robot;
-import org.usfirst.frc.team3501.robot.commands.runShooter;
-import org.usfirst.frc.team3501.robot.commands.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;
@@
-13,7
+10,7
@@
public class OI {
public static Button decrementSpeed;
public static Button incrementSpeed;
public static Button outputCurrentShooterSpeed;
public static Button decrementSpeed;
public static Button incrementSpeed;
public static Button outputCurrentShooterSpeed;
- public static Button
runWheel
;
+ public static Button
trigger
;
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
public OI() {
leftJoystick = new Joystick(Constants.OI.LEFT_STICK_PORT);
@@
-21,17
+18,15
@@
public class OI {
decrementSpeed = new JoystickButton(rightJoystick,
Constants.OI.DECREMENT_SHOOTER_PORT);
decrementSpeed = new JoystickButton(rightJoystick,
Constants.OI.DECREMENT_SHOOTER_PORT);
- decrementSpeed.whenPressed(new setShooterSpeed(-0.1));
incrementSpeed = new JoystickButton(rightJoystick,
Constants.OI.INCREMENT_SHOOTER_PORT);
incrementSpeed = new JoystickButton(rightJoystick,
Constants.OI.INCREMENT_SHOOTER_PORT);
- incrementSpeed.whenPressed(new setShooterSpeed(0.1));
outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
Constants.OI.SHOOTER_PORT);
outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
Constants.OI.SHOOTER_PORT);
-
runWheel
= new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
- runWheel.whenPressed(new runShooter());
+
trigger
= new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
+
}
}
}
}