Fixed conflict

[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 9a80556574c8125f0f88d0e331afacda0a2e2b2c..197f76ea13c21db2385dd83c22b8cd82138b5a01 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -16,7 +16,6 @@ public class Constants {
     public final static int RIGHT_STICK_PORT = 1;
 
     // Need to fill in the port numbers of the following buttons
-    public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 4;
     public final static int RUN_INDEXWHEEL_PORT = 1;
     public final static int REVERSE_INDEXWHEEL_PORT = 2;
@@ -25,6 +24,12 @@ public class Constants {
     public final static int REVERSE_INTAKE_PORT = 4;
     public static final int INCREASE_SHOOTER_SPEED_PORT = 6;
     public static final int DECREASE_SHOOTER_SPEED_PORT = 2;
+
+    public static final int CHANGE_CAMERA_VIEW = 6;
+
+    public static final int BRAKE_CANTALONS_PORT = 5;
+    public static final int COAST_CANTALONS_PORT = 3;
+
   }
 
   public static class Shooter {
@@ -35,8 +40,16 @@ public class Constants {
 
     public final static int HALL_EFFECT_PORT = 9;
 
+<<<<<<< HEAD
+    public final static int TOGGLE_INDEXER = 8;
+
+    public static final int MODULE_NUMBER = 10, PISTON_FORWARD = 4,
+        PISTON_REVERSE = 5;
+
+=======
     public static final int PISTON_MODULE = 10, PISTON_FORWARD = 0,
         PISTON_REVERSE = 1;
+>>>>>>> Add code to alternate pistons in runIndexWheelContinuous
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
     public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
   }
@@ -44,11 +57,13 @@ public class Constants {
   public static class DriveTrain {
     // GEARS
     public static final int PISTON_MODULE = 10, LEFT_GEAR_PISTON_FORWARD = 0,
-        LEFT_GEAR_PISTON_REVERSE = 1, RIGHT_GEAR_PISTON_FORWARD = 2,
-        RIGHT_GEAR_PISTON_REVERSE = 3;
+        LEFT_GEAR_PISTON_REVERSE = 1, RIGHT_GEAR_PISTON_FORWARD = 3,
+        RIGHT_GEAR_PISTON_REVERSE = 2;
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
     public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
 
+    public final static int TOGGLE_DRIVE_PISTON = 7;
+
     // MOTOR CONTROLLERS
     public static final int FRONT_LEFT = 1;
     public static final int FRONT_RIGHT = 3;