Edit comments

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 c8b8b8deb03df2bdc561413793b60c3c834bdba1..88195a4b2d89227fffaa90ea3bf2ede0cbda4572 100644 (file)
--- 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 e0a6700115c1b77234cb3d14db5e516b7a3e64ae..959dd37b8fcdaa54c8de6693de7a73a40d4da025 100644 (file)
--- 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 3426dad718b70fce7772c37871d39bbed8647de6..9dd7361ba83d3b2da383834f0150aa86696ca345 100644 (file)
--- 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) {
 
   }
 }