diff --git a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java index 41bf543..847d1cb 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/commands/InitiateClimber.java @@ -22,7 +22,7 @@ public class InitiateClimber extends Command @Override protected void execute() { - if(climb){ //If climb and saftey button are pressed + if(climb){ //If climb button is pressed Robot.climber.setClimbSpeed(climb, speed); } else{ 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 9526aff..c0e459a 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 @@ -20,7 +20,7 @@ public class setClimberSafety extends Command { // Called repeatedly when this Command is scheduled to run @Override protected void execute() { - if(safety){ + if(safety){ //If saftey button is pressed Robot.climber.safetySwitch(true); } else{ 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 3d90f88..001fdf5 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 @@ -85,12 +85,12 @@ public class Climber extends Subsystem{ climberBack.set(0); climberFront.set(FRONT_FREQ * speed); } - else if (isPressed.isFwdLimitSwitchClosed() == false){ //If back not at max height + else if (!isPressed.isFwdLimitSwitchClosed()){ //If back not at max height climberBack.set(BACK_FREQ * speed); climberFront.set(FRONT_FREQ * speed); } } - if (Climb == false || safetySwitch == false) { + if (!Climb || !safetySwitch) { climberBack.set(0); climberFront.set(0); } @@ -102,10 +102,10 @@ public class Climber extends Subsystem{ } public void flipRatchet(){ - //Code to flip out the front arms of the climber WIP + ///TODO: Code to flip out the front arms of the climber WIP } } -/*TODO +/* * add command code for flipping front out (including button press) * add saftey switch on second controller */