projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix stupid stuff
[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 cc5dcc5d467bec867243f0722612c647ec0f8c43..0157b45b965df8db82fbc33005cf456d1dd0ca03 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-1,10
+1,9
@@
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.PrintData;
import org.usfirst.frc.team3501.robot.commands.shooter.RecordData;
import org.usfirst.frc.team3501.robot.commands.shooter.PrintData;
import org.usfirst.frc.team3501.robot.commands.shooter.RecordData;
-import org.usfirst.frc.team3501.robot.commands.shooter.Test1;
-import org.usfirst.frc.team3501.robot.commands.shooter.Test2;
-import org.usfirst.frc.team3501.robot.commands.shooter.Test3;
+import org.usfirst.frc.team3501.robot.commands.shooter.Shoot;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.Button;
@@
-96,15
+95,15
@@
public class OI {
shoot = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TRIGGER_PORT);
shoot = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TRIGGER_PORT);
- shoot.whenPressed(new
Test1
());
+ shoot.whenPressed(new
Shoot
());
incrementSpeed = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TOP_CENTER_PORT);
incrementSpeed = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TOP_CENTER_PORT);
- incrementSpeed.whenPressed(new
Test2(
));
+ incrementSpeed.whenPressed(new
ChangeShooterSpeed(0.1
));
decrementSpeed = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TOP_LOW_PORT);
decrementSpeed = new JoystickButton(leftJoystick,
Constants.OI.LEFT_JOYSTICK_TOP_LOW_PORT);
- decrementSpeed.whenPressed(new
Test3(
));
+ decrementSpeed.whenPressed(new
ChangeShooterSpeed(-0.1
));
printData = new JoystickButton(leftJoystick,
Constants.OI.SPIN2_PORT);
printData = new JoystickButton(leftJoystick,
Constants.OI.SPIN2_PORT);