Fix merge conflicts.

[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..e7c5e5b1928398f30bc31fd42c0c5bc43f87634f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -25,16 +25,18 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
+    cameraServer2 = CameraServer.getInstance();
+    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    cameraFeeds = new CameraFeeds();
+    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();
@@ -42,7 +44,6 @@ public class Robot extends IterativeRobot {
     // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
 
     // cameraFeeds = new CameraFeeds();
-
   }
 
   public static DriveTrain getDriveTrain() {
@@ -53,6 +54,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -76,14 +81,10 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-
-    cameraFeeds.init();
-
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }