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 d29bbfe..94f41df 100644 --- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java +++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java @@ -51,7 +51,7 @@ public class OI CarriageEject.whenReleased(new IntakeSetSpeed(0.0)); */ JoystickButton climbUp = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS); - float speed = XboxController.RIGHT_TRIGGER_AXIS; + double speed = m_driverXbox.getRightTriggerAxis(); climbUp.whenPressed(new InitiateClimber(true, speed)); climbUp.whenReleased(new InitiateClimber(false, speed)); 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 243dcef..41bf543 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 @@ -8,9 +8,9 @@ import edu.wpi.first.wpilibj.command.Command; public class InitiateClimber extends Command { boolean climb; - float speed; + double speed; - public InitiateClimber(boolean Climb, float speed) { + public InitiateClimber(boolean Climb, double speed) { requires(Robot.climber); this.climb = Climb; this.speed = speed; 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 2f6a672..3d90f88 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 @@ -78,7 +78,7 @@ public class Climber extends Subsystem{ public void periodic() { } - public void setClimbSpeed(boolean Climb, float speed) { + public void setClimbSpeed(boolean Climb, double speed) { if (Climb && safetySwitch) { System.out.println("TriggerVal = " + speed); if(isPressed.isFwdLimitSwitchClosed()){ //If back at max height