Implement RunWinch

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
index e7e71f30d8a48a484c25628eb917aa3e4fb86f92..c790a6cf70e7f39670d2dd382991562f8fea2798 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@ -33,7 +33,11 @@ public class RunWinch extends Command {
    *          value range is from -1 to 1
    */
   public RunWinch(double time, double motorVal) {
+<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3
     requires(Robot.getDriveTrain());
+=======
+    requires(Robot.getClimber());
+>>>>>>> Implement RunWinch
     this.time = time;
     this.motorVal = motorVal;
   }
@@ -41,6 +45,10 @@ public class RunWinch extends Command {
   @Override
   protected void initialize() {
     timer.start();
+<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3
+=======
+    Robot.getClimber().setMotorValues(motorVal, motorVal);
+>>>>>>> Implement RunWinch
   }
 
   @Override
@@ -56,8 +64,12 @@ public class RunWinch extends Command {
 
   @Override
   protected void end() {
+<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3
     Robot.getDriveTrain().stop();
 
+=======
+    Robot.getClimber().stop();
+>>>>>>> Implement RunWinch
   }
 
   @Override