Initialize timer

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / commands / climber / RunWinch.java

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 c790a6cf70e7f39670d2dd382991562f8fea2798..2428aff2345244364035e842c40042626d27c74d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@ -15,6 +15,10 @@ import edu.wpi.first.wpilibj.command.Command;
  *
  * post-condition: Winch motor set to a specified speed for a specified time.
  *
+ * @param motorVal
+ *          value range is from -1 to 1
+ * @param time
+ *          in seconds
  * @author shivanighanta
  *
  */
@@ -33,11 +37,8 @@ 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
+    timer = new Timer();
     this.time = time;
     this.motorVal = motorVal;
   }
@@ -45,10 +46,6 @@ public class RunWinch extends Command {
   @Override
   protected void initialize() {
     timer.start();
-<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3
-=======
-    Robot.getClimber().setMotorValues(motorVal, motorVal);
->>>>>>> Implement RunWinch
   }
 
   @Override
@@ -64,12 +61,7 @@ public class RunWinch extends Command {
 
   @Override
   protected void end() {
-<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3
     Robot.getDriveTrain().stop();
-
-=======
-    Robot.getClimber().stop();
->>>>>>> Implement RunWinch
   }
 
   @Override