From b71b71bc16c83b21d7a4116c6446a07bac0d8569 Mon Sep 17 00:00:00 2001 From: Shivani Ghanta Date: Tue, 17 Jan 2017 18:52:15 -0800 Subject: [PATCH] Edit comments --- .../usfirst/frc/team3501/robot/commands/climber/RunWinch.java | 4 ++++ .../team3501/robot/commands/climber/RunWinchContinuous.java | 2 +- src/org/usfirst/frc/team3501/robot/subsystems/Climber.java | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) 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 c8b8b8d..88195a4 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java @@ -15,6 +15,10 @@ import edu.wpi.first.wpilibj.command.Command; * * post-condition: Winch motor set to a specified speed for a specified time. * + * @param motorVal + * value range is from -1 to 1 + * @param time + * in seconds * @author shivanighanta * */ 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 e0a6700..959dd37 100644 --- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java +++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java @@ -43,7 +43,7 @@ public class RunWinchContinuous extends Command { @Override protected boolean isFinished() { - return false; + return !Robot.getOI().toggleWinch.get(); } @Override diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java index 3426dad..9dd7361 100644 --- a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java +++ b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java @@ -15,10 +15,10 @@ public class Climber { } public void stop() { - setMotorValues(0); + setMotorValue(0); } - public void setMotorValues(final double val) { + public void setMotorValue(final double val) { } } -- 2.30.2