From b3dd2f50b427a0816a926ce9b27cbfdf0dbb3bb0 Mon Sep 17 00:00:00 2001 From: Shivani Ghanta Date: Sat, 14 Jan 2017 15:26:14 -0800 Subject: [PATCH] Implement RunWinch --- .../team3501/robot/commands/climber/RunWinch.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java index e7e71f3..c790a6c 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java @@ -33,7 +33,11 @@ public class RunWinch extends Command { * value range is from -1 to 1 */ public RunWinch(double time, double motorVal) { +<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3 requires(Robot.getDriveTrain()); +======= + requires(Robot.getClimber()); +>>>>>>> Implement RunWinch this.time = time; this.motorVal = motorVal; } @@ -41,6 +45,10 @@ public class RunWinch extends Command { @Override protected void initialize() { timer.start(); +<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3 +======= + Robot.getClimber().setMotorValues(motorVal, motorVal); +>>>>>>> Implement RunWinch } @Override @@ -56,8 +64,12 @@ public class RunWinch extends Command { @Override protected void end() { +<<<<<<< a5147d5928f01620d8e10f2e9cdea079526d2db3 Robot.getDriveTrain().stop(); +======= + Robot.getClimber().stop(); +>>>>>>> Implement RunWinch } @Override -- 2.30.2