Commiting so I can pull

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

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 1ad62e1f4de0b8a7d9d6c262680d41a0e4b19ea3..c8ef56804895f761c144b995680e0d31968d2628 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -5,7 +5,6 @@ import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
 import edu.wpi.cscore.AxisCamera;
-import edu.wpi.cscore.UsbCamera;
 import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
@@ -15,9 +14,10 @@ public class Robot extends IterativeRobot {
   private static Shooter shooter;
   private static OI oi;
   private static Intake intake;
-  private static UsbCamera usbCamera;
+  // private static UsbCamera usbCamera;
   private static CameraServer cameraServer2;
   private static AxisCamera axisCamera;
+  private static CameraFeeds cameraFeeds;
 
   @Override
   public void robotInit() {
@@ -26,10 +26,22 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
-    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+
     // cameraServer2 = CameraServer;getInstance();
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
+    cameraServer2 = CameraServer.getInstance();
+    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+
+    cameraFeeds = new CameraFeeds();
+
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // CameraServer.getInstance().startAutomaticCapture();
+    // cameraServer2 = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    // cameraFeeds = new CameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -64,6 +76,8 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopInit() {
 
+    cameraFeeds.init();
+
   }
 
   @Override