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 bbd22202937d54a5253dbe5876f87d641e465ec0..0c4880ea29d559b6ea96a5393c4b613b04adffb0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -11,7 +11,6 @@ public class Constants {
     public final static int LEFT_STICK_PORT = 0;
     public final static int RIGHT_STICK_PORT = 1;
     public final static int TOGGLE_WINCH_PORT = 0;
-
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
   }
@@ -20,7 +19,17 @@ public class Constants {
     // 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;
+    public static final int INDEX_WHEEL = 0;
   }
 
   public static class DriveTrain {
@@ -37,6 +46,15 @@ public class Constants {
     public static final int ENCODER_RIGHT_B = 3;
   }
 
+  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 {
     LEFT, RIGHT, DOWN, UP, FORWARD, BACKWARD;
   }