fix bugs related to Config

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index c354594529961f38b6b252a003885bc4f740c830..34ecb42661f5a49dda7d11d91b38c1cc7295f415 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -11,19 +11,20 @@ public class CameraFeeds {
   private Image frame;
   private CameraServer server;
 
+  @SuppressWarnings("deprecation")
   public CameraFeeds() {
     // Get camera ids by supplying camera name ex 'cam0', found on roborio web
     // interface
-    intakeCam = NIVision.IMAQdxOpenCamera(Config.CameraFeeds.camNameCenter,
+    intakeCam = NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameCenter,
         NIVision.IMAQdxCameraControlMode.CameraControlModeController);
-    climberCam = NIVision.IMAQdxOpenCamera(Config.CameraFeeds.camNameRight,
+    climberCam = NIVision.IMAQdxOpenCamera(Constants.CameraFeeds.camNameRight,
         NIVision.IMAQdxCameraControlMode.CameraControlModeController);
     curCam = intakeCam;
     // Img that will contain camera img
     frame = NIVision.imaqCreateImage(NIVision.ImageType.IMAGE_RGB, 0);
     // Server that we'll give the img to
     server = CameraServer.getInstance();
-    server.setQuality(Config.CameraFeeds.imgQuality);
+    server.setSize(Constants.CameraFeeds.imgQuality);
   }
 
   public void init() {

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 0c3fb74cc339ae3c44dc77c0fca61aad77e2770f..d49e2c494cc7284351a9eebfdd1bab5c91c2eccd 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -51,4 +51,13 @@ public class Constants {
   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;
+  }
 }