X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FConstants.java;h=432b068d8cf24fbcd50302a505c09356527d77ea;hb=0c746368c4dd945e3f1095011b12b9783d4bc05b;hp=0923d1830e2c8b02891b68c2551508c28b5d4f51;hpb=f388cdf4d1245a47fd37a95024075f24b7d25c04;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 0923d18..432b068 100644
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -17,7 +17,11 @@ public class Constants {
     public final static int TOGGLE_WINCH_PORT = 0;
     public final static int TOGGLE_FLYWHEEL_PORT = 0;
     public final static int TOGGLE_INDEXWHEEL_PORT = 0;
+<<<<<<< HEAD
     public final static int TOGGLE_GEAR_PORT = 0;
+=======
+	public static final int TOGGLE_CAMERA_FEEDS = 7;
+>>>>>>> Made final int for toggling camera feeds equal to 7(button 7)
   }
 
   public static class Shooter {
@@ -32,8 +36,9 @@ public class Constants {
 
   public static class DriveTrain {
     // GEARS
-    public static final int MODULE_NUMBER = 10, LEFT_FORWARD = 6,
-        LEFT_REVERSE = 5, RIGHT_FORWARD = 0, RIGHT_REVERSE = 1;
+    public static final int MODULE_NUMBER = 10, LEFT_GEAR_PISTON_FORWARD = 6,
+        LEFT_GEAR_PISTON_REVERSE = 5, RIGHT_GEAR_PISTON_FORWARD = 0,
+        RIGHT_GEAR_PISTON_REVERSE = 1;
     public static final Value HIGH_GEAR = DoubleSolenoid.Value.kForward;
     public static final Value LOW_GEAR = DoubleSolenoid.Value.kReverse;
 
@@ -52,16 +57,21 @@ public class Constants {
     public static final SPI.Port GYRO_PORT = SPI.Port.kOnboardCS0;
   }
 
-  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;
   }
+
+  public class CameraFeeds {
+    public static final int btCamCenter = 1;
+    public static final int btCamRight = 2;
+
+    public static final String camNameCenter = "cam0";
+    public static final String camNameRight = "cam1";
+    public static final int imgQuality = 60;
+  }
 }