X-Git-Url: http://challenge-bot.com/repos/?a=blobdiff_plain;f=src%2Forg%2Fusfirst%2Ffrc%2Fteam3501%2Frobot%2FRobot.java;h=008369aecf8f9838b9cf88079d13e60aba90dfae;hb=50a075d836a8ec08c70ae448f7a41bfa75f988fd;hp=db5e469ff3be6a031e0efbfc571c6a9a13727cfd;hpb=538715b1e58e3217a6411fab2471716700350b51;p=3501%2F2017steamworks

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java b/src/org/usfirst/frc/team3501/robot/Robot.java
index db5e469..008369a 100644
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,10 +1,11 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.commands.driving.DriveDistance;
 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.first.wpilibj.CameraServer;
 import edu.wpi.first.wpilibj.IterativeRobot;
 import edu.wpi.first.wpilibj.command.Scheduler;
 
@@ -13,6 +14,10 @@ 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;
+  private static CameraFeeds cameraFeeds;
 
   @Override
   public void robotInit() {
@@ -20,6 +25,23 @@ 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");
+
+    cameraServer2 = CameraServer.getInstance();
+    axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+
+    cameraFeeds = new CameraFeeds();
+
+    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // CameraServer.getInstance().startAutomaticCapture();
+    // cameraServer2 = CameraServer.getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+    // cameraFeeds = new CameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -42,11 +64,7 @@ public class Robot extends IterativeRobot {
   // both set to high gear
   @Override
   public void autonomousInit() {
-    Scheduler.getInstance().add(new DriveDistance(25, 10));
-    if (driveTrain.getLeftGearPistonValue() != driveTrain
-        .getRightGearPistonValue()) {
-      driveTrain.setHighGear();
-    }
+    driveTrain.setHighGear();
   }
 
   @Override
@@ -57,12 +75,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();
 
   }
 }