Fix ports for first test

[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 856db2bb139c5c23b0639783df255486eff9814b..fab91f6eaea1a56a493dfd800ac9dc5e040d4146 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -9,13 +9,13 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 /***
  * The IntakeArm consists of two rollers that are controlled by one motor, with
  * a potentiometer on it.
- *
+ * 
  * 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 {
@@ -25,13 +25,13 @@ public class IntakeArm extends Subsystem {
   public static double moveIntakeArmSpeed = 0;
 
   public IntakeArm() {
-    intakeRoller = new CANTalon(Constants.IntakeArm.ROLLER_PORT);
+    intakeRoller = new CANTalon(Constants.IntakeArm.INTAKE_ROLLER_PORT);
 
-    leftIntake = new DoubleSolenoid(Constants.IntakeArm.LEFT_FORWARD,
-        Constants.IntakeArm.LEFT_REVERSE);
+    leftIntake = new DoubleSolenoid(Constants.IntakeArm.LEFT_INTAKE_MODULE,
+        Constants.IntakeArm.LEFT_INTAKE_FORWARD, Constants.IntakeArm.LEFT_INTAKE_REVERSE);
 
-    rightIntake = new DoubleSolenoid(Constants.IntakeArm.RIGHT_FORWARD,
-        Constants.IntakeArm.RIGHT_REVERSE);
+    rightIntake = new DoubleSolenoid(Constants.IntakeArm.RIGHT_INTAKE_MODULE,
+        Constants.IntakeArm.RIGHT_INTAKE_FORWARD, Constants.IntakeArm.RIGHT_INTAKE_REVERSE);
   }
 
   public void retractPistons() {
@@ -68,7 +68,7 @@ public class IntakeArm extends Subsystem {
    * This method gets you the current voltage of the motor that controls the
    * intake arm roller. 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 voltage goes from [-1,1]. A negative voltage indicates
    *         that the motor is running backwards.
@@ -81,7 +81,7 @@ public class IntakeArm extends Subsystem {
   /***
    * This method checks to see if the presence of the ball inside is true or
    * false.
-   *
+   * 
    * @return Returns whether the ball is inside as true or false
    */
 
@@ -92,10 +92,10 @@ public class IntakeArm extends Subsystem {
   /***
    * This method checks to see if the motors controlling the rollers are
    * currently running.
-   *
+   * 
    * @return Returns whether the motors are currently running, and returns the
    *         state of the condition (true or false).
-   *
+   * 
    */
 
   public boolean areRollersRolling() {