add limit switch to Arm.java and port to RobotMap.java

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java b/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java
index 7c6e996ed796497ce21a4b9793b85b6c48770c5d..40c09b633d757beb9364ab4896f92d243be806de 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/RobotMap.java
@@ -23,6 +23,7 @@ public class RobotMap {
 
   public static final int ARM_LEFT = 2, ARM_RIGHT = 7;
   public static final double ARM_HIGH_SPEED = 0.5, ARM_LOW_SPEED = 0.5;
+  public static final int ARM_LIMIT_RIGHT = 0;
 
   // Claw
   public static final int SOLENOID_FORWARD = 0, SOLENOID_REVERSE = 1,

diff --git a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
index 8d78c8f48e9e8ccac467c6617c1cc3368cb38eba..ff970400e59f5a7accda1904d647c4d348f5fb05 100644 (file)
--- a/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
+++ b/src/org/usfirst/frc3501/RiceCatRobot/subsystems/Arm.java
@@ -3,14 +3,17 @@ package org.usfirst.frc3501.RiceCatRobot.subsystems;
 import org.usfirst.frc3501.RiceCatRobot.RobotMap;
 
 import edu.wpi.first.wpilibj.CANJaguar;
+import edu.wpi.first.wpilibj.DigitalInput;
 import edu.wpi.first.wpilibj.command.Subsystem;
 
 public class Arm extends Subsystem {
   private CANJaguar left, right;
+  private DigitalInput limitSwitch;
 
   public Arm() {
     left = new CANJaguar(RobotMap.ARM_LEFT);
     right = new CANJaguar(RobotMap.ARM_RIGHT);
+    limitSwitch = new DigitalInput(RobotMap.ARM_LIMIT_RIGHT);
   }
 
   public void initDefaultCommand() {