From c6008874c7c1e1daa5adbda8a048ef565b4b7244 Mon Sep 17 00:00:00 2001 From: Meryem Esa Date: Thu, 2 Feb 2017 20:17:34 -0800 Subject: [PATCH] fix bugs related to Config --- src/org/usfirst/frc/team3501/robot/CameraFeeds.java | 7 ++++--- src/org/usfirst/frc/team3501/robot/Constants.java | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java index c354594..34ecb42 100755 --- 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 0c3fb74..d49e2c4 100644 --- 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; + } } -- 2.30.2