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 cfd9e38d1a5255a4881b23e1cce94715d9262de6..d4f5d946eb9e987828350b694c6b0f550f3d4174 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Robot.java
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java
@@ -25,11 +25,26 @@ 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();
+
     cameraFeeds = new CameraFeeds();
+
   }
 
   public static DriveTrain getDriveTrain() {
@@ -48,8 +63,11 @@ public class Robot extends IterativeRobot {
     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
@@ -60,13 +78,16 @@ public class Robot extends IterativeRobot {
 
   @Override
   public void teleopInit() {
+
     cameraFeeds.init();
+
+    cameraFeeds.init();
+
   }
 
   @Override
   public void teleopPeriodic() {
     Scheduler.getInstance().run();
-    
 
   }
 }