refactor(swerve): Start moving away from config.

Gongoliers · Apr 28, 2024 · bde4bdc · bde4bdc
1 parent 085c28c
commit bde4bdc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/frc/robot/swerve/SwerveFactory.java b/src/main/java/frc/robot/swerve/SwerveFactory.java
@@ -1,5 +1,8 @@
 package frc.robot.swerve;
 
+import edu.wpi.first.math.geometry.Rotation2d;
+import frc.lib.CAN;
+import frc.lib.config.AbsoluteEncoderConfig;
 import frc.lib.controller.PositionControllerIO;
 import frc.lib.controller.PositionControllerIOSim;
 import frc.lib.controller.PositionControllerIOTalonFXSteer;
@@ -27,13 +30,13 @@ public static SwerveModuleIO createModule(SwerveModuleConfig config) {
    *
    * @return a steer motor.
    */
-  public static PositionControllerIO createSteerMotor(SwerveModuleConfig config) {
+  public static PositionControllerIO createSteerMotor(CAN steer, CAN azimuth, Rotation2d offset) {
     if (Robot.isReal() && RobotConstants.REAL_SUBSYSTEMS.contains(Subsystem.SWERVE))
       return new PositionControllerIOTalonFXSteer(
-          config.moduleCAN().steer(),
-          config.moduleCAN().azimuth(),
+          steer,
+          azimuth,
           SwerveConstants.STEER_CONFIG.withAbsoluteEncoderConfig(
-              SwerveConstants.STEER_CONFIG.absoluteEncoderConfig().withOffset(config.offset())),
+              new AbsoluteEncoderConfig().withOffset(offset)),
           false);
 
     return new PositionControllerIOSim();
@@ -44,10 +47,10 @@ public static PositionControllerIO createSteerMotor(SwerveModuleConfig config) {
    *
    * @return a drive motor.
    */
-  public static VelocityControllerIO createDriveMotor(SwerveModuleConfig config) {
+  public static VelocityControllerIO createDriveMotor(CAN drive) {
     if (Robot.isReal() && RobotConstants.REAL_SUBSYSTEMS.contains(Subsystem.SWERVE))
       return new VelocityControllerIOTalonFXPIDF(
-          config.moduleCAN().drive(), SwerveConstants.DRIVE_CONFIG, false);
+          drive, SwerveConstants.DRIVE_CONFIG, false);
 
     return new VelocityControllerIOSim();
   }

diff --git a/src/main/java/frc/robot/swerve/SwerveModuleIOCustom.java b/src/main/java/frc/robot/swerve/SwerveModuleIOCustom.java
@@ -34,10 +34,10 @@ public class SwerveModuleIOCustom implements SwerveModuleIO {
    * @param config the swerve module's configuration.
    */
   public SwerveModuleIOCustom(SwerveModuleConfig config) {
-    steerMotor = SwerveFactory.createSteerMotor(config);
+    steerMotor = SwerveFactory.createSteerMotor(config.moduleCAN().steer(), config.moduleCAN().azimuth(), config.offset());
     steerMotor.configure();
 
-    driveMotor = SwerveFactory.createDriveMotor(config);
+    driveMotor = SwerveFactory.createDriveMotor(config.moduleCAN().drive());
     driveMotor.configure();
 
     setpoint = new SwerveModuleState();