From add57fee19b382f04405cbcbc2f2fe5f2207a7d4 Mon Sep 17 00:00:00 2001
From: Yamini Adusumelli <ayamini2000@gmail.com>
Date: Sat, 30 Jan 2016 13:04:10 -0800
Subject: [PATCH] add class level comment and change speed to voltage

---
 .../team3501/robot/subsystems/IntakeArm.java  | 46 ++++++++++++++++---
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index f5f4e4a0..400bed11 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -5,6 +5,20 @@ import org.usfirst.frc.team3501.robot.Constants;
 import edu.wpi.first.wpilibj.CANTalon;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
+/***
+ * The IntakeArm consists of two rollers that are controlled by one motor. The
+ * class is deployed using a command that accelerates the robot forward and
+ * gravity pushes the arm down. After the IntakeArm is pushed down by gravity,
+ * the arm remains stationary for the rest of the match.
+ *
+ * The motor controls the rollers, making them roll forwards and backwards.
+ * The Intake rollers are on the back of the robot. As the rollers run, they
+ * intake the ball.
+ *
+ * @author superuser
+ *
+ */
+
 public class IntakeArm extends Subsystem {
   private CANTalon intake;
   private CANTalon chevalDeFriseHand;
@@ -34,10 +48,10 @@ public class IntakeArm extends Subsystem {
   }
 
   /***
-   * This method allows you to set the speed of the motor. The range of speed
-   * is from [-1, 1]. A negative speed changes the direction of the motors,
-   * making it run backwards.
+   * This method allows you to set the voltage of the motor. The range of
+   * voltage is from [-1, 1]. A negative voltage makes the motor run backwards.
    *
+<<<<<<< e3056e0d68d3b4150b81db56c6685c399cb9c37a
 <<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
    * @param speed
    *          The speed of the motors that control the rollers. The range of
@@ -65,13 +79,21 @@ public class IntakeArm extends Subsystem {
    *          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
+=======
+   * @param voltage
+   *          The voltage of the motors that control the rollers. The range of
+   *          these motors go from [-1,1]. A negative voltage makes the motor
+   *          run
+   *          backwards.
+>>>>>>> add class level comment and change speed to voltage
    */
 
-  public void setRollerSpeed(double speed) {
+  public void setRollerVoltage(double voltage) {
 
   }
 
   /***
+<<<<<<< e3056e0d68d3b4150b81db56c6685c399cb9c37a
 <<<<<<< cefeac7a7bb7df62af5c880e13eb37c14125a7cb
    * <<<<<<< bd5dc4363add71a17f95409115dec96b83146549
    * This method gets you the current speed of the motor that controls the
@@ -94,9 +116,21 @@ public class IntakeArm extends Subsystem {
    *         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
+=======
+   * This method gets you the current voltage of the motor that controls the
+   * motor. The range of voltage is from [-1,1]. A negative voltage makes the
+   * motor
+   * run backwards.
+   *
+   * @return Returns the voltage of the motor that controls the roller. The
+   *         range
+   *         of the motor goes from [-1,1]. A negative voltage indicates that
+   *         the
+   *         motor is running backwards.
+>>>>>>> add class level comment and change speed to voltage
    */
 
-  public double getRollerSpeed() {
+  public double getRollerVoltage() {
     return 0;
   }
 
@@ -123,7 +157,7 @@ public class IntakeArm extends Subsystem {
    *         >>>>>>> reset to unix format
 =======
    * This method checks to see if the motors controlling the rollers are
-   * currently working.
+   * currently running.
    *
    * @return Returns whether the motors are currently running, and returns the
    *         state of the condition (true or false).
-- 
2.30.2