diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java index 914ee9d..5552693 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java @@ -46,7 +46,7 @@ public class OI ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// opporator controller +// operator controller diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java index fc151f4..b8d929e 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Arm.java @@ -118,6 +118,12 @@ public class Arm extends Subsystem implements ControlLoopable // Pneumatics private Solenoid speedShift; + //DPad Buttons + static final int DPAD_UP = 0; + static final int DPAD_RIGHT = 90; + static final int DPAD_DOWN = 180; + static final int DPAD_LEFT = 270; + // Misc public static final double AUTO_ZERO_MOTOR_CURRENT = 4.0; private boolean isFinished; @@ -288,29 +294,29 @@ public class Arm extends Subsystem implements ControlLoopable public void dPadButtons(){ int dPadAngle = Robot.oi.getOperatorController().getDpadAngle(); if (placeMode == PlaceMode.HATCH){ - if (dPadAngle == 0 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_UP && lastDPadAngle == -1){ new HatchHigh().start(); } - if (dPadAngle == 90 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_RIGHT && lastDPadAngle == -1){ new HatchMid().start(); } - if (dPadAngle == 180 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_DOWN && lastDPadAngle == -1){ new HatchLow().start(); } } if (placeMode == PlaceMode.CARGO) { - if (dPadAngle == 0 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_UP && lastDPadAngle == -1){ new CargoHigh().start(); } - if (dPadAngle == 90 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_RIGHT && lastDPadAngle == -1){ new CargoMid().start(); } - if (dPadAngle == 180 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_DOWN && lastDPadAngle == -1){ new CargoLow().start(); } } - if (dPadAngle == 270 && lastDPadAngle == -1){ + if (dPadAngle == DPAD_LEFT && lastDPadAngle == -1){ new StowArm().start(); } SmartDashboard.putNumber("DPad Angle", dPadAngle);