From ff2c08e198a11df25f07cdcd70f754fd98c8d4ca Mon Sep 17 00:00:00 2001 From: Hayden Heroux Date: Thu, 25 Apr 2024 16:04:10 -0400 Subject: [PATCH] refactor(config): Move configurator. --- src/main/java/frc/lib/{ => config}/Configurator.java | 2 +- .../java/frc/lib/controller/PositionControllerIOTalonFX2.java | 2 +- .../java/frc/lib/controller/VelocityControllerIOTalonFX.java | 2 +- src/main/java/frc/robot/odometry/GyroscopeIOPigeon2.java | 2 +- src/main/java/frc/robot/swerve/AzimuthEncoderIOCANcoder.java | 2 +- src/main/java/frc/robot/swerve/DriveMotorIOTalonFXPID.java | 2 +- src/main/java/frc/robot/swerve/SteerMotorIOTalonFXPIDF.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/frc/lib/{ => config}/Configurator.java (99%) diff --git a/src/main/java/frc/lib/Configurator.java b/src/main/java/frc/lib/config/Configurator.java similarity index 99% rename from src/main/java/frc/lib/Configurator.java rename to src/main/java/frc/lib/config/Configurator.java index 236de57..9f5fcd2 100644 --- a/src/main/java/frc/lib/Configurator.java +++ b/src/main/java/frc/lib/config/Configurator.java @@ -1,4 +1,4 @@ -package frc.lib; +package frc.lib.config; import com.ctre.phoenix.ErrorCode; import com.ctre.phoenix6.StatusCode; diff --git a/src/main/java/frc/lib/controller/PositionControllerIOTalonFX2.java b/src/main/java/frc/lib/controller/PositionControllerIOTalonFX2.java index 56910a5..2a37e82 100644 --- a/src/main/java/frc/lib/controller/PositionControllerIOTalonFX2.java +++ b/src/main/java/frc/lib/controller/PositionControllerIOTalonFX2.java @@ -11,7 +11,7 @@ import edu.wpi.first.math.controller.PIDController; import edu.wpi.first.math.util.Units; import frc.lib.CAN; -import frc.lib.Configurator; +import frc.lib.config.Configurator; import frc.lib.config.MechanismConfig; /** Position controller using two TalonFXs and a CANcoder and an external PIDF for an arm. */ diff --git a/src/main/java/frc/lib/controller/VelocityControllerIOTalonFX.java b/src/main/java/frc/lib/controller/VelocityControllerIOTalonFX.java index 6bbc60c..1292970 100644 --- a/src/main/java/frc/lib/controller/VelocityControllerIOTalonFX.java +++ b/src/main/java/frc/lib/controller/VelocityControllerIOTalonFX.java @@ -5,7 +5,7 @@ import com.ctre.phoenix6.hardware.ParentDevice; import com.ctre.phoenix6.hardware.TalonFX; import frc.lib.CAN; -import frc.lib.Configurator; +import frc.lib.config.Configurator; import frc.lib.config.MechanismConfig; /** Velocity controller using TalonFX. */ diff --git a/src/main/java/frc/robot/odometry/GyroscopeIOPigeon2.java b/src/main/java/frc/robot/odometry/GyroscopeIOPigeon2.java index 2b9c8fd..1afd698 100644 --- a/src/main/java/frc/robot/odometry/GyroscopeIOPigeon2.java +++ b/src/main/java/frc/robot/odometry/GyroscopeIOPigeon2.java @@ -5,7 +5,7 @@ import com.ctre.phoenix6.configs.Pigeon2Configuration; import com.ctre.phoenix6.hardware.Pigeon2; import edu.wpi.first.math.util.Units; -import frc.lib.Configurator; +import frc.lib.config.Configurator; /** Pigeon 2 gyroscope. */ public class GyroscopeIOPigeon2 implements GyroscopeIO { diff --git a/src/main/java/frc/robot/swerve/AzimuthEncoderIOCANcoder.java b/src/main/java/frc/robot/swerve/AzimuthEncoderIOCANcoder.java index 7c54192..02f98d4 100644 --- a/src/main/java/frc/robot/swerve/AzimuthEncoderIOCANcoder.java +++ b/src/main/java/frc/robot/swerve/AzimuthEncoderIOCANcoder.java @@ -5,7 +5,7 @@ import com.ctre.phoenix6.hardware.CANcoder; import edu.wpi.first.math.geometry.Rotation2d; import frc.lib.CAN; -import frc.lib.Configurator; +import frc.lib.config.Configurator; /** CANcoder azimuth encoder. */ public class AzimuthEncoderIOCANcoder implements AzimuthEncoderIO { diff --git a/src/main/java/frc/robot/swerve/DriveMotorIOTalonFXPID.java b/src/main/java/frc/robot/swerve/DriveMotorIOTalonFXPID.java index dbda6c5..2234101 100644 --- a/src/main/java/frc/robot/swerve/DriveMotorIOTalonFXPID.java +++ b/src/main/java/frc/robot/swerve/DriveMotorIOTalonFXPID.java @@ -5,7 +5,7 @@ import edu.wpi.first.math.controller.PIDController; import edu.wpi.first.math.controller.SimpleMotorFeedforward; import frc.lib.CAN; -import frc.lib.Configurator; +import frc.lib.config.Configurator; import frc.robot.RobotConstants; import frc.robot.swerve.SwerveConstants.MK4iConstants; diff --git a/src/main/java/frc/robot/swerve/SteerMotorIOTalonFXPIDF.java b/src/main/java/frc/robot/swerve/SteerMotorIOTalonFXPIDF.java index feae7da..eaca1e6 100644 --- a/src/main/java/frc/robot/swerve/SteerMotorIOTalonFXPIDF.java +++ b/src/main/java/frc/robot/swerve/SteerMotorIOTalonFXPIDF.java @@ -6,8 +6,8 @@ import com.ctre.phoenix6.signals.InvertedValue; import edu.wpi.first.math.geometry.Rotation2d; import frc.lib.CAN; -import frc.lib.Configurator; import frc.lib.MotorCurrentLimits; +import frc.lib.config.Configurator; import frc.robot.swerve.SwerveConstants.MK4iConstants; /** TalonFX steer motor controlled by an external PIDF controller. */