add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 0dffb86f11390784cab797ae7c16b4afeb949ca2..f5f4e4a0c0fb831f6a63b76200b74c6534a7b9ba 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -38,6 +38,7 @@ public class IntakeArm extends Subsystem {
    * is from [-1, 1]. A negative speed changes the direction of the motors,
    * making it run backwards.
    *
+<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
    * @param speed
    *          The speed of the motors that control the rollers. The range of
    *          these motors go from [-1,1]. A negative speed changes the
@@ -58,6 +59,12 @@ public class IntakeArm extends Subsystem {
    *          these motors go from [-1,1]. A negative speed changes the
    *          direction of the motors.
    *          >>>>>>> reset to unix format
+=======
+   * @param speed
+   *          The speed of the motors that control the rollers. The range of
+   *          these motors go from [-1,1]. A negative speed changes the
+   *          direction of the motors, making it run backwards.
+>>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
    */
 
   public void setRollerSpeed(double speed) {
@@ -65,6 +72,7 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
+<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
    * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
    * This method gets you the current speed of the motor that controls the
    * motor. The range of speed is from [-1,1]. A negative speed changes the
@@ -77,6 +85,15 @@ public class IntakeArm extends Subsystem {
    *
    * @return
    *         >>>>>>> reset to unix format
+=======
+   * This method gets you the current speed of the motor that controls the
+   * motor. The range of speed is from [-1,1]. A negative speed changes the
+   * direction of the motor, making it run backwards.
+   *
+   * @return Returns the speed of the motor that controls the roller. The range
+   *         of the motor goes from [-1,1]. A negative speed changes the
+   *         direction of the motor, making it go backwards.
+>>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
    */
 
   public double getRollerSpeed() {
@@ -84,6 +101,7 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
+<<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
    * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
    * This method checks to see if the motors controlling the rollers are
    * currently working.
@@ -103,6 +121,13 @@ public class IntakeArm extends Subsystem {
    *
    * @return
    *         >>>>>>> reset to unix format
+=======
+   * This method checks to see if the motors controlling the rollers are
+   * currently working.
+   *
+   * @return Returns whether the motors are currently running, and returns the
+   *         state of the condition (true or false).
+>>>>>>> add 3 method stubs- setRollerSpeeds, getRollerSpeeds, and areRollersRolling
    */
 
   public boolean areRollersRolling() {