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 f7a68f7..608173b 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java @@ -44,13 +44,8 @@ public class OI m_driverXbox = new XboxController(RobotMap.DRIVER_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); CarriageIntake.whenPressed(new SetIntakeSpeed(BallIntake.BALL_INTAKE_SPEED)); CarriageIntake.whenReleased(new SetIntakeSpeed(0.0)); @@ -97,10 +92,7 @@ public class OI //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 climbDown = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.LEFT_TRIGGER_AXIS); diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/ArmSetPositionPID.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/ArmSetPositionPID.java index 0156e34..4fc6406 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/ArmSetPositionPID.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/ArmSetPositionPID.java @@ -6,7 +6,7 @@ import org.usfirst.frc4388.robot.subsystems.Arm; import edu.wpi.first.wpilibj.command.Command; /** - * + * */ public class ArmSetPositionPID extends Command { diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/setClimberSafety.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/setClimberSafety.java index 82f539c..80e0ae6 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/setClimberSafety.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/setClimberSafety.java @@ -39,4 +39,4 @@ public class setClimberSafety extends Command { @Override protected void interrupted() { } -} +} \ No newline at end of file diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java index 5a2d143..7ff89cb 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/Climber.java @@ -128,4 +128,4 @@ public class Climber extends Subsystem{ public void flipRatchet(double speed){ climberFront.set(speed); } -} +} \ No newline at end of file diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/LED.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/LED.java index b8ef699..43c24f8 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/LED.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/subsystems/LED.java @@ -41,5 +41,5 @@ import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; @Override public void initDefaultCommand() { - } + } } \ No newline at end of file