Resurrect dead commits deletd by merge conflict with hersh

[3501/stronghold-2016] / src / org / usfirst / frc / team3501 / robot / Constants.java

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 9c666016ae1b768cafebd34e3512bb890830bb6b..8176e5df0cc3d123717a021a70a22a0dfbaff04b 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -93,8 +93,8 @@ public class Constants {
 
   public static class Shooter {
     public static final int PORT = 0;
-    public static final int PUNCH_FORWARD_PORT = 0;
-    public static final int PUNCH_REVERSE_PORT = 1;
+    public static final int PUNCH_FORWARD = 0;
+    public static final int PUNCH_REVERSE = 1;
     public static final int ANGLE_ADJUSTER_PORT = 0;
 
     public static final DoubleSolenoid.Value punch = DoubleSolenoid.Value.kForward;
@@ -103,6 +103,11 @@ public class Constants {
     // Encoder port
     public static final int ENCODER_PORT_A = 0;
     public static final int ENCODER_PORT_B = 0;
+    public static final int HOOD_FORWARD = 2;
+    public static final int HOOD_REVERSE = 3;
+
+    public static final Value open = Value.kForward;
+    public static final Value closed = Value.kReverse;
 
     public static enum State {
       RUNNING, STOPPED;