X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=be58f085bc576b4e902aa884a02877df0ce9611d;hb=refs%2Fheads%2Fharel%2Fcompetition-hotfixes;hp=ee2e03da66e5fbf8ff3ab8926d64e57eaec685b8;hpb=d9475515518368b284e5c5fb4e2463c8c082f62d;p=3501%2Fstronghold-2016

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index ee2e03da..be58f085 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -19,6 +19,7 @@ public class Robot extends IterativeRobot {
   public static Shooter shooter;
   public static IntakeArm intakeArm;
   public static Photogate photogate;
+  public static CameraFeeds cameraFeeds;
 
   // Sendable Choosers send a drop down menu to the Smart Dashboard.
   private static SendableChooser defenseChooser;
@@ -31,6 +32,7 @@ public class Robot extends IterativeRobot {
     shooter = new Shooter();
     intakeArm = new IntakeArm();
     photogate = new Photogate();
+    cameraFeeds = new CameraFeeds();
 
     oi = new OI();
 
@@ -83,15 +85,18 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopInit() {
     // if intake is front, switch back to shooter as front
+    // this is done on purpose!
     if (choseIntakeIsFront)
       driveTrain.toggleFlipped();
 
+    cameraFeeds.init();
     Scheduler.getInstance().add(new SetLowGear());
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+    cameraFeeds.run();
   }
 
 }