Still trying to figure this out.

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / CameraFeeds.java

diff --git a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
index c6cd477e7b159b61039437f8dd7d7c3cf9603f1d..b5e6feb7e04c14a96d8753ce12508686111e7459 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -2,28 +2,37 @@ package org.usfirst.frc.team3501.robot;
 
 import com.ni.vision.NIVision;
 import com.ni.vision.NIVision.Image;
+
+import edu.wpi.cscore.AxisCamera;
+import edu.wpi.cscore.UsbCamera;
 import edu.wpi.first.wpilibj.CameraServer;
 
 public class CameraFeeds {
   private final int intakeCam;
   private final int climberCam;
   private int curCam;
-  private Image frame;
   private CameraServer server;
+  // private static UsbCamera intakeCam;
+  // private static AxisCamera climberCam;
 
+  @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);
+
+    // server = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    // cameraFeeds = new CameraFeeds();
   }
 
   public void init() {
@@ -32,10 +41,10 @@ public class CameraFeeds {
 
   public void run()
   {
-    if()
+    if(/*add test for toggle*/)
       changeCam(intakeCam);
 
-    if()
+    if(/*add test for toggle*/)
       changeCam(climberCam);
 
     updateCam();
@@ -66,6 +75,6 @@ public class CameraFeeds {
    */
   public void updateCam() {
     NIVision.IMAQdxGrab(curCam, frame, 1);
-    server.setImage(frame);
+    server.setSize(frame);
   }
 }