projects
/
3501
/
stronghold-2016
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Delete unused booleans and delete else if (else will suffice)
[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 f72a6043ba2394dd34921f5cb816f183d7eda6d5..cb23990c52fdbac76ed9319141505cd52cd8c599 100644
(file)
--- a/
src/org/usfirst/frc/team3501/robot/OI.java
+++ b/
src/org/usfirst/frc/team3501/robot/OI.java
@@
-23,9
+23,6
@@
import edu.wpi.first.wpilibj.buttons.Button;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
public class OI {
import edu.wpi.first.wpilibj.buttons.JoystickButton;
public class OI {
- public static boolean isScalingMode = false;
- public static boolean isCompactRobot = false;
-
public static Joystick leftJoystick;
public static Joystick rightJoystick;
public static Joystick leftJoystick;
public static Joystick rightJoystick;
@@
-128,7
+125,7
@@
public class OI {
intakeBoulder.whenPressed(new IntakeBall());
shootBoulder.whenPressed(new Shoot());
intakeBoulder.whenPressed(new IntakeBall());
shootBoulder.whenPressed(new Shoot());
- } else
if (isScalingMode)
{
+ } else {
// toggleShooter becomes winch
// compact robot button 1 and 2 retracts the lift
// intake button stops the winch
// toggleShooter becomes winch
// compact robot button 1 and 2 retracts the lift
// intake button stops the winch