From f1a9c3c9a5a7cdb58656adaa8bfc86addb009e00 Mon Sep 17 00:00:00 2001
From: Kevin Wamg <20215378+kevinzwang@users.noreply.github.com>
Date: Thu, 14 Mar 2019 17:07:31 -0700
Subject: [PATCH 1/2] change to manipulator controls for climbing

---
 Robot2019/src/main/java/frc/robot/OI.java      |  2 +-
 .../java/frc/robot/commands/ManualClimb.java   | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Robot2019/src/main/java/frc/robot/OI.java b/Robot2019/src/main/java/frc/robot/OI.java
index 6def22c..b924d92 100644
--- a/Robot2019/src/main/java/frc/robot/OI.java
+++ b/Robot2019/src/main/java/frc/robot/OI.java
@@ -83,7 +83,7 @@ public class OI {
     autoClimbBtn.toggleWhenPressed(new Climb(climber, dt, leftJoy));
 
     manualClimbBtn = new JoystickButton(manipulator, Manip.LT_lTrigger);
-    manualClimbBtn.toggleWhenPressed(new ManualClimb(climber, dt, leftJoy, rightJoy));
+    manualClimbBtn.toggleWhenPressed(new ManualClimb(climber, manipulator));
 
     toggleCameraBtn = new JoystickButton(leftJoy, 2);
     toggleCameraBtn.whenPressed(new ToggleCamera(driveCamera, hatchCamera, cameraServer));
diff --git a/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java b/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
index 245e1d7..4352654 100644
--- a/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
+++ b/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
@@ -11,26 +11,23 @@
 import edu.wpi.first.wpilibj.command.Command;
 import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
 import frc.robot.subsystems.Climber;
-import frc.robot.subsystems.Drivetrain;
 
 public class ManualClimb extends Command {
   private Climber climber;
-  private Drivetrain dt;
-  private Joystick leftJoy, rightJoy;
+  private Joystick manip;
   
   final private double retractDist = 0;
   final private double climbDist = 24.46; // In inches
 
-  public ManualClimb(Climber climber, Drivetrain dt, Joystick leftJoy, Joystick rightJoy) {
+  final private int climbJoyAxis = 1;
+
+  public ManualClimb(Climber climber, Joystick manip) {
     // Use requires() here to declare subsystem dependencies
     // eg. requires(chassis);
     requires(climber);
-    requires(dt);
 
     this.climber = climber;
-    this.dt = dt;
-    this.leftJoy = leftJoy;
-    this.rightJoy = rightJoy;
+    this.manip = manip;
   }
 
   // Called just before this Command runs the first time
@@ -44,8 +41,7 @@ protected void initialize() {
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
-    double climbSpeed = -leftJoy.getY();
-    double driveSpeed = -rightJoy.getY();
+    double climbSpeed = -manip.getRawAxis(climbJoyAxis);
 
     if (climbSpeed > 0 && climber.getEncDistance() >= climbDist) {
       climbSpeed = 0;
@@ -53,7 +49,6 @@ protected void execute() {
       climbSpeed = 0;
     }
     climber.runClimber(climbSpeed);
-    dt.drive(driveSpeed, driveSpeed);
 
     double angle = climber.getAngle();
     SmartDashboard.putNumber("Current Angle", angle);
@@ -75,7 +70,6 @@ protected boolean isFinished() {
   @Override
   protected void end() {
     climber.stopClimber();
-    dt.stop();
   }
 
   // Called when another command which requires one or more of the same

From 6c103107adf327d9723a3912708cf5dacb5ca37a Mon Sep 17 00:00:00 2001
From: alexander-mcdowell <lextmcdowell@gmail.com>
Date: Fri, 15 Mar 2019 13:22:38 -0700
Subject: [PATCH 2/2] im bad -kev

---
 .../main/java/frc/robot/commands/ManualClimb.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java b/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
index 4352654..93a095b 100644
--- a/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
+++ b/Robot2019/src/main/java/frc/robot/commands/ManualClimb.java
@@ -41,13 +41,13 @@ protected void initialize() {
   // Called repeatedly when this Command is scheduled to run
   @Override
   protected void execute() {
-    double climbSpeed = -manip.getRawAxis(climbJoyAxis);
+    double climbSpeed = manip.getRawAxis(climbJoyAxis);
 
-    if (climbSpeed > 0 && climber.getEncDistance() >= climbDist) {
-      climbSpeed = 0;
-    } else if (climbSpeed < 0 && climber.getEncDistance() <= retractDist) {
-      climbSpeed = 0;
-    }
+    // if (climbSpeed > 0 && climber.getEncDistance() >= climbDist) {
+    //   climbSpeed = 0;
+    // } else if (climbSpeed < 0 && climber.getEncDistance() <= retractDist) {
+    //   climbSpeed = 0;
+    // }
     climber.runClimber(climbSpeed);
 
     double angle = climber.getAngle();