Begin setting up dpad control

This commit is contained in:
Keenan D. Buckley
2019-03-09 11:29:51 -07:00
parent 73cb92fa3e
commit 82c8d7814e
2 changed files with 7 additions and 4 deletions
@@ -13,4 +13,6 @@ public interface IHandController {
public double getLeftTriggerAxis();
public double getRightTriggerAxis();
public int getDpadAngle();
}
@@ -273,7 +273,6 @@ public class Arm extends Subsystem implements ControlLoopable
// Do the update
if (armControlMode == ArmControlMode.JOYSTICK_MANUAL) {
controlManualWithJoystick();
}
else if (!isFinished) {
if (armControlMode == ArmControlMode.MOTION_PROFILE) {
@@ -282,9 +281,11 @@ public class Arm extends Subsystem implements ControlLoopable
}
if (armControlMode == ArmControlMode.JOYSTICK_PID){
//System.err.println(motor1.getControlMode());
controlPidWithJoystick();
if (Robot.oi.getOperatorController().getDpadAngle() == -1){
controlPidWithJoystick();
} else {
}
}
/*else if (armControlMode == ArmControlMode.MP_PATH_VELOCITY) {