Remove random files.

diff --git a/src/org/usfirst/frc/team3501/robot/Constants.java b/src/org/usfirst/frc/team3501/robot/Constants.java
index 97036b54f41ce14482e159032cbf6763966556c0..a40334d01c5bdfc3cbd6eda96790d9e001ab6cce 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/Constants.java
+++ b/src/org/usfirst/frc/team3501/robot/Constants.java
@@ -20,8 +20,6 @@ public class Constants {
 
     public final static int TOGGLE_GEAR_PORT = 0;
 
-    public static final int TOGGLE_CAMERA_FEEDS = 7;
-
     public static final int TOGGLE_CAMERA_FEEDS = 4;
 
   }

diff --git a/src/org/usfirst/frc/team3501/robot/OI.java b/src/org/usfirst/frc/team3501/robot/OI.java
index 87f069bdb8ce692ad33721fcbb7ed4d570bd3d89..6a99c9756c08e66da78a81fc1d96eea9b04da88f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/OI.java
+++ b/src/org/usfirst/frc/team3501/robot/OI.java
@@ -1,14 +1,7 @@
 package org.usfirst.frc.team3501.robot;
 
-
-
-import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
-=======
 import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
->>>>>>> added command for toggling camera feeds
-=======
-import org.usfirst.frc.team3501.robot.commands.accessories.ToggleCameraFeed;
->>>>>>> cb0f662264528bcb0d783fcb00db22eb8d4f4283
+import org.usfirst.frc.team3501.robot.commands.driving.ToggleGear;
 
 import edu.wpi.first.wpilibj.Joystick;
 import edu.wpi.first.wpilibj.buttons.Button;
@@ -25,8 +18,6 @@ public class OI {
 
   public static Button toggleCameraFeeds;
 
-  public static Button toggleCameraFeeds;
-
   public static Button toggleGear;
 
   public OI() {
@@ -39,19 +30,17 @@ public class OI {
     toggleFlyWheel = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_FLYWHEEL_PORT);
 
-
     toggleGear = new JoystickButton(leftJoystick,
         Constants.OI.TOGGLE_GEAR_PORT);
     toggleGear.whenPressed(new ToggleGear());
 
-
-    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+    toggleCameraFeeds = new JoystickButton(leftJoystick,
+        Constants.OI.TOGGLE_CAMERA_FEEDS);
 
     toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
 
-
-
-    toggleCameraFeeds = new JoystickButton(leftJoystick, Constants.OI.TOGGLE_CAMERA_FEEDS);
+    toggleCameraFeeds = new JoystickButton(leftJoystick,
+        Constants.OI.TOGGLE_CAMERA_FEEDS);
 
     toggleCameraFeeds.whenReleased(new ToggleCameraFeed());
 

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
deleted file mode 100644 (file)
index d450b8a..0000000
--- a/src/org/usfirst/frc/team3501/robot/Robot.java.BACKUP.6792.java
+++ /dev/null
@@ -1,76 +0,0 @@
-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
deleted file mode 100644 (file)
index 5f4715c..0000000
--- a/src/org/usfirst/frc/team3501/robot/Robot.java.BASE.6792.java
+++ /dev/null
@@ -1,59 +0,0 @@
-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
deleted file mode 100644 (file)
index 1cffcb0..0000000
--- a/src/org/usfirst/frc/team3501/robot/Robot.java.LOCAL.6792.java
+++ /dev/null
@@ -1,64 +0,0 @@
-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
deleted file mode 100644 (file)
index 529ddca..0000000
--- a/src/org/usfirst/frc/team3501/robot/Robot.java.REMOTE.6792.java
+++ /dev/null
@@ -1,68 +0,0 @@
-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();
-
-  }
-}