reset to unix format

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / subsystems / IntakeArm.java

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 153743e0878d833814f1d8b90e3356c9ecec4cd2..0dffb86f11390784cab797ae7c16b4afeb949ca2 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -6,7 +6,6 @@ import edu.wpi.first.wpilibj.CANTalon;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class IntakeArm extends Subsystem {
-
   private CANTalon intake;
   private CANTalon chevalDeFriseHand;
 
@@ -43,6 +42,22 @@ public class IntakeArm extends Subsystem {
    *          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.
+   *          =======
+   *          public IntakeArm() {
+   * 
+   *          }
+   * 
+   *          /***
+   *          This method allows you to set the speed of the motor(s). The range
+   *          of speed
+   *          is from [-1, 1]. A negative speed changes the direction of the
+   *          motors.
+   *
+   * @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.
+   *          >>>>>>> reset to unix format
    */
 
   public void setRollerSpeed(double speed) {
@@ -50,6 +65,7 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
+   * <<<<<<< 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
    * direction of the motor, making it run backwards.
@@ -57,6 +73,10 @@ public class IntakeArm extends Subsystem {
    * @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.
+   *         =======
+   *
+   * @return
+   *         >>>>>>> reset to unix format
    */
 
   public double getRollerSpeed() {
@@ -64,11 +84,25 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
+   * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
    * 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).
+   *         =======
+   *
+   * @return
+   */
+
+  public boolean isBallInside() {
+    return true;
+  }
+
+  /***
+   *
+   * @return
+   *         >>>>>>> reset to unix format
    */
 
   public boolean areRollersRolling() {