Reorganize Folder Locations

Team3128 · Nov 27, 2023 · f18cea4 · f18cea4
1 parent 2894560
commit f18cea4
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 18 deletions.
diff --git a/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java b/src/main/java/common/core/subsystems/NAR_PIDSubsystem.java
@@ -5,7 +5,7 @@
 
 import common.core.controllers.Controller;
 import common.core.controllers.Controller.Type;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.wpilibj2.command.PIDSubsystem;
 import edu.wpi.first.wpilibj2.command.SubsystemBase;

diff --git a/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java b/src/main/java/common/core/subsystems/NAR_ProfiledPIDSubsystem.java
@@ -3,7 +3,7 @@
 import java.util.function.BooleanSupplier;
 import java.util.function.DoubleSupplier;
 
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.math.controller.ProfiledPIDController;
 import edu.wpi.first.math.trajectory.TrapezoidProfile;

diff --git a/...in/java/common/swerveNeo/CTREConfigs.java → .../java/common/core/swerve/CTREConfigs.java b/...in/java/common/swerveNeo/CTREConfigs.java → .../java/common/core/swerve/CTREConfigs.java
@@ -1,4 +1,6 @@
-package common.swerveNeo;
+package common.core.swerve;
+
+import static common.core.swerve.SwerveConstants.*;
 
 import com.ctre.phoenix.motorcontrol.SupplyCurrentLimitConfiguration;
 import com.ctre.phoenix.motorcontrol.can.TalonFXConfiguration;
@@ -7,8 +9,6 @@
 import com.ctre.phoenix.sensors.SensorInitializationStrategy;
 import com.ctre.phoenix.sensors.SensorTimeBase;
 
-import static common.swerveNeo.SwerveConstants.*;
-
 /**
  * Team 3128's defaults
  */

diff --git a/...ava/common/swerveNeo/CTREModuleState.java → ...a/common/core/swerve/CTREModuleState.java b/...ava/common/swerveNeo/CTREModuleState.java → ...a/common/core/swerve/CTREModuleState.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.kinematics.SwerveModuleState;

diff --git a/...ava/common/swerveNeo/SwerveConstants.java → ...a/common/core/swerve/SwerveConstants.java b/...ava/common/swerveNeo/SwerveConstants.java → ...a/common/core/swerve/SwerveConstants.java
@@ -1,6 +1,6 @@
-package common.swerveNeo;
+package common.core.swerve;
 
-import common.swerveNeo.SwerveModule.ModuleType;
+import common.core.swerve.SwerveModule.ModuleType;
 import edu.wpi.first.math.util.Units;;
 
 /**

diff --git a/...a/common/swerveNeo/SwerveConversions.java → ...common/core/swerve/SwerveConversions.java b/...a/common/swerveNeo/SwerveConversions.java → ...common/core/swerve/SwerveConversions.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 /**
  * Team 3128's conversion class for Swerve

diff --git a/...n/java/common/swerveNeo/SwerveModule.java → ...java/common/core/swerve/SwerveModule.java b/...n/java/common/swerveNeo/SwerveModule.java → ...java/common/core/swerve/SwerveModule.java
@@ -1,11 +1,14 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 import edu.wpi.first.math.MathUtil;
 import edu.wpi.first.math.controller.SimpleMotorFeedforward;
 import edu.wpi.first.math.geometry.Rotation2d;
 import edu.wpi.first.math.kinematics.SwerveModulePosition;
 import edu.wpi.first.math.kinematics.SwerveModuleState;
 
+import static common.core.swerve.SwerveConstants.*;
+import static common.core.swerve.SwerveConversions.*;
+
 import com.ctre.phoenix.sensors.CANCoder;
 import com.revrobotics.CANSparkMaxLowLevel.MotorType;
 
@@ -16,9 +19,6 @@
 import common.hardware.motorcontroller.NAR_Motor.Control;
 import common.hardware.motorcontroller.NAR_Motor.Neutral;
 
-import static common.swerveNeo.SwerveConstants.*;
-import static common.swerveNeo.SwerveConversions.*;
-
 
 /**
  * Team 3128's Swerve Module class

diff --git a/...mmon/swerveNeo/SwerveModuleConstants.java → ...on/core/swerve/SwerveModuleConstants.java b/...mmon/swerveNeo/SwerveModuleConstants.java → ...on/core/swerve/SwerveModuleConstants.java
@@ -1,4 +1,4 @@
-package common.swerveNeo;
+package common.core.swerve;
 
 public class SwerveModuleConstants {
     public final int driveMotorID;

diff --git a/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java b/src/main/java/common/hardware/motorcontroller/NAR_CANSparkMax.java
@@ -12,7 +12,8 @@
 import com.revrobotics.SparkMaxRelativeEncoder;
 
 import common.core.NAR_Robot;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
+
 import static common.hardware.motorcontroller.MotorControllerConstants.*;
 
 import com.revrobotics.CANSparkMax.ControlType;

diff --git a/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java b/src/main/java/common/hardware/motorcontroller/NAR_TalonFX.java
@@ -9,7 +9,7 @@
 import com.ctre.phoenix.motorcontrol.can.WPI_TalonFX;
 
 import common.core.NAR_Robot;
-import common.utility.NAR_Shuffleboard;
+import common.utility.shuffleboard.NAR_Shuffleboard;
 
 import static common.hardware.motorcontroller.MotorControllerConstants.*;
 

diff --git a/...on/narwhaldashboard/NarwhalDashboard.java → ...ty/narwhaldashboard/NarwhalDashboard.java b/...on/narwhaldashboard/NarwhalDashboard.java → ...ty/narwhaldashboard/NarwhalDashboard.java
@@ -1,4 +1,4 @@
-package common.narwhaldashboard;
+package common.utility.narwhaldashboard;
 
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;

diff --git a/...java/common/utility/NAR_Shuffleboard.java → ...tility/shuffleboard/NAR_Shuffleboard.java b/...java/common/utility/NAR_Shuffleboard.java → ...tility/shuffleboard/NAR_Shuffleboard.java
@@ -1,4 +1,4 @@
-package common.utility;
+package common.utility.shuffleboard;
 
 import java.util.HashMap;
 import java.util.function.DoubleSupplier;