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 892d2ddfb2c726a90814d39bc7c0b2c00a1ba344..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
@@ -5,9 +5,7 @@ import org.usfirst.frc.team3501.robot.Robot;
 import edu.wpi.first.wpilibj.command.Command;
 
 /**
- * This command stops the winch
- *
- * post-condition: the motor values are set to 0.
+ * Stops the winch
  *
  * @author shivanighanta
  *
@@ -15,8 +13,8 @@ import edu.wpi.first.wpilibj.command.Command;
 public class StopWinch extends Command {
 
   public StopWinch() {
+    requires(Robot.getDriveTrain());
     requires(Robot.getClimber());
-
   }
 
   @Override
@@ -34,7 +32,7 @@ public class StopWinch extends Command {
 
   @Override
   protected void end() {
-    Robot.getClimber().stop();
+    Robot.getDriveTrain().stop();
 
   }