implement CameraFeeds into robot.java and add todos

[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 29b1a3cdde2ecea9d847eb48dbf3b215fdae0e71..5be99d560fe62e46627fb3a66978f879d6c2f6ec 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -18,6 +18,7 @@ public class Robot extends IterativeRobot {
   private static UsbCamera usbCamera;
   private static CameraServer cameraServer2;
   private static AxisCamera axisCamera;
+  private static CameraFeeds cameraFeeds;
 
   @Override
   public void robotInit() {
@@ -33,7 +34,11 @@ public class Robot extends IterativeRobot {
 
     cameraServer2 = CameraServer.getInstance();
     axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+<<<<<<< HEAD
 
+=======
+    cameraFeeds = new CameraFeeds();
+>>>>>>> implement CameraFeeds into robot.java and add todos
   }
 
   public static DriveTrain getDriveTrain() {
@@ -67,12 +72,17 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+<<<<<<< HEAD
 
+=======
+    cameraFeeds.init();
+>>>>>>> implement CameraFeeds into robot.java and add todos
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+    cameraFeeds.run();
 
   }
 }