diff --git a/build.gradle b/build.gradle index 5fa049c3..5639c521 100644 --- a/build.gradle +++ b/build.gradle @@ -80,7 +80,7 @@ dependencies { simulationRelease wpi.sim.enableRelease() testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1' - implementation "com.github.deepbluerobotics:lib199:3170c4433a775e90d6110334bc5658e573317ab6" + implementation "com.github.deepbluerobotics:lib199:400693b52180c82a1f26c08025bc12f144b930f9" } test { diff --git a/src/main/java/org/carlmontrobotics/subsystems/Arm.java b/src/main/java/org/carlmontrobotics/subsystems/Arm.java index 096c7790..4984d6a2 100644 --- a/src/main/java/org/carlmontrobotics/subsystems/Arm.java +++ b/src/main/java/org/carlmontrobotics/subsystems/Arm.java @@ -86,7 +86,7 @@ public class Arm extends SubsystemBase { private ShuffleboardTab sysIdTab = Shuffleboard.getTab("arm SysID"); private boolean setPIDOff; - private SimDouble positionSim; + private SimDouble rotationsSim; public Arm() { // weird math stuff @@ -162,8 +162,8 @@ public Arm() { armProfile = new TrapezoidProfile(TRAP_CONSTRAINTS); SmartDashboard.putBoolean("arm is at pos", false); if (RobotBase.isSimulation()) { - positionSim = new SimDeviceSim("SparkMax[%d]_AbsoluteEncoder".formatted(ARM_MOTOR_PORT_MASTER)) - .getDouble("Position"); + rotationsSim = new SimDeviceSim("CANDutyCycle:CANSparkMax", + ARM_MOTOR_PORT_MASTER).getDouble("position"); } } @@ -469,11 +469,12 @@ public void setDefaultCommand(TeleopArm teleopArm, Object object) { @Override public void simulationPeriodic() { - // Fake goaling to the goal instantaneously - if (positionSim != null) { - positionSim.set((goalState.position - armMasterEncoder.getZeroOffset()) - * (armMasterEncoder.getInverted() ? -1.0 : 1.0) - / armMasterEncoder.getPositionConversionFactor() * MockedEncoder.NEO_BUILTIN_ENCODER_CPR); + // Fake going to the goal instantaneously + if (rotationsSim != null) { + rotationsSim + .set((goalState.position - armMasterEncoder.getZeroOffset()) + * (armMasterEncoder.getInverted() ? -1.0 : 1.0) + / armMasterEncoder.getPositionConversionFactor()); } } }