Skip to content

Commit d5907c2

Browse files
committed
Update member names
1 parent 1de36b2 commit d5907c2

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

src/main/java/frc/robot/subsystems/MAXSwerveModule.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import frc.robot.Configs;
2121

2222
public class MAXSwerveModule {
23-
private final SparkMax m_drivingSparkMax;
24-
private final SparkMax m_turningSparkMax;
23+
private final SparkMax m_drivingSpark;
24+
private final SparkMax m_turningSpark;
2525

2626
private final RelativeEncoder m_drivingEncoder;
2727
private final AbsoluteEncoder m_turningEncoder;
2828

29-
private final SparkClosedLoopController m_drivingPIDController;
30-
private final SparkClosedLoopController m_turningPIDController;
29+
private final SparkClosedLoopController m_drivingClosedLoopController;
30+
private final SparkClosedLoopController m_turningClosedLoopController;
3131

3232
private double m_chassisAngularOffset = 0;
3333
private SwerveModuleState m_desiredState = new SwerveModuleState(0.0, new Rotation2d());
@@ -39,21 +39,21 @@ public class MAXSwerveModule {
3939
* Encoder.
4040
*/
4141
public MAXSwerveModule(int drivingCANId, int turningCANId, double chassisAngularOffset) {
42-
m_drivingSparkMax = new SparkMax(drivingCANId, MotorType.kBrushless);
43-
m_turningSparkMax = new SparkMax(turningCANId, MotorType.kBrushless);
42+
m_drivingSpark = new SparkMax(drivingCANId, MotorType.kBrushless);
43+
m_turningSpark = new SparkMax(turningCANId, MotorType.kBrushless);
4444

45-
m_drivingEncoder = m_drivingSparkMax.getEncoder();
46-
m_turningEncoder = m_turningSparkMax.getAbsoluteEncoder();
45+
m_drivingEncoder = m_drivingSpark.getEncoder();
46+
m_turningEncoder = m_turningSpark.getAbsoluteEncoder();
4747

48-
m_drivingPIDController = m_drivingSparkMax.getClosedLoopController();
49-
m_turningPIDController = m_turningSparkMax.getClosedLoopController();
48+
m_drivingClosedLoopController = m_drivingSpark.getClosedLoopController();
49+
m_turningClosedLoopController = m_turningSpark.getClosedLoopController();
5050

5151
// Apply the respective configurations to the SPARKS. Reset parameters before
5252
// applying the configuration to bring the SPARK to a known good state. Persist
5353
// the settings to the SPARK to avoid losing them on a power cycle.
54-
m_drivingSparkMax.configure(Configs.MAXSwerveModule.drivingConfig, ResetMode.kResetSafeParameters,
54+
m_drivingSpark.configure(Configs.MAXSwerveModule.drivingConfig, ResetMode.kResetSafeParameters,
5555
PersistMode.kPersistParameters);
56-
m_turningSparkMax.configure(Configs.MAXSwerveModule.turningConfig, ResetMode.kResetSafeParameters,
56+
m_turningSpark.configure(Configs.MAXSwerveModule.turningConfig, ResetMode.kResetSafeParameters,
5757
PersistMode.kPersistParameters);
5858

5959
m_chassisAngularOffset = chassisAngularOffset;
@@ -100,9 +100,9 @@ public void setDesiredState(SwerveModuleState desiredState) {
100100
// Optimize the reference state to avoid spinning further than 90 degrees.
101101
correctedDesiredState.optimize(new Rotation2d(m_turningEncoder.getPosition()));
102102

103-
// Command driving and turning SPARKS MAX towards their respective setpoints.
104-
m_drivingPIDController.setReference(correctedDesiredState.speedMetersPerSecond, ControlType.kVelocity);
105-
m_turningPIDController.setReference(correctedDesiredState.angle.getRadians(), ControlType.kPosition);
103+
// Command driving and turning SPARKS towards their respective setpoints.
104+
m_drivingClosedLoopController.setReference(correctedDesiredState.speedMetersPerSecond, ControlType.kVelocity);
105+
m_turningClosedLoopController.setReference(correctedDesiredState.angle.getRadians(), ControlType.kPosition);
106106

107107
m_desiredState = desiredState;
108108
}

0 commit comments

Comments
 (0)