@@ -41,8 +41,6 @@ public class SwerveModule implements Sendable {
4141 public enum ModuleType {FL , FR , BL , BR };
4242
4343 private SwerveConfig config ;
44- private SparkBaseConfig turnConfig ;
45- private SparkBaseConfig driveConfig ;
4644
4745 private ModuleType type ;
4846 private String moduleString ;
@@ -72,8 +70,8 @@ public SwerveModule(SwerveConfig config, ModuleType type, SparkBase drive, Spark
7270 int arrIndex , Supplier <Float > pitchDegSupplier , Supplier <Float > rollDegSupplier ) {
7371 driveMotorType = MotorControllerType .getMotorControllerType (drive );
7472 turnMotorType = MotorControllerType .getMotorControllerType (turn );
75- driveConfig = driveMotorType .createConfig ();
76- turnConfig = turnMotorType .createConfig ();
73+ SparkBaseConfig driveConfig = driveMotorType .createConfig ();
74+ SparkBaseConfig turnConfig = turnMotorType .createConfig ();
7775 driveConfigAccessor = MotorControllerFactory .getConfigAccessor (drive );
7876 turnConfigAccessor = MotorControllerFactory .getConfigAccessor (turn );
7977 //SmartDashboard.putNumber("Target Angle (deg)", 0.0);
@@ -93,8 +91,7 @@ public SwerveModule(SwerveConfig config, ModuleType type, SparkBase drive, Spark
9391 final double driveVelocityFactor = drivePositionFactor / 60 ;
9492 driveConfig .encoder
9593 .positionConversionFactor (drivePositionFactor )
96- .velocityConversionFactor (driveVelocityFactor )
97- .quadratureAverageDepth (2 );
94+ .velocityConversionFactor (driveVelocityFactor );
9895
9996 maxControllableAccerlationRps2 = 0 ;
10097 final double normalForceNewtons = 83.2 /* lbf */ * 4.4482 /* N/lbf */ / 4 /* numModules */ ;
@@ -119,9 +116,9 @@ public SwerveModule(SwerveConfig config, ModuleType type, SparkBase drive, Spark
119116 config .drivekD [arrIndex ]);
120117
121118 /* offset for 1 relative encoder count */
122- drivetoleranceMPerS = (1.0
123- / (double )(driveConfigAccessor .encoder .getCountsPerRevolution ()) * drivePositionFactor )
124- / Units .millisecondsToSeconds (driveConfigAccessor .signals . getPrimaryEncoderPositionPeriodMs () * driveConfigAccessor .encoder .getQuadratureAverageDepth ());
119+ drivetoleranceMPerS = (1.0
120+ / (double )(driveConfigAccessor .encoder .getCountsPerRevolution ()) * drivePositionFactor )
121+ / Units .millisecondsToSeconds (driveConfigAccessor .encoder . getUvwMeasurementPeriod () * driveConfigAccessor .encoder .getUvwAverageDepth ());
125122 drivePIDController .setTolerance (drivetoleranceMPerS );
126123
127124 //System.out.println("Velocity Constant: " + (positionConstant / 60));
0 commit comments