X-Git-Url: http://challenge-bot.com/repos/?p=3501%2Fstronghold-2016;a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=d34a08e87e56fb457aa2544f9cf0bf3d420b82da;hp=4810e4b92c8abe1e748705f1d487854f821ff610;hb=e4fbab026f4a68a4a238839ae2295c56c1134434;hpb=faabd6f8711d4f582a4fcec6f46bdee1ddd3d1cf

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 4810e4b9..d34a08e8 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -2,8 +2,6 @@ package org.usfirst.frc.team3501.robot;
 
 import edu.wpi.first.wpilibj.DoubleSolenoid;
 import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
-import edu.wpi.first.wpilibj.I2C;
-import edu.wpi.first.wpilibj.I2C.Port;
 
 /**
  * The Constants stores constant values for all subsystems. This includes the
@@ -12,6 +10,9 @@ import edu.wpi.first.wpilibj.I2C.Port;
  */
 
 public class Constants {
+  public final static int PCM_MODULE_A = 9;
+  public final static int PCM_MODULE_B = 10;
+
   public static class OI {
     // Computer Ports
     public final static int LEFT_STICK_PORT = 0;
@@ -53,8 +54,7 @@ public class Constants {
     public final static int ENCODER_RIGHT_A = 9;
     public final static int ENCODER_RIGHT_B = 8;
 
-    public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI)
-        / 256;
+    public static final double INCHES_PER_PULSE = ((3.66 / 5.14) * 6 * Math.PI) / 256;
 
     public static double kp = 0.013, ki = 0.000015, kd = -0.002;
     public static double gp = 0.018, gi = 0.000015, gd = 0;
@@ -95,32 +95,17 @@ public class Constants {
   }
 
   public static class Shooter {
-    public static final int PORT = 0;
-    public static final int PUNCH_FORWARD = 5;
-    public static final int PUNCH_REVERSE = 1;
-    public static final int ANGLE_ADJUSTER_PORT = 0;
-
-    public static final DoubleSolenoid.Value punch = DoubleSolenoid.Value.kForward;
-    public static final DoubleSolenoid.Value retract = DoubleSolenoid.Value.kReverse;
-
-    // Encoder port
-    public static final int ENCODER_PORT_A = 0;
-    public static final int ENCODER_PORT_B = 0;
-    public static final int RIGHT_HOOD_FORWARD = 2;
-    public static final int RIGHT_HOOD_REVERSE = 4;
-    public static final int LEFT_HOOD_FORWARD = 4;
-    public static final int LEFT_HOOD_REVERSE = 2;
-
-    public static final double DEFAULT_SHOOTER_SPEED = 0.5;
-
-    public static final Value open = Value.kReverse;
-    public static final Value closed = Value.kForward;
-
-    public static final Port LIDAR_I2C_PORT = I2C.Port.kMXP;
-
-    public static enum State {
-      RUNNING, STOPPED;
-    }
+    public static final int CATAPULT1_MODULE = PCM_MODULE_A;
+    public static final int CATAPULT1_FORWARD = 0;
+    public static final int CATAPULT1_REVERSE = 1;
+    public static final int CATAPULT2_MODULE = PCM_MODULE_B;
+    public static final int CATAPULT2_FORWARD = 2;
+    public static final int CATAPULT2_REVERSE = 3;// TODO Determine actual
+                                                  // shooter ports
+
+    public static final Value shoot = Value.kForward;
+    public static final Value reset = Value.kReverse;
+    public static final double WAIT_TIME = 2.0; // In seconds
   }
 
   public static class IntakeArm {