Delete StopWinch and Climber subsystem, edit javadoc comments

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 4978c317227b7d8a37a1696fe875c6f46db7c68a..7c9d216e382645c5e9e4086c163e298759e40684 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -14,7 +14,6 @@ public class Constants {
 
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
-    public final static int TOGGLE_WINCH_PORT = 0;
   }
 
   public static class Shooter {

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 88195a4b2d89227fffaa90ea3bf2ede0cbda4572..bed5c8ca0bda9efa108d8840a12a0d64432bb885 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinch.java
@@ -61,6 +61,10 @@ public class RunWinch extends Command {
   @Override
   protected void end() {
     Robot.getDriveTrain().stop();
+<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
+=======
+
+>>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
   }
 
   @Override

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 959dd37b8fcdaa54c8de6693de7a73a40d4da025..a713cb2a1a8c7d7bcf1f7bc4192f35bb92babecf 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/RunWinchContinuous.java
@@ -5,9 +5,14 @@ import org.usfirst.frc.team3501.robot.Robot;
 import edu.wpi.first.wpilibj.command.Command;
 
 /**
+<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
  * This command runs the winch motor continuously at a specified speed until the
  * button triggering it is released. This command also makes the drive train
  * motors run because the winch is controlled by the drive train.
+=======
+ * This command will run the winch motor continuously until the button
+ * triggering it is released. This command also runs the drive train.
+>>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
  *
  * pre-condition: This command must be run by a button in OI. The robot must be
  * attached to the rope.
@@ -34,6 +39,10 @@ public class RunWinchContinuous extends Command {
   @Override
   protected void initialize() {
     Robot.getDriveTrain().setMotorValues(motorVal, motorVal);
+<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
+=======
+
+>>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
   }
 
   @Override
@@ -43,7 +52,7 @@ public class RunWinchContinuous extends Command {
 
   @Override
   protected boolean isFinished() {
-    return !Robot.getOI().toggleWinch.get();
+    return false;
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java b/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
deleted file mode 100644 (file)
index 3d49f90..0000000
--- a/src/org/usfirst/frc/team3501/robot/subsystems/Climber.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package org.usfirst.frc.team3501.robot.subsystems;
-
-import org.usfirst.frc.team3501.robot.Constants;
-
-import com.ctre.CANTalon;
-
-import edu.wpi.first.wpilibj.command.Subsystem;
-
-public class Climber extends Subsystem {
-  private static Climber climber;
-  private final CANTalon motor;
-
-  private Climber() {
-    motor = new CANTalon(Constants.Climber.MOTOR);
-  }
-
-  public static Climber getClimber() {
-    if (climber == null) {
-      climber = new Climber();
-    }
-    return climber;
-  }
-
-  public void stop() {
-    setMotorValue(0);
-  }
-
-  public void setMotorValue(final double val) {
-    motor.set(MOTOR);
-
-  }
-}