fix ToggleCameraFeed command

[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 b0e32a72bff3b55fa6b898bcd2400821e2c6dd06..d467182080a4343d91d6fd6bcefd22ca8310659e 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -26,15 +26,15 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
 
+    cameraFeeds = CameraFeeds.getCameraFeeds();
+
     // 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();
+    // cameraServer2 = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
     // usbCamera = CameraServer.getInstance().startAutomaticCapture();
     // CameraServer.getInstance().startAutomaticCapture();
@@ -53,6 +53,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -77,8 +81,6 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopInit() {
 
-    cameraFeeds.init();
-
   }
 
   @Override