Made final int for toggling camera feeds equal to 7(button 7)

[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 29b1a3cdde2ecea9d847eb48dbf3b215fdae0e71..b6abd8468af0d352e906282c8dd93a4584505ba9 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -5,7 +5,6 @@ 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;
@@ -15,9 +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 UsbCamera usbCamera;
   private static CameraServer cameraServer2;
   private static AxisCamera axisCamera;
+  private static CameraFeeds cameraFeeds;
 
   @Override
   public void robotInit() {
@@ -34,6 +34,14 @@ public class Robot extends IterativeRobot {
     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() {
@@ -68,11 +76,14 @@ public class Robot extends IterativeRobot {
   @Override
   public void teleopInit() {
 
+    cameraFeeds.init();
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
+    cameraFeeds.run();
 
   }
 }