Fix merging errors with climber subclass

[3501/2017steamworks] / 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 27a1660316c06e8047a1e0fee3f3daf9cad4904d..0c4880ea29d559b6ea96a5393c4b613b04adffb0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -15,6 +15,17 @@ public class Constants {
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
   }
 
+  public static class Shooter {
+    // MOTOR CONTROLLERS
+    public static final int FLY_WHEEL = 0;
+    public static final int INDEX_WHEEL = 0;
+    public final static int TOGGLE_WINCH_PORT = 0;
+
+    public final static int TOGGLE_FLYWHEEL_PORT = 0;
+    public final static int TOGGLE_INDEXWHEEL_PORT = 0;
+
+  }
+
   public static class Shooter {
     // MOTOR CONTROLLERS
     public static final int FLY_WHEEL = 0;
@@ -38,7 +49,10 @@ public class Constants {
   public static class Climber {
     // MOTOR CONTROLLERS
     public static final int MOTOR_VAL = 1;
+  }
 
+  public static class Intake {
+    public static final int INTAKE_ROLLER_PORT = 0;
   }
 
   public static enum Direction {