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 bed5c8ca0bda9efa108d8840a12a0d64432bb885..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
@@ -38,6 +38,7 @@ public class RunWinch extends Command {
    */
   public RunWinch(double time, double motorVal) {
     requires(Robot.getDriveTrain());
+    timer = new Timer();
     this.time = time;
     this.motorVal = motorVal;
   }
@@ -61,10 +62,6 @@ public class RunWinch extends Command {
   @Override
   protected void end() {
     Robot.getDriveTrain().stop();
-<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
-=======
-
->>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
   }
 
   @Override