From: Shaina Chen <shaina.sierra@gmail.com>
Date: Fri, 5 Feb 2016 03:56:40 +0000 (-0800)
Subject: change intake and output method names to intakeBall and outputBall
X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=commitdiff_plain;h=4c82a9f5f942b7ceafd488a4135cb9e8f0027043

change intake and output method names to intakeBall and outputBall
---

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index bee2af14..16517904 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -35,15 +35,12 @@ public class IntakeArm extends Subsystem {
    *
    * Must be used in a command that has a timer variable to stop it.
    */
-  public void dropIntake() {
-    intakeRoller.set(0.3);
-  }
 
-  public void intake() {
+  public void intakeBall() {
     intakeRoller.set(Constants.IntakeArm.INTAKE_SPEED);
   }
 
-  public void output() {
+  public void outputBall() {
     intakeRoller.set(Constants.IntakeArm.OUTPUT_SPEED);
   }
 
@@ -102,7 +99,7 @@ public class IntakeArm extends Subsystem {
 
   /***
    * This method gets the angle of the potentiometer on the Intake Arm.
-   * 
+   *
    * @return angle of potentiometer
    */
   public double getIntakePot() {