X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2Fsubsystems%2FIntakeArm.java;h=856db2bb139c5c23b0639783df255486eff9814b;hb=2781cca0354e26f8c5a6150d6b5179d300d479e1;hp=0dffb86f11390784cab797ae7c16b4afeb949ca2;hpb=8e57685f4bacaa8353202309b93bd8f7802e0631;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 0dffb86f..856db2bb 100755
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -3,96 +3,86 @@ package org.usfirst.frc.team3501.robot.subsystems;
 import org.usfirst.frc.team3501.robot.Constants;
 
 import edu.wpi.first.wpilibj.CANTalon;
+import edu.wpi.first.wpilibj.DoubleSolenoid;
 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 {
-  private CANTalon intake;
-  private CANTalon chevalDeFriseHand;
+
+  private CANTalon intakeRoller;
+  private DoubleSolenoid leftIntake, rightIntake;
+  public static double moveIntakeArmSpeed = 0;
 
   public IntakeArm() {
-    intake = new CANTalon(Constants.IntakeArm.PORT);
-    chevalDeFriseHand = new CANTalon(Constants.IntakeArm.CHEVAL_DE_FRISE_HAND_PORT);
-  }
+    intakeRoller = new CANTalon(Constants.IntakeArm.ROLLER_PORT);
 
-  /*
-   * Intake only moves once at the beginning of the match. It lowers at the
-   * beginning of the match and is held there by mechanical stops until the end
-   * of the match.
-   *
-   * Must be used in a command that has a timer variable to stop it.
-   */
-  public void dropIntake() {
-    intake.set(0.3);
+    leftIntake = new DoubleSolenoid(Constants.IntakeArm.LEFT_FORWARD,
+        Constants.IntakeArm.LEFT_REVERSE);
+
+    rightIntake = new DoubleSolenoid(Constants.IntakeArm.RIGHT_FORWARD,
+        Constants.IntakeArm.RIGHT_REVERSE);
   }
 
-  public void intake() {
-    intake.set(Constants.IntakeArm.INTAKE_SPEED);
+  public void retractPistons() {
+    leftIntake.set(Constants.IntakeArm.RETRACT);
+    rightIntake.set(Constants.IntakeArm.RETRACT);
   }
 
-  public void output() {
-    intake.set(Constants.IntakeArm.OUTPUT_SPEED);
+  public void extendPistons() {
+    leftIntake.set(Constants.IntakeArm.EXTEND);
+    rightIntake.set(Constants.IntakeArm.EXTEND);
   }
 
   /***
-   * 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.
-   *
-   * @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.
-   *          =======
-   *          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
+   * This method sets the voltage of the motor to intake the ball. The voltage
+   * values are constants in Constants class
    */
+  public void intakeBall() {
+    intakeRoller.set(Constants.IntakeArm.INTAKE_SPEED);
+  }
 
-  public void setRollerSpeed(double speed) {
+  /***
+   * This method sets the voltage of the motor to output the ball. The voltage
+   * values are constants in Constants class
+   */
+  public void outputBall() {
+    intakeRoller.set(Constants.IntakeArm.OUTPUT_SPEED);
+  }
 
+  public void stopRollers() {
+    intakeRoller.set(0);
   }
 
   /***
-   * <<<<<<< 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.
-   *
-   * @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.
-   *         =======
+   * 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
-   *         >>>>>>> reset to unix format
+   * @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.
    */
 
-  public double getRollerSpeed() {
-    return 0;
+  public double getRollerVoltage() {
+    return intakeRoller.get();
   }
 
   /***
-   * <<<<<<< 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).
-   *         =======
+   * This method checks to see if the presence of the ball inside is true or
+   * false.
    *
-   * @return
+   * @return Returns whether the ball is inside as true or false
    */
 
   public boolean isBallInside() {
@@ -100,12 +90,17 @@ 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).
    *
-   * @return
-   *         >>>>>>> reset to unix format
    */
 
   public boolean areRollersRolling() {
+    if (Math.abs(getRollerVoltage()) < 0.02)
+      return false;
     return true;
   }