Team4388/RiseOfRidgebotics2020
1
0
Fork 0
mirror of https://github.com/Team4388/RiseOfRidgebotics2020.git synced 2026-06-09 00:38:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Sort Commands and Organise Imports

Browse Source
This commit is contained in:
Keenan D. Buckley
2020-03-02 21:45:38 -07:00
parent d4a18c9c57
commit 08d6a3605a
39 changed files with 69 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/frc4388/robot/commands/AutoPath1FromCenter.java → src/main/java/frc4388/robot/commands/auto/AutoPath1FromCenter.java
+2 -1
View File
@@ -5,9 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.commands.drive.GotoCoordinates;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.Pneumatics;
src/main/java/frc4388/robot/commands/AutoPath2FromRight.java → src/main/java/frc4388/robot/commands/auto/AutoPath2FromRight.java
+2 -1
View File
@@ -5,9 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.commands.drive.GotoCoordinates;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.Pneumatics;
src/main/java/frc4388/robot/commands/Wait.java → src/main/java/frc4388/robot/commands/auto/Wait.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.auto;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/RunClimberWithTriggers.java → src/main/java/frc4388/robot/commands/climber/RunClimberWithTriggers.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.climber;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.subsystems.Climber;
src/main/java/frc4388/robot/commands/RunLevelerWithJoystick.java → src/main/java/frc4388/robot/commands/climber/RunLevelerWithJoystick.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.climber;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.subsystems.Leveler;
src/main/java/frc4388/robot/commands/DrivePositionMPAux.java → src/main/java/frc4388/robot/commands/drive/DrivePositionMPAux.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.DriveConstants;
src/main/java/frc4388/robot/commands/DriveStraightAtVelocityPID.java → src/main/java/frc4388/robot/commands/drive/DriveStraightAtVelocityPID.java
+1 -2
View File
@@ -4,8 +4,7 @@
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.DriveConstants;
src/main/java/frc4388/robot/commands/DriveStraightToPositionMM.java → src/main/java/frc4388/robot/commands/drive/DriveStraightToPositionMM.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/DriveStraightToPositionPID.java → src/main/java/frc4388/robot/commands/drive/DriveStraightToPositionPID.java
+1 -2
View File
@@ -5,9 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.DriveConstants;
import frc4388.robot.subsystems.Drive;
src/main/java/frc4388/robot/commands/DriveWithJoystick.java → src/main/java/frc4388/robot/commands/drive/DriveWithJoystick.java
+1 -2
View File
@@ -5,9 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.DriveConstants;
import frc4388.robot.subsystems.Drive;
src/main/java/frc4388/robot/commands/DriveWithJoystickAuxPID.java → src/main/java/frc4388/robot/commands/drive/DriveWithJoystickAuxPID.java
+1 -3
View File
@@ -5,9 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
import com.ctre.phoenix.motorcontrol.TalonFXControlMode;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpiutil.math.MathUtil;
src/main/java/frc4388/robot/commands/DriveWithJoystickDriveStraight.java → src/main/java/frc4388/robot/commands/drive/DriveWithJoystickDriveStraight.java
+1 -4
View File
@@ -5,12 +5,9 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
import java.security.PublicKey;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpiutil.math.MathUtil;
import frc4388.robot.Constants.DriveConstants;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.Pneumatics;
src/main/java/frc4388/robot/commands/DriveWithJoystickUsingDeadAssistPID.java → src/main/java/frc4388/robot/commands/drive/DriveWithJoystickUsingDeadAssistPID.java
+1 -2
View File
@@ -5,9 +5,8 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpiutil.math.MathUtil;
import frc4388.robot.Constants.DriveConstants;
src/main/java/frc4388/robot/commands/GotoCoordinates.java → src/main/java/frc4388/robot/commands/drive/GotoCoordinates.java
+2 -2
View File
@@ -5,10 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.commands.auto.Wait;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.Pneumatics;
src/main/java/frc4388/robot/commands/PlaySongDrive.java → src/main/java/frc4388/robot/commands/drive/PlaySongDrive.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.subsystems.Drive;
src/main/java/frc4388/robot/commands/TurnDegrees.java → src/main/java/frc4388/robot/commands/drive/TurnDegrees.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.drive;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/RunExtenderOutIn.java → src/main/java/frc4388/robot/commands/intake/RunExtenderOutIn.java
+1 -3
View File
@@ -5,17 +5,15 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.intake;
import com.revrobotics.CANDigitalInput;
import com.revrobotics.CANSparkMax;
import com.revrobotics.CANDigitalInput.LimitSwitchPolarity;
import com.revrobotics.CANSparkMaxLowLevel.MotorType;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.IntakeConstants;
import frc4388.robot.subsystems.Intake;
import frc4388.utility.controller.IHandController;
public class RunExtenderOutIn extends CommandBase {
private Intake m_intake;
src/main/java/frc4388/robot/commands/RunIntakeWithTriggers.java → src/main/java/frc4388/robot/commands/intake/RunIntakeWithTriggers.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.intake;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.subsystems.Intake;
src/main/java/frc4388/robot/commands/CalibrateShooter.java → src/main/java/frc4388/robot/commands/shooter/CalibrateShooter.java
+1 -2
View File
@@ -5,11 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import com.revrobotics.CANSparkMax.SoftLimitDirection;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.subsystems.Shooter;
src/main/java/frc4388/robot/commands/HoldTarget.java → src/main/java/frc4388/robot/commands/shooter/HoldTarget.java
+6 -11
View File
@@ -5,21 +5,16 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.Constants.VisionConstants;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.LimeLight;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.utility.ShooterTables;
import frc4388.utility.controller.IHandController;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.VisionConstants;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.utility.controller.IHandController;
public class HoldTarget extends CommandBase {
//Setup
src/main/java/frc4388/robot/commands/HoodPositionPID.java → src/main/java/frc4388/robot/commands/shooter/HoodPositionPID.java
+1 -2
View File
@@ -5,11 +5,10 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.subsystems.Shooter;
public class HoodPositionPID extends CommandBase {
src/main/java/frc4388/robot/commands/ShootFireGroup.java → src/main/java/frc4388/robot/commands/shooter/ShootFireGroup.java
+2 -1
View File
@@ -5,10 +5,11 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj2.command.ParallelRaceGroup;
import edu.wpi.first.wpilibj2.command.RunCommand;
import frc4388.robot.commands.storage.StorageRun;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.robot.subsystems.Storage;
src/main/java/frc4388/robot/commands/ShootFullGroup.java → src/main/java/frc4388/robot/commands/shooter/ShootFullGroup.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
import frc4388.robot.subsystems.Shooter;
src/main/java/frc4388/robot/commands/ShootPrepGroup.java → src/main/java/frc4388/robot/commands/shooter/ShootPrepGroup.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj2.command.ParallelCommandGroup;
import edu.wpi.first.wpilibj2.command.RunCommand;
src/main/java/frc4388/robot/commands/ShooterVelocityControlPID.java → src/main/java/frc4388/robot/commands/shooter/ShooterVelocityControlPID.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/TrackTarget.java → src/main/java/frc4388/robot/commands/shooter/TrackTarget.java
+6 -15
View File
@@ -5,25 +5,16 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import frc4388.robot.Constants.ShooterConstants;
import frc4388.robot.Constants.VisionConstants;
import frc4388.robot.subsystems.Camera;
import frc4388.robot.subsystems.Drive;
import frc4388.robot.subsystems.LimeLight;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.robot.commands.TrimShooter;
import frc4388.utility.ShooterTables;
import frc4388.utility.controller.IHandController;
import edu.wpi.first.wpilibj2.command.CommandBase;
import edu.wpi.first.wpilibj2.command.RunCommand;
import edu.wpi.first.networktables.NetworkTable;
import edu.wpi.first.networktables.NetworkTableEntry;
import edu.wpi.first.networktables.NetworkTableInstance;
import edu.wpi.first.wpilibj.XboxController;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.VisionConstants;
import frc4388.robot.subsystems.Shooter;
import frc4388.robot.subsystems.ShooterAim;
import frc4388.utility.controller.IHandController;
public class TrackTarget extends CommandBase {
// Setup
src/main/java/frc4388/robot/commands/TrimShooter.java → src/main/java/frc4388/robot/commands/shooter/TrimShooter.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.shooter;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.OIConstants;
src/main/java/frc4388/robot/commands/StorageIntake.java → src/main/java/frc4388/robot/commands/storage/StorageIntake.java
+1 -2
View File
@@ -5,10 +5,9 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.IntakeConstants;
import frc4388.robot.Constants.StorageConstants;
import frc4388.robot.subsystems.Intake;
import frc4388.robot.subsystems.Storage;
src/main/java/frc4388/robot/commands/StorageIntakeFinal.java → src/main/java/frc4388/robot/commands/storage/StorageIntakeFinal.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/StorageOutake.java → src/main/java/frc4388/robot/commands/storage/StorageOutake.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.StorageConstants;
src/main/java/frc4388/robot/commands/StoragePositionPID.java → src/main/java/frc4388/robot/commands/storage/StoragePositionPID.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.StorageConstants;
src/main/java/frc4388/robot/commands/StoragePrepAim.java → src/main/java/frc4388/robot/commands/storage/StoragePrepAim.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
import edu.wpi.first.wpilibj2.command.CommandBase;
src/main/java/frc4388/robot/commands/StoragePrepIntake.java → src/main/java/frc4388/robot/commands/storage/StoragePrepIntake.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.StorageConstants;
src/main/java/frc4388/robot/commands/StorageRun.java → src/main/java/frc4388/robot/commands/storage/StorageRun.java
+1 -1
View File
@@ -5,7 +5,7 @@
/* the project. */
/*----------------------------------------------------------------------------*/
package frc4388.robot.commands;
package frc4388.robot.commands.storage;
import edu.wpi.first.wpilibj2.command.CommandBase;
import frc4388.robot.Constants.StorageConstants;