projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change constants and variable names to be more descriptive
[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 4367d6ae50ea68a7b3d2bda87707e826c42abc7a..606fff68b4dd228c9ea71e44560c65fe015e8b08 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-1,7
+1,5
@@
package org.usfirst.frc.team3501.robot;
package org.usfirst.frc.team3501.robot;
-import org.usfirst.frc.team3501.robot.commands.changeSpeed;
-
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;
@@
-9,29
+7,25
@@
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 decrementSpeed;
- public static Button incrementSpeed;
+ public static Button decrementS
hooterS
peed;
+ public static Button incrementS
hooterS
peed;
public static Button outputCurrentShooterSpeed;
public static Button outputCurrentShooterSpeed;
- public static Button
runWheel
;
+ 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);
- decrementSpeed = new JoystickButton(rightJoystick,
- Constants.OI.DEC
REMENT_SHOOTER
_PORT);
+ decrementS
hooterS
peed = new JoystickButton(rightJoystick,
+ Constants.OI.DEC
_SHOOTER_SPD
_PORT);
- incrementSpeed = new JoystickButton(rightJoystick,
- Constants.OI.INC
REMENT_SHOOTER
_PORT);
+ incrementS
hooterS
peed = new JoystickButton(rightJoystick,
+ Constants.OI.INC
_SHOOTER_SPD
_PORT);
outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
Constants.OI.SHOOTER_PORT);
outputCurrentShooterSpeed = new JoystickButton(rightJoystick,
Constants.OI.SHOOTER_PORT);
- runWheel = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
-
- incrementSpeed.whenPressed(new changeSpeed(0.1));
-
- decrementSpeed.whenPressed(new changeSpeed(-0.1));
+ trigger = new JoystickButton(rightJoystick, Constants.OI.TRIGGER_PORT);
}
}