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 8fcc2615d8cd64a7554fe02c7b1daaec043485be..6b8e42462fd86b3a91df82401f55f21042755260 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -24,6 +24,12 @@ public class Constants {
 
   }
 
+  public static class Shooter {
+    // MOTOR CONTROLLERS
+    public static final int FLY_WHEEL = 0;
+    public static final int INDEX_WHEEL = 0;
+  }
+
   public static class DriveTrain {
     // MOTOR CONTROLLERS
     public static final int FRONT_LEFT = 1;

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 5631290c2b57306098bccc7a0986977206ee059d..a3e6f3f2d06afdcb881cf1b69cc2eaac152b4ad1 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,13 +5,21 @@ 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
+ * <<<<<<< HEAD <<<<<<< 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 >>>>>>> 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.

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 2c99adc7bd4aa2185aa87fab3fb31b64546bf35b..45ae19efee0860cb2d32beb995cdedc8e1e96990 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,11 +13,9 @@ import edu.wpi.first.wpilibj.command.Command;
 public class StopWinch extends Command {
 
   public StopWinch() {
-<<<<<<< HEAD
+
     requires(Robot.getDriveTrain());
-=======
     requires(Robot.getClimber());
->>>>>>> add Motor value in constants
 
   }
 

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);
-
-  }
-}