Skip to content

Commit 14ea516

Browse files
committed
+10 points for nick
1 parent 9c0fda6 commit 14ea516

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/main/java/frc/robot/subsystems/swerve/SwerveDriveSubsystem.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ public Command steerDynamicSysIDCommand(SysIdRoutine.Direction direction) {
303303

304304
@Override
305305
public void periodic() {
306-
logValues();
307-
308306
List<EstimatedRobotPose> estimatedRobotPoses = cameraPoseDataSupplier.apply(getPose());
309307
for (EstimatedRobotPose estimatedRobotPose : estimatedRobotPoses) {
310308
if (!DriverStation.isAutonomousEnabled()) {
311309
poseEstimator.addVisionMeasurement(
312310
estimatedRobotPose.estimatedPose.toPose2d(), estimatedRobotPose.timestampSeconds);
313311
}
314312
}
313+
314+
logValues();
315315
}
316316

317317
private void logValues() {

src/main/java/frc/robot/subsystems/swerve/SwerveModule.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -389,10 +389,11 @@ public void setDesiredState(SwerveModuleState state, boolean activeSteer, boolea
389389

390390
controlModeEntry.append(SwerveModuleControlMode.NORMAL.logValue);
391391

392-
state = SwerveModuleState.optimize(state, getSteerAngle());
392+
Rotation2d steerAngle = getSteerAngle();
393+
state = SwerveModuleState.optimize(state, steerAngle);
393394

394395
// Account for steer error to reduce skew
395-
double steerErrorRadians = state.angle.getRadians() - getSteerAngle().getRadians();
396+
double steerErrorRadians = state.angle.getRadians() - steerAngle.getRadians();
396397
double cosineScalar = Math.cos(steerErrorRadians);
397398
if (cosineScalar < 0.0) {
398399
cosineScalar = 0.0;
@@ -430,7 +431,7 @@ private void setSteerReference(double targetAngleRadians, boolean activeSteer) {
430431

431432
if (activeSteer) {
432433
steerMotor.setControl(
433-
steerMotionMagicExpoVoltage.withPosition(targetAngleRadians * steerConversion));
434+
steerMotionMagicExpoVoltage.withPosition(targetAngleRadians / steerConversion));
434435
} else {
435436
steerMotor.setVoltage(0.0);
436437
}

0 commit comments

Comments
 (0)