reset to unix format

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
index f9c91d9b60007d07eb9cbed8c3e3f1d2af4cf155..38d0133b97010eccfa1d2bf262ae84d57535347a 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java
@@ -1,81 +1,81 @@
-package org.usfirst.frc.team3501.robot.subsystems;\r
-\r
-import org.usfirst.frc.team3501.robot.Constants;\r
-\r
-import edu.wpi.first.wpilibj.AnalogPotentiometer;\r
-import edu.wpi.first.wpilibj.CANTalon;\r
-import edu.wpi.first.wpilibj.command.Subsystem;\r
-\r
-public class DefenseArm extends Subsystem {\r
-  // Defense arm related objects\r
-  private AnalogPotentiometer defenseArmPotentiometer;\r
-  private AnalogPotentiometer defenseHandPotentiometer;\r
-  private CANTalon defenseArm;\r
-  private CANTalon defenseHand;\r
-  private double hookHeight;\r
-  private double footHeight;\r
-\r
-  private double[] potAngles = { 0, 45, 90 };\r
-\r
-  // array;\r
-\r
-  public DefenseArm() {\r
-    defenseArmPotentiometer = new AnalogPotentiometer(\r
-        Constants.DefenseArm.ARM_CHANNEL,\r
-        Constants.DefenseArm.FULL_RANGE,\r
-        Constants.DefenseArm.OFFSET);\r
-\r
-    defenseArm = new CANTalon(Constants.DefenseArm.ARM_PORT);\r
-    defenseHand = new CANTalon(Constants.DefenseArm.HAND_PORT);\r
-  }\r
-\r
-  public double getArmPotAngle() {\r
-    return defenseArmPotentiometer.get();\r
-  }\r
-\r
-  public double getHandPotAngle() {\r
-    return defenseHandPotentiometer.get();\r
-  }\r
-\r
-  /***\r
-   * This method sets the voltage of the arm motor. The range is from [-1,1]. A\r
-   * negative voltage makes the direction of the motor go backwards.\r
-   *\r
-   * @param speed\r
-   *          The voltage that you set the motor at. The range of the voltage of\r
-   *          the arm motor is from [-1,1]. A\r
-   *          negative voltage makes the direction of the motor go backwards.\r
-   */\r
-\r
-  public void setArmSpeed(double speed) {\r
-    if (speed > 1)\r
-      speed = 1;\r
-    else if (speed < -1)\r
-      speed = -1;\r
-\r
-    defenseArm.set(speed);\r
-  }\r
-\r
-  /***\r
-   * This method sets the voltage of the hand motor. The range is from [-1,1]. A\r
-   * negative voltage makes the direction of the motor go backwards.\r
-   *\r
-   * @param speed\r
-   *          The voltage that you set the motor at. The range of the voltage of\r
-   *          the hand motor is from [-1,1]. A\r
-   *          negative voltage makes the direction of the motor go backwards.\r
-   */\r
-\r
-  public void setHandSpeed(double speed) {\r
-    if (speed > 1)\r
-      speed = 1;\r
-    else if (speed < -1)\r
-      speed = -1;\r
-\r
-    defenseHand.set(speed);\r
-  }\r
-\r
-  @Override\r
-  protected void initDefaultCommand() {\r
-  }\r
-}\r
+package org.usfirst.frc.team3501.robot.subsystems;
+
+import org.usfirst.frc.team3501.robot.Constants;
+
+import edu.wpi.first.wpilibj.AnalogPotentiometer;
+import edu.wpi.first.wpilibj.CANTalon;
+import edu.wpi.first.wpilibj.command.Subsystem;
+
+public class DefenseArm extends Subsystem {
+  // Defense arm related objects
+  private AnalogPotentiometer defenseArmPotentiometer;
+  private AnalogPotentiometer defenseHandPotentiometer;
+  private CANTalon defenseArm;
+  private CANTalon defenseHand;
+  private double hookHeight;
+  private double footHeight;
+
+  private double[] potAngles = { 0, 45, 90 };
+
+  // array;
+
+  public DefenseArm() {
+    defenseArmPotentiometer = new AnalogPotentiometer(
+        Constants.DefenseArm.ARM_CHANNEL,
+        Constants.DefenseArm.FULL_RANGE,
+        Constants.DefenseArm.OFFSET);
+
+    defenseArm = new CANTalon(Constants.DefenseArm.ARM_PORT);
+    defenseHand = new CANTalon(Constants.DefenseArm.HAND_PORT);
+  }
+
+  public double getArmPotAngle() {
+    return defenseArmPotentiometer.get();
+  }
+
+  public double getHandPotAngle() {
+    return defenseHandPotentiometer.get();
+  }
+
+  /***
+   * This method sets the voltage of the arm motor. The range is from [-1,1]. A
+   * negative voltage makes the direction of the motor go backwards.
+   *
+   * @param speed
+   *          The voltage that you set the motor at. The range of the voltage of
+   *          the arm motor is from [-1,1]. A
+   *          negative voltage makes the direction of the motor go backwards.
+   */
+
+  public void setArmSpeed(double speed) {
+    if (speed > 1)
+      speed = 1;
+    else if (speed < -1)
+      speed = -1;
+
+    defenseArm.set(speed);
+  }
+
+  /***
+   * This method sets the voltage of the hand motor. The range is from [-1,1]. A
+   * negative voltage makes the direction of the motor go backwards.
+   *
+   * @param speed
+   *          The voltage that you set the motor at. The range of the voltage of
+   *          the hand motor is from [-1,1]. A
+   *          negative voltage makes the direction of the motor go backwards.
+   */
+
+  public void setHandSpeed(double speed) {
+    if (speed > 1)
+      speed = 1;
+    else if (speed < -1)
+      speed = -1;
+
+    defenseHand.set(speed);
+  }
+
+  @Override
+  protected void initDefaultCommand() {
+  }
+}

diff --git a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
index 18a2689f6ba272f088eb8f0e424195fab1c7b94b..630ad151c270419e10c60970e1e504c94c23ea92 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
+++ b/src/org/usfirst/frc/team3501/robot/subsystems/IntakeArm.java
@@ -37,7 +37,7 @@ public class IntakeArm extends Subsystem {
   /***
    * 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