cleaned some stuff up

S-man bad
This commit is contained in:
HFocus
2019-07-07 12:45:06 -06:00
parent 6cbf6a9b5d
commit de5eef4db5
5 changed files with 7 additions and 15 deletions
@@ -44,13 +44,8 @@ public class OI
m_driverXbox = new XboxController(RobotMap.DRIVER_JOYSTICK_1_USB_ID); m_driverXbox = new XboxController(RobotMap.DRIVER_JOYSTICK_1_USB_ID);
m_operatorXbox = new XboxController(RobotMap.OPERATOR_JOYSTICK_1_USB_ID); m_operatorXbox = new XboxController(RobotMap.OPERATOR_JOYSTICK_1_USB_ID);
/** operator controller */
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// operator controller
XBoxTriggerButton CarriageIntake = new XBoxTriggerButton(m_operatorXbox, XBoxTriggerButton.LEFT_TRIGGER); XBoxTriggerButton CarriageIntake = new XBoxTriggerButton(m_operatorXbox, XBoxTriggerButton.LEFT_TRIGGER);
CarriageIntake.whenPressed(new SetIntakeSpeed(BallIntake.BALL_INTAKE_SPEED)); CarriageIntake.whenPressed(new SetIntakeSpeed(BallIntake.BALL_INTAKE_SPEED));
CarriageIntake.whenReleased(new SetIntakeSpeed(0.0)); CarriageIntake.whenReleased(new SetIntakeSpeed(0.0));
@@ -97,10 +92,7 @@ public class OI
//stow.whenPressed(new setLEDPattern(LEDPatterns.SOLID_GREEN)); //stow.whenPressed(new setLEDPattern(LEDPatterns.SOLID_GREEN));
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /** Driver Xbox Controler */
// Driver Xbox Controler
JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS); JoystickButton climbUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS);
JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS); JoystickButton climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS);
@@ -6,7 +6,7 @@ import org.usfirst.frc4388.robot.subsystems.Arm;
import edu.wpi.first.wpilibj.command.Command; import edu.wpi.first.wpilibj.command.Command;
/** /**
* *
*/ */
public class ArmSetPositionPID extends Command { public class ArmSetPositionPID extends Command {
@@ -39,4 +39,4 @@ public class setClimberSafety extends Command {
@Override @Override
protected void interrupted() { protected void interrupted() {
} }
} }
@@ -128,4 +128,4 @@ public class Climber extends Subsystem{
public void flipRatchet(double speed){ public void flipRatchet(double speed){
climberFront.set(speed); climberFront.set(speed);
} }
} }
@@ -41,5 +41,5 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
@Override @Override
public void initDefaultCommand() { public void initDefaultCommand() {
} }
} }