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 529ddca86e2bef38d9297e523d030ae9c9edb7a0..a5f15fb788558ec303e74196b4eb3fc64c8c2c93 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() {
@@ -26,8 +27,9 @@ public class Robot extends IterativeRobot {
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
     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();
   }
 
   public static DriveTrain getDriveTrain() {
@@ -58,11 +60,13 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+    cameraFeeds.init();
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+    cameraFeeds.run();
 
   }
 }