implement ToggleWinch command

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

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
index f1fae231c7fd4370cb4ff2901f63ab63b324ded2..88c2f6d8ea3b5310b4e73cc54c2fa8eb585779ea 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@ -18,11 +18,9 @@ import edu.wpi.first.wpilibj.command.Command;
  *
  */
 public class RunWinchContinuous extends Command {
-<<<<<<< HEAD
+
   DriveTrain driveTrain = Robot.getDriveTrain();
   private double climbingSpeed;
-=======
->>>>>>> Add JoystickButton objects and constants for Drivetrain, Climer, Intake, and Shooter
 
   /**
    * See JavaDoc comment in class for details
@@ -31,22 +29,14 @@ public class RunWinchContinuous extends Command {
    *          value range is from -1 to 1
    */
   public RunWinchContinuous() {
-<<<<<<< HEAD
     requires(driveTrain);
     climbingSpeed = driveTrain.CLIMBER_SPEED;
-=======
     requires(Robot.getDriveTrain());
->>>>>>> Add JoystickButton objects and constants for Drivetrain, Climer, Intake, and Shooter
+    requires(driveTrain);
   }
 
   @Override
   protected void initialize() {
-<<<<<<< HEAD
-=======
-    Robot.getDriveTrain().setMotorValues(
-        Robot.getDriveTrain().getClimbingSpeed(),
-        Robot.getDriveTrain().getClimbingSpeed());
->>>>>>> Add JoystickButton objects and constants for Drivetrain, Climer, Intake, and Shooter
   }
 
   @Override