Remove pointless code and add print commands.

[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 b0e32a72bff3b55fa6b898bcd2400821e2c6dd06..655b3427585bed2d4d8b09be073896388a956d8a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -4,8 +4,6 @@ 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;
 
@@ -15,8 +13,8 @@ public class Robot extends IterativeRobot {
   private static OI oi;
   private static Intake intake;
   // private static UsbCamera usbCamera;
-  private static CameraServer cameraServer2;
-  private static AxisCamera axisCamera;
+  // private static CameraServer cameraServer2;
+  // private static AxisCamera axisCamera;
   private static CameraFeeds cameraFeeds;
 
   @Override
@@ -26,22 +24,7 @@ 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();
-
-    // usbCamera = CameraServer.getInstance().startAutomaticCapture();
-    // CameraServer.getInstance().startAutomaticCapture();
-    // cameraServer2 = CameraServer.getInstance();
-    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
-
-    // cameraFeeds = new CameraFeeds();
+    cameraFeeds = CameraFeeds.getCameraFeeds();
 
   }
 
@@ -53,6 +36,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -76,14 +63,10 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-
-    cameraFeeds.init();
-
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }