Fix merging errors with climber subclass

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

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
index 6c83816c37cc9102e23bed14b23b3e421701c042..0924614e3e4a931a1f0233fef4aeaec33dc9770a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@ -13,6 +13,7 @@ import edu.wpi.first.wpilibj.command.Command;
 public class StopWinch extends Command {
 
   public StopWinch() {
+    requires(Robot.getDriveTrain());
     requires(Robot.getClimber());
   }
 
@@ -22,20 +23,21 @@ public class StopWinch extends Command {
 
   @Override
   protected void execute() {
-
   }
 
   @Override
   protected boolean isFinished() {
-    return false;
+    return true;
   }
 
   @Override
   protected void end() {
+    Robot.getDriveTrain().stop();
 
   }
 
   @Override
   protected void interrupted() {
+    end();
   }
 }