Move code to more updated branch.

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index 5f4715cb6ac2e9b1fcb8a7e1bef891cc95163eae..529ddca86e2bef38d9297e523d030ae9c9edb7a0 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -4,6 +4,9 @@ import org.usfirst.frc.team3501.robot.subsystems.DriveTrain;
 import org.usfirst.frc.team3501.robot.subsystems.Intake;
 import org.usfirst.frc.team3501.robot.subsystems.Shooter;
 
+import edu.wpi.cscore.AxisCamera;
+import edu.wpi.cscore.UsbCamera;
+import edu.wpi.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 
@@ -12,6 +15,9 @@ public class Robot extends IterativeRobot {
   private static Shooter shooter;
   private static OI oi;
   private static Intake intake;
+  private static UsbCamera usbCamera;
+  private static CameraServer cameraServer2;
+  private static AxisCamera axisCamera;
 
   @Override
   public void robotInit() {
@@ -19,6 +25,9 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
+    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // cameraServer2 = CameraServer;getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
   }
 
   public static DriveTrain getDriveTrain() {