From 97dec38fd6fb026ef3aee88b064551c81c6a1161 Mon Sep 17 00:00:00 2001
From: ryan123rudder <42309874+ryan123rudder@users.noreply.github.com>
Date: Mon, 11 Feb 2019 20:10:50 -0700
Subject: [PATCH] Updates to climber WIP

Theoretically functional
TODO
-Add saftey switch
-Add front flip out buton
---
 2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java  | 7 ++++---
 .../usfirst/frc4388/robot/commands/InitiateClimber.java    | 3 ++-
 .../java/org/usfirst/frc4388/robot/subsystems/Climber.java | 2 --
 3 files changed, 6 insertions(+), 6 deletions(-)

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 4fc1133..82c5212 100644
--- a/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
+++ b/2019robot/src/main/java/org/usfirst/frc4388/robot/OI.java
@@ -49,9 +49,10 @@ public class OI
 	        CarriageEject.whenPressed(new IntakeSetSpeed(Carriage.CUBE_INTAKE_SPEED));
 	        CarriageEject.whenReleased(new IntakeSetSpeed(0.0));
 	        */
-	        JoystickButton climbUp = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.X_BUTTON);
-	        climbUp.whenPressed(new InitiateClimber(true));
-	        climbUp.whenReleased(new InitiateClimber(false));
+	        JoystickButton climbUp = new JoystickButton(m_operatorXbox.getJoyStick(), XboxController.RIGHT_TRIGGER_AXIS);
+			int speed = XboxController.RIGHT_TRIGGER_AXIS;
+			climbUp.whenPressed(new InitiateClimber(true, speed));
+			climbUp.whenReleased(new InitiateClimber(false, speed));
 	        
 	        JoystickButton shiftUp = new JoystickButton(m_driverXbox.getJoyStick(), XboxController.RIGHT_BUMPER_BUTTON);
 	        shiftUp.whenPressed(new DriveSpeedShift(true));
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 c949f6e..507d6d1 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
@@ -10,9 +10,10 @@ public class InitiateClimber extends Command
 	boolean climb;
 	float speed;
 
-	public InitiateClimber(boolean Climb) {
+	public InitiateClimber(boolean Climb, int speed) {
 		requires(Robot.climber);
 		this.climb = Climb;
+		this.speed = speed;
 	}
 
 	@Override
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 a23dda2..c9d3ae6 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
@@ -96,7 +96,6 @@ public class Climber extends Subsystem{
 				climberBack.set(BACK_FREQ * speed);
 				climberFront.set(FRONT_FREQ * speed);
 			}
-
 		}
 		if (Climb == false) {
 			climberBack.set(0);
@@ -105,7 +104,6 @@ public class Climber extends Subsystem{
 	}
 }
 /*TODO
- * add command code for starting climb (including button press)
  * add command code for flipping front out (including button press)
  * add saftey switch on second controller
  */