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 34ecb42661f5a49dda7d11d91b38c1cc7295f415..b5e6feb7e04c14a96d8753ce12508686111e7459 100755 (executable)
--- a/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
+++ b/src/org/usfirst/frc/team3501/robot/CameraFeeds.java
@@ -2,14 +2,18 @@ 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() {
@@ -25,6 +29,10 @@ public class CameraFeeds {
     // Server that we'll give the img to
     server = CameraServer.getInstance();
     server.setSize(Constants.CameraFeeds.imgQuality);
+
+    // server = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    // cameraFeeds = new CameraFeeds();
   }
 
   public void init() {
@@ -67,6 +75,6 @@ public class CameraFeeds {
    */
   public void updateCam() {
     NIVision.IMAQdxGrab(curCam, frame, 1);
-    server.setImage(frame);
+    server.setSize(frame);
   }
 }