Commiting so I can pull

[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 36ca70bc268a526c02d33f5531c1d8d550fcbe90..c8ef56804895f761c144b995680e0d31968d2628 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -1,21 +1,70 @@
 package org.usfirst.frc.team3501.robot;
 
-import org.usfirst.frc.team3501.robot.Constants.DriveTrain;
+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;
 
 public class Robot extends IterativeRobot {
-  public static OI oi;
-  public static DriveTrain driveTrain;
+  private static DriveTrain driveTrain;
+  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() {
-    driveTrain = new DriveTrain();
-    oi = new OI();
+    driveTrain = DriveTrain.getDriveTrain();
+    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() {
+    return DriveTrain.getDriveTrain();
   }
 
+  public static Shooter getShooter() {
+    return Shooter.getShooter();
+  }
+
+  public static OI getOI() {
+    return OI.getOI();
+  }
+
+  public static Intake getIntake() {
+    return Intake.getIntake();
+  }
+
+  // If the gear values do not match in the left and right piston, then they are
+  // both set to high gear
   @Override
   public void autonomousInit() {
+    driveTrain.setHighGear();
   }
 
   @Override
@@ -26,6 +75,9 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+
+    cameraFeeds.init();
+
   }
 
   @Override