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 31a5b552f011a80d7a1967547f038f90a3ac8be7..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());
   }
 
@@ -31,7 +32,7 @@ public class StopWinch extends Command {
 
   @Override
   protected void end() {
-    Robot.getClimber().stop();
+    Robot.getDriveTrain().stop();
 
   }