Solving merge conflict.

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java.BACKUP.6792.java b/src/org/usfirst/frc/team3501/robot/Robot.java.BACKUP.6792.java
new file mode 100644 (file)
index 0000000..d450b8a
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java.BACKUP.6792.java
@@ -0,0 +1,76 @@
+package org.usfirst.frc.team3501.robot;
+
+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.cscore.UsbCamera;
+import edu.wpi.first.wpilibj.CameraServer;
+import edu.wpi.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.command.Scheduler;
+
+public class Robot extends IterativeRobot {
+  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;
+
+  @Override
+  public void robotInit() {
+    driveTrain = DriveTrain.getDriveTrain();
+    oi = OI.getOI();
+    shooter = Shooter.getShooter();
+    intake = Intake.getIntake();
+<<<<<<< HEAD
+
+=======
+    usbCamera = CameraServer.getInstance().startAutomaticCapture();
+    // cameraServer2 = CameraServer;getInstance();
+    // axisCamera = cameraServer2.addAxisCamera("axisCamera", "10.35.1.11");
+>>>>>>> Move code to more updated branch.
+  }
+
+  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
+  public void autonomousPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+
+  @Override
+  public void teleopInit() {
+
+  }
+
+  @Override
+  public void teleopPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+}

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java b/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java
new file mode 100644 (file)
index 0000000..5f4715c
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java
@@ -0,0 +1,59 @@
+package org.usfirst.frc.team3501.robot;
+
+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.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.command.Scheduler;
+
+public class Robot extends IterativeRobot {
+  private static DriveTrain driveTrain;
+  private static Shooter shooter;
+  private static OI oi;
+  private static Intake intake;
+
+  @Override
+  public void robotInit() {
+    driveTrain = DriveTrain.getDriveTrain();
+    oi = OI.getOI();
+    shooter = Shooter.getShooter();
+    intake = Intake.getIntake();
+  }
+
+  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();
+  }
+
+  @Override
+  public void autonomousInit() {
+  }
+
+  @Override
+  public void autonomousPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+
+  @Override
+  public void teleopInit() {
+  }
+
+  @Override
+  public void teleopPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+}

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java.LOCAL.6792.java b/src/org/usfirst/frc/team3501/robot/Robot.java.LOCAL.6792.java
new file mode 100644 (file)
index 0000000..1cffcb0
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java.LOCAL.6792.java
@@ -0,0 +1,64 @@
+package org.usfirst.frc.team3501.robot;
+
+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.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.command.Scheduler;
+
+public class Robot extends IterativeRobot {
+  private static DriveTrain driveTrain;
+  private static Shooter shooter;
+  private static OI oi;
+  private static Intake intake;
+
+  @Override
+  public void robotInit() {
+    driveTrain = DriveTrain.getDriveTrain();
+    oi = OI.getOI();
+    shooter = Shooter.getShooter();
+    intake = Intake.getIntake();
+
+  }
+
+  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
+  public void autonomousPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+
+  @Override
+  public void teleopInit() {
+
+  }
+
+  @Override
+  public void teleopPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+}

diff --git a/src/org/usfirst/frc/team3501/robot/Robot.java.REMOTE.6792.java b/src/org/usfirst/frc/team3501/robot/Robot.java.REMOTE.6792.java
new file mode 100644 (file)
index 0000000..529ddca
--- /dev/null
+++ b/src/org/usfirst/frc/team3501/robot/Robot.java.REMOTE.6792.java
@@ -0,0 +1,68 @@
+package org.usfirst.frc.team3501.robot;
+
+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.cscore.UsbCamera;
+import edu.wpi.first.wpilibj.CameraServer;
+import edu.wpi.first.wpilibj.IterativeRobot;
+import edu.wpi.first.wpilibj.command.Scheduler;
+
+public class Robot extends IterativeRobot {
+  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;
+
+  @Override
+  public void robotInit() {
+    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");
+  }
+
+  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();
+  }
+
+  @Override
+  public void autonomousInit() {
+  }
+
+  @Override
+  public void autonomousPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+
+  @Override
+  public void teleopInit() {
+  }
+
+  @Override
+  public void teleopPeriodic() {
+    Scheduler.getInstance().run();
+
+  }
+}