Fix merging errors with climber subclass

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index bf265a4fea8ced0142b226ae055c79de7b77f902..27a1660316c06e8047a1e0fee3f3daf9cad4904d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -10,8 +10,6 @@ public class Constants {
   public static class OI {
     public final static int LEFT_STICK_PORT = 0;
     public final static int RIGHT_STICK_PORT = 1;
-    public final static int TOGGLE_WINCH_PORT = 0;
-
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;

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 bed5c8ca0bda9efa108d8840a12a0d64432bb885..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
@@ -61,10 +61,6 @@ 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 a713cb2a1a8c7d7bcf1f7bc4192f35bb92babecf..5631290c2b57306098bccc7a0986977206ee059d 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,14 +5,13 @@ 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
+ * <<<<<<< 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.
@@ -39,10 +38,6 @@ public class RunWinchContinuous extends Command {
   @Override
   protected void initialize() {
     Robot.getDriveTrain().setMotorValues(motorVal, motorVal);
-<<<<<<< 1b45bc927675060d057730fc7c7083fb9d813f66
-=======
-
->>>>>>> Delete StopWinch and Climber subsystem, edit javadoc comments
   }
 
   @Override

diff --git a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
index a11eee8d34a8ee2bc9eefc0a83b6d074d3c52d56..42f439b0390bf21e5cdba30920d2eb607c176a8d 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
+++ b/src/org/usfirst/frc/team3501/robot/commands/climber/StopWinch.java
@@ -13,7 +13,7 @@ import edu.wpi.first.wpilibj.command.Command;
 public class StopWinch extends Command {
 
   public StopWinch() {
-    requires(Robot.getClimber());
+    requires(Robot.getDriveTrain());
 
   }
 
@@ -32,7 +32,7 @@ public class StopWinch extends Command {
 
   @Override
   protected void end() {
-    Robot.getClimber().stop();
+    Robot.getDriveTrain().stop();
 
   }