add second defenseArmMotor related constants
authorYamini Adusumelli <ayamini2000@gmail.com>
Fri, 29 Jan 2016 03:12:55 +0000 (19:12 -0800)
committerShaina Chen <shaina.sierra@gmail.com>
Fri, 5 Feb 2016 04:20:37 +0000 (20:20 -0800)
src/org/usfirst/frc/team3501/robot/Constants.java
src/org/usfirst/frc/team3501/robot/subsystems/DefenseArm.java

index a4fe655cd460b0c183545c29c57e8062c78dfa28..d6fadc17dd8a1768315072582ab65412d56c6ec5 100644 (file)
@@ -70,6 +70,14 @@ public class Constants {
     public static final double OUTPUT_SPEED = -0.5;
   }
 
+  public static class DefenseArm {
+    // Potentiometer related ports
+    public static final int ARM_CHANNEL = 0;
+    public static final int ARM_PORT = 0;
+    public static final int HAND_CHANNEL = 1;
+    public static final int HAND_PORT = 1;
+  }
+
   public static enum Direction {
     LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD;
   }
@@ -77,10 +85,4 @@ public class Constants {
   public enum Defense {
     PORTCULLIS, SALLY_PORT, ROUGH_TERRAIN, LOW_BAR, CHEVAL_DE_FRISE, DRAWBRIDGE, MOAT, ROCK_WALL, RAMPART;
   }
-
-  public static class DefenseArm {
-    // Potentiometer related ports
-    public static final int CHANNEL = 0;
-    public static final int PORT = 0;
-  }
 }
index e59481d709d8518fa508f0f87408a9bfef0d9652..b9fd25bc275f9127070a5904aa2f1c5fdb5af827 100755 (executable)
@@ -9,6 +9,7 @@ import edu.wpi.first.wpilibj.command.Subsystem;
 public class DefenseArm extends Subsystem {\r
   // Defense arm related objects\r
   public AnalogPotentiometer defenseArmPotentiometer;\r
+  public AnalogPotentiometer defenseHandPotentiometer;\r
   public CANTalon defenseArmMotor;\r
   public CANTalon defenseHandMotor;\r
 \r