Permalink
Browse files

Reorganized in an attempt to make it less terrible

  • Loading branch information...
Maxcr1 committed Apr 4, 2018
1 parent 31d0cfb commit 9ba74354607ed8583e1282a908118f32c9b3d26a
Showing with 124 additions and 56 deletions.
  1. +12 −0 .classpath~HEAD
  2. +12 −0 .classpath~Temp
  3. +18 −0 .project~HEAD
  4. +18 −0 .project~Temp
  5. +4 −4 src/org/usfirst/frc/team2169/robot/OI.java
  6. +14 −14 src/org/usfirst/frc/team2169/robot/Robot.java
  7. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_ContinouslyUpdateSlider.java
  8. +6 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_Master.java
  9. +2 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_Ramming.java
  10. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_RunHanger.java
  11. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_RunIntake.java
  12. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_SelfTest.java
  13. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/Auto_TestSolenoids.java
  14. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/DriveBackwards.java
  15. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/DriveForward.java
  16. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/DriveToPoint.java
  17. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/DriveTrainTurn.java
  18. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/RamDriveForward.java
  19. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/SetAlliance.java
  20. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/SetPosition.java
  21. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/TimedDriveBackwards.java
  22. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/TimedDriveForward.java
  23. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → auto}/TimedStop.java
  24. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → doors}/AnotherGearFlipCom.java
  25. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → doors}/GearSliderSolenoidFlip.java
  26. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → doors}/HumanPlayerSolenoidFlip.java
  27. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → doors}/SetGearDoor.java
  28. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → drive}/TankDrive.java
  29. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → drive}/TankDriveSolenoidFlip.java
  30. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → drive}/TankDriveSolenoidFlipOnce.java
  31. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → gearSlider}/CentralizeGearSlider.java
  32. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → gearSlider}/GearManip.java
  33. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → gearSlider}/SetSliderAutomatic.java
  34. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → gearSlider}/SwitchSliderAutomatic.java
  35. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → hanging}/Hanging.java
  36. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → intake}/Intake.java
  37. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → intake}/IntakeSolenoidFlip.java
  38. +1 −1 src/org/usfirst/frc/team2169/robot/commands/{ → intake}/ReleaseIntake.java
  39. +2 −0 src/org/usfirst/frc/team2169/robot/subsystems/DriveTrain.java
  40. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/ADIS16448_IMU.java
  41. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/DriveToPointPID.java
  42. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/DrivingStraightPID.java
  43. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/KTMath.java
  44. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/SliderPID.java
  45. +1 −1 src/org/usfirst/frc/team2169/{robot/subsystems → util}/Vision.java
  46. BIN sysProps.xml~HEAD
  47. BIN sysProps.xml~Temp
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="var" path="USERLIBS_DIR/CTRLib.jar"/>
<classpathentry kind="var" path="USERLIBS_DIR/navx_frc.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="var" path="wpilib" sourcepath="wpilib.sources"/>
<classpathentry kind="var" path="networktables" sourcepath="networktables.sources"/>
<classpathentry kind="var" path="opencv" sourcepath="opencv.sources"/>
<classpathentry kind="var" path="cscore" sourcepath="cscore.sources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="var" path="USERLIBS_DIR/TalonSRXLibJava.jar"/>
<classpathentry kind="var" path="USERLIBS_DIR/CTRLib.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>FRC-Steamworks-2.0</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>FRC-Steamworks-2.0</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>edu.wpi.first.wpilib.plugins.core.nature.FRCProjectNature</nature>
</natures>
</projectDescription>
@@ -1,9 +1,9 @@
package org.usfirst.frc.team2169.robot;

import org.usfirst.frc.team2169.robot.commands.AnotherGearFlipCom;
import org.usfirst.frc.team2169.robot.commands.CentralizeGearSlider;
import org.usfirst.frc.team2169.robot.commands.HumanPlayerSolenoidFlip;
import org.usfirst.frc.team2169.robot.commands.IntakeSolenoidFlip;
import org.usfirst.frc.team2169.robot.commands.doors.AnotherGearFlipCom;
import org.usfirst.frc.team2169.robot.commands.doors.HumanPlayerSolenoidFlip;
import org.usfirst.frc.team2169.robot.commands.gearSlider.CentralizeGearSlider;
import org.usfirst.frc.team2169.robot.commands.intake.IntakeSolenoidFlip;

import edu.wpi.first.wpilibj.Joystick;
import edu.wpi.first.wpilibj.buttons.JoystickButton;
@@ -2,24 +2,24 @@
package org.usfirst.frc.team2169.robot;


import org.usfirst.frc.team2169.robot.commands.Auto_Master;
import org.usfirst.frc.team2169.robot.commands.CentralizeGearSlider;
import org.usfirst.frc.team2169.robot.commands.GearManip;
import org.usfirst.frc.team2169.robot.commands.Hanging;
import org.usfirst.frc.team2169.robot.commands.Intake;
import org.usfirst.frc.team2169.robot.commands.SetAlliance;
import org.usfirst.frc.team2169.robot.commands.SetPosition;
import org.usfirst.frc.team2169.robot.commands.TankDrive;
import org.usfirst.frc.team2169.robot.commands.TankDriveSolenoidFlip;
import org.usfirst.frc.team2169.robot.subsystems.ADIS16448_IMU;
import org.usfirst.frc.team2169.robot.commands.auto.Auto_Master;
import org.usfirst.frc.team2169.robot.commands.auto.SetAlliance;
import org.usfirst.frc.team2169.robot.commands.auto.SetPosition;
import org.usfirst.frc.team2169.robot.commands.drive.TankDrive;
import org.usfirst.frc.team2169.robot.commands.drive.TankDriveSolenoidFlip;
import org.usfirst.frc.team2169.robot.commands.gearSlider.CentralizeGearSlider;
import org.usfirst.frc.team2169.robot.commands.gearSlider.GearManip;
import org.usfirst.frc.team2169.robot.commands.hanging.Hanging;
import org.usfirst.frc.team2169.robot.commands.intake.Intake;
import org.usfirst.frc.team2169.robot.subsystems.DriveTrain;
import org.usfirst.frc.team2169.robot.subsystems.DrivingStraightPID;
import org.usfirst.frc.team2169.robot.subsystems.GearManipulator;
import org.usfirst.frc.team2169.robot.subsystems.DriveToPointPID;
import org.usfirst.frc.team2169.robot.subsystems.Hanger;
import org.usfirst.frc.team2169.robot.subsystems.SliderPID;
import org.usfirst.frc.team2169.robot.subsystems.Intakes;
import org.usfirst.frc.team2169.robot.subsystems.KTMath;
import org.usfirst.frc.team2169.util.ADIS16448_IMU;
import org.usfirst.frc.team2169.util.DriveToPointPID;
import org.usfirst.frc.team2169.util.DrivingStraightPID;
import org.usfirst.frc.team2169.util.KTMath;
import org.usfirst.frc.team2169.util.SliderPID;

import edu.wpi.cscore.UsbCamera;
import edu.wpi.first.wpilibj.CameraServer;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,9 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.commands.doors.SetGearDoor;
import org.usfirst.frc.team2169.robot.commands.drive.TankDriveSolenoidFlipOnce;
import org.usfirst.frc.team2169.robot.commands.gearSlider.CentralizeGearSlider;
import org.usfirst.frc.team2169.robot.commands.intake.ReleaseIntake;

import edu.wpi.first.wpilibj.DoubleSolenoid.Value;
import edu.wpi.first.wpilibj.command.CommandGroup;
@@ -1,6 +1,7 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;
import org.usfirst.frc.team2169.robot.commands.gearSlider.CentralizeGearSlider;

import edu.wpi.first.wpilibj.command.CommandGroup;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import edu.wpi.first.wpilibj.command.CommandGroup;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import edu.wpi.first.wpilibj.Timer;
import edu.wpi.first.wpilibj.command.Command;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;
import edu.wpi.first.wpilibj.Timer;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.auto;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.doors;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.doors;

import org.usfirst.frc.team2169.robot.Robot;
import org.usfirst.frc.team2169.robot.subsystems.*;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.doors;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.doors;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.drive;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.drive;

import org.usfirst.frc.team2169.robot.Robot;
import org.usfirst.frc.team2169.robot.subsystems.DriveTrain;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.drive;

import org.usfirst.frc.team2169.robot.Robot;
import org.usfirst.frc.team2169.robot.subsystems.DriveTrain;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.gearSlider;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.gearSlider;

import java.util.Set;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.gearSlider;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.gearSlider;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.hanging;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.intake;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.intake;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.commands;
package org.usfirst.frc.team2169.robot.commands.intake;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,5 +1,7 @@
package org.usfirst.frc.team2169.robot.subsystems;

import org.usfirst.frc.team2169.util.ADIS16448_IMU;

import com.ctre.CANTalon;

import edu.wpi.first.wpilibj.Compressor;
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/

package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;

import java.nio.ByteOrder;
import java.nio.ByteBuffer;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;

import org.usfirst.frc.team2169.robot.Robot;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;

import org.usfirst.frc.team2169.robot.Robot;
import edu.wpi.first.wpilibj.command.PIDSubsystem;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;

import edu.wpi.first.wpilibj.command.Subsystem;

@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;
import org.usfirst.frc.team2169.robot.Robot;

import edu.wpi.first.wpilibj.command.PIDSubsystem;
@@ -1,4 +1,4 @@
package org.usfirst.frc.team2169.robot.subsystems;
package org.usfirst.frc.team2169.util;

import org.usfirst.frc.team2169.robot.Robot;

BIN +6.05 KB sysProps.xml~HEAD
Binary file not shown.
BIN +6.05 KB sysProps.xml~Temp
Binary file not shown.

0 comments on commit 9ba7435

Please sign in to comment.