Add JoystickButton objects and constants for Drivetrain, Climer, Intake, and Shooter

[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 210199d86e2cb3dc178fb5d289f0446e4147368f..f1fae231c7fd4370cb4ff2901f63ab63b324ded2 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,8 +18,11 @@ 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
@@ -28,12 +31,22 @@ 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
   }
 
   @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