Skip to content

Commit 1f19826

Browse files
committed
Build changes
1 parent 7025481 commit 1f19826

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

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

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public class Simulator extends SubsystemBase {
3030
private final TeleopScenario teleopScenario = TeleopScenario.LOOK_FROM_APRILTAG;
3131
private final Map<Integer, Double> axisValues = new HashMap<Integer, Double>();
3232
boolean releasedbutton = true;
33-
public boolean slipwheel = false;
34-
33+
public static boolean slipwheel = false;
3534

3635
private enum Anomaly {
3736
NONE,
@@ -315,9 +314,12 @@ private List<SimEvent> buildTeleopScenario() {
315314
new SimEvent(t += 0.1, "Score complete", EventType.RELEASE_B));
316315
case LOOK_FROM_APRILTAG:
317316
return List.of(
318-
new SimEvent(t, "Enable wheel slip", EventType.ENABLE_WHEEL_SLIP),
317+
new SimEvent(t, "Enable wheel slip", EventType.ENABLE_WHEEL_SLIP),
319318
new SimEvent(
320-
t += 1.0, "Start pose", EventType.SET_POSE, new Pose2d(15.0, 2.0, Rotation2d.k180deg)),
319+
t += 1.0,
320+
"Start pose",
321+
EventType.SET_POSE,
322+
new Pose2d(15.0, 2.0, Rotation2d.k180deg)),
321323
new SimEvent(
322324
t += 2.0,
323325
"Drive to AprilTag",
@@ -336,7 +338,7 @@ private List<SimEvent> buildTeleopScenario() {
336338
EventType.MOVE_JOYSTICK_DRIVE,
337339
new Pose2d(0, -0.5, Rotation2d.k180deg)),
338340
new SimEvent(t += 0.5, "Stop", EventType.STOP_JOYSTICK),
339-
new SimEvent(t, "Disable wheel slip", EventType.DISABLE_WHEEL_SLIP));
341+
new SimEvent(t, "Disable wheel slip", EventType.DISABLE_WHEEL_SLIP));
340342
default:
341343
return List.of();
342344
}
@@ -358,7 +360,6 @@ private List<SimEvent> buildTeleopScenario() {
358360
boolean releaseRightTrigger;
359361
int POVPressed;
360362

361-
362363
private final Drive drive;
363364
private final EndEffectorIOSim endEffectorIOSim;
364365
private final IndexerIOSim indexerIOSim;
@@ -611,12 +612,12 @@ public void periodic() {
611612
case STOP_JOYSTICK:
612613
stopJoystick();
613614
break;
614-
case ENABLE_WHEEL_SLIP:
615-
slipwheel = true;
616-
break;
617-
case DISABLE_WHEEL_SLIP:
618-
slipwheel = false;
619-
break;
615+
case ENABLE_WHEEL_SLIP:
616+
slipwheel = true;
617+
break;
618+
case DISABLE_WHEEL_SLIP:
619+
slipwheel = false;
620+
break;
620621
}
621622
}
622623
if (iterator.hasNext()) {
@@ -701,7 +702,7 @@ private void releaseTrigger(ControllerAxis axis) {
701702
DriverStationSim.notifyNewData();
702703
}
703704

704-
public static boolean wheelSlip() {
705-
return slipwheel;
705+
public static boolean wheelSlip() {
706+
return slipwheel;
706707
}
707708
}

src/main/java/frc/robot/subsystems/drive/Drive.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ private SwerveModulePosition[] getModulePositions() {
258258
states[i] = modules[i].getPosition();
259259
if (!(Constants.currentMode == RobotMode.SIM) || Simulator.wheelSlip()) {
260260
states[i].distanceMeters *= Constants.Drive.modulePositionScaling[i];
261-
}
261+
}
262262
}
263263
return states;
264264
}

src/main/java/frc/robot/subsystems/drive/ModuleIOSim.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public class ModuleIOSim implements ModuleIO {
1010
private double driveVelMetersPerSec;
1111
private Rotation2d turnPos = Rotation2d.kZero;
1212

13-
1413
public ModuleIOSim(SwerveModuleConstants constants) {
1514
this.constants = constants;
1615
}

0 commit comments

Comments
 (0)