X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;ds=sidebyside;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FOI.java;h=cb23990c52fdbac76ed9319141505cd52cd8c599;hb=2c52b14f175c60fc703b7f293d2b9578b78d13b3;hp=f72a6043ba2394dd34921f5cb816f183d7eda6d5;hpb=52ef246c3346c0f22feab2aa89cfeb39aeb8dcc1;p=3501%2Fstronghold-2016 diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java index f72a6043..cb23990c 100644 --- 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 { - public static boolean isScalingMode = false; - public static boolean isCompactRobot = false; - public static Joystick leftJoystick; public static Joystick rightJoystick; @@ -128,7 +125,7 @@ public class OI { 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