Reorganize file structure

StuyPulse · Dec 8, 2023 · db16630 · db16630
1 parent b4133c3
commit db16630
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 13 deletions.
diff --git a/src/main/java/com/stuypulse/robot/RobotContainer.java b/src/main/java/com/stuypulse/robot/RobotContainer.java
@@ -13,7 +13,7 @@
 import com.stuypulse.robot.commands.swerve.SwerveDriveDrive;
 import com.stuypulse.robot.commands.swerve.SwerveDriveResetHeading;
 import com.stuypulse.robot.constants.Ports;
-import com.stuypulse.robot.subsystems.swerve.Odometry;
+import com.stuypulse.robot.subsystems.odometry.Odometry;
 import com.stuypulse.robot.subsystems.swerve.SwerveDrive;
 import com.stuypulse.robot.util.BootlegXbox;
 import com.stuypulse.stuylib.input.Gamepad;

diff --git a/src/main/java/com/stuypulse/robot/commands/auton/DriveAndTurnBump.java b/src/main/java/com/stuypulse/robot/commands/auton/DriveAndTurnBump.java
@@ -9,7 +9,7 @@
 
 import com.pathplanner.lib.PathConstraints;
 import com.pathplanner.lib.PathPlanner;
-import com.stuypulse.robot.subsystems.swerve.SwerveDriveFollowTrajectory;
+import com.stuypulse.robot.util.SwerveDriveFollowTrajectory;
 
 public class DriveAndTurnBump extends SequentialCommandGroup {
     private static final PathConstraints CONSTRAINTS = new PathConstraints(2, 2);

diff --git a/src/main/java/com/stuypulse/robot/commands/auton/EightFootAuton.java b/src/main/java/com/stuypulse/robot/commands/auton/EightFootAuton.java
@@ -16,7 +16,7 @@
 import com.pathplanner.lib.PathPlanner;
 import com.pathplanner.lib.PathPlannerTrajectory;
 import com.pathplanner.lib.PathPoint;
-import com.stuypulse.robot.subsystems.swerve.SwerveDriveFollowTrajectory;
+import com.stuypulse.robot.util.SwerveDriveFollowTrajectory;
 
 public class EightFootAuton extends SequentialCommandGroup {
     private static final PathConstraints CONSTRAINTS = new PathConstraints(0.01, 0.01);

diff --git a/src/main/java/com/stuypulse/robot/commands/auton/Mobility.java b/src/main/java/com/stuypulse/robot/commands/auton/Mobility.java
@@ -9,7 +9,7 @@
 
 import com.pathplanner.lib.PathConstraints;
 import com.pathplanner.lib.PathPlanner;
-import com.stuypulse.robot.subsystems.swerve.SwerveDriveFollowTrajectory;
+import com.stuypulse.robot.util.SwerveDriveFollowTrajectory;
 
 public class Mobility extends SequentialCommandGroup {
     private static final PathConstraints CONSTRAINTS = new PathConstraints(2, 2);

diff --git a/src/main/java/com/stuypulse/robot/commands/auton/MobilityBump.java b/src/main/java/com/stuypulse/robot/commands/auton/MobilityBump.java
@@ -9,7 +9,7 @@
 
 import com.pathplanner.lib.PathConstraints;
 import com.pathplanner.lib.PathPlanner;
-import com.stuypulse.robot.subsystems.swerve.SwerveDriveFollowTrajectory;
+import com.stuypulse.robot.util.SwerveDriveFollowTrajectory;
 
 public class MobilityBump extends SequentialCommandGroup {
     private static final PathConstraints CONSTRAINTS = new PathConstraints(2, 2);

diff --git a/src/main/java/com/stuypulse/robot/commands/swerve/SwerveDriveResetHeading.java b/src/main/java/com/stuypulse/robot/commands/swerve/SwerveDriveResetHeading.java
@@ -1,6 +1,6 @@
 package com.stuypulse.robot.commands.swerve;
 
-import com.stuypulse.robot.subsystems.swerve.Odometry;
+import com.stuypulse.robot.subsystems.odometry.Odometry;
 
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.math.geometry.Rotation2d;

diff --git a/...lse/robot/subsystems/swerve/Odometry.java → ...e/robot/subsystems/odometry/Odometry.java b/...lse/robot/subsystems/swerve/Odometry.java → ...e/robot/subsystems/odometry/Odometry.java
@@ -1,4 +1,4 @@
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.subsystems.odometry;
 
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.math.geometry.Rotation2d;

diff --git a/...robot/subsystems/swerve/OdometryImpl.java → ...bot/subsystems/odometry/OdometryImpl.java b/...robot/subsystems/swerve/OdometryImpl.java → ...bot/subsystems/odometry/OdometryImpl.java
@@ -1,4 +1,6 @@
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.subsystems.odometry;
+
+import com.stuypulse.robot.subsystems.swerve.SwerveDrive;
 
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.math.kinematics.SwerveDriveOdometry;

diff --git a/src/main/java/com/stuypulse/robot/subsystems/swerve/SwerveDrive.java b/src/main/java/com/stuypulse/robot/subsystems/swerve/SwerveDrive.java
@@ -9,6 +9,10 @@
 import com.stuypulse.robot.constants.Settings.Swerve.BackRight;
 import com.stuypulse.robot.constants.Settings.Swerve.FrontLeft;
 import com.stuypulse.robot.constants.Settings.Swerve.FrontRight;
+import com.stuypulse.robot.subsystems.odometry.Odometry;
+import com.stuypulse.robot.subsystems.swerve.module.SimModule;
+import com.stuypulse.robot.subsystems.swerve.module.SwerveModule;
+import com.stuypulse.robot.subsystems.swerve.module.SwerveModuleImpl;
 import com.stuypulse.stuylib.math.Vector2D;
 
 import edu.wpi.first.math.geometry.Pose2d;

diff --git a/...se/robot/subsystems/swerve/SimModule.java → ...t/subsystems/swerve/module/SimModule.java b/...se/robot/subsystems/swerve/SimModule.java → ...t/subsystems/swerve/module/SimModule.java
@@ -1,4 +1,4 @@
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.subsystems.swerve.module;
 
 import com.stuypulse.robot.Robot;
 import com.stuypulse.robot.constants.Settings;

diff --git a/...robot/subsystems/swerve/SwerveModule.java → ...ubsystems/swerve/module/SwerveModule.java b/...robot/subsystems/swerve/SwerveModule.java → ...ubsystems/swerve/module/SwerveModule.java
@@ -1,4 +1,4 @@
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.subsystems.swerve.module;
 import edu.wpi.first.math.geometry.Translation2d;
 import edu.wpi.first.math.kinematics.SwerveModulePosition;
 import edu.wpi.first.math.kinematics.SwerveModuleState;

diff --git a/...t/subsystems/swerve/SwerveModuleImpl.java → ...stems/swerve/module/SwerveModuleImpl.java b/...t/subsystems/swerve/SwerveModuleImpl.java → ...stems/swerve/module/SwerveModuleImpl.java
@@ -1,4 +1,4 @@
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.subsystems.swerve.module;
 
 import com.ctre.phoenix.sensors.CANCoder;
 import com.revrobotics.CANSparkMax;

diff --git a/...s/swerve/SwerveDriveFollowTrajectory.java → ...bot/util/SwerveDriveFollowTrajectory.java b/...s/swerve/SwerveDriveFollowTrajectory.java → ...bot/util/SwerveDriveFollowTrajectory.java
@@ -3,10 +3,10 @@
 /* This work is licensed under the terms of the MIT license.  */
 /**************************************************************/
 
-package com.stuypulse.robot.subsystems.swerve;
+package com.stuypulse.robot.util;
 
 import com.stuypulse.robot.constants.Settings.Swerve.Motion;
-import com.stuypulse.robot.subsystems.swerve.Odometry;
+import com.stuypulse.robot.subsystems.odometry.Odometry;
 import com.stuypulse.robot.subsystems.swerve.SwerveDrive;
 
 import edu.wpi.first.math.controller.PIDController;