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 fe515f2af33bd6e9e03a913a68f82bf0d3cf7cc7..655b3427585bed2d4d8b09be073896388a956d8a 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -12,6 +12,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() {
@@ -19,6 +23,9 @@ public class Robot extends IterativeRobot {
     oi = OI.getOI();
     shooter = Shooter.getShooter();
     intake = Intake.getIntake();
+
+    cameraFeeds = CameraFeeds.getCameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -29,6 +36,10 @@ public class Robot extends IterativeRobot {
     return Shooter.getShooter();
   }
 
+  public static CameraFeeds getCameraFeeds() {
+    return cameraFeeds;
+  }
+
   public static OI getOI() {
     return OI.getOI();
   }
@@ -52,12 +63,10 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
-
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-
   }
 }