diff --git a/src/main/java/frc/lib/io/motor/MotorIORevSim.java b/src/main/java/frc/lib/io/motor/MotorIORevSim.java index 42552389..97a0934f 100644 --- a/src/main/java/frc/lib/io/motor/MotorIORevSim.java +++ b/src/main/java/frc/lib/io/motor/MotorIORevSim.java @@ -45,7 +45,7 @@ */ public class MotorIORevSim extends MotorIORev implements MotorIOSim { - public record RevFollowerFollower(int id, boolean opposesLeader) { + public record RevFollower(int id, boolean opposesLeader) { } public SparkBase motor; @@ -70,7 +70,7 @@ public MotorIORevSim( boolean isFlex, DCMotor gearBox, SparkBaseConfig config, - RevFollowerFollower... followerData) + RevFollower... followerData) { super(name, id, isFlex, config); diff --git a/src/main/java/frc/lib/util/LoggedTunableNumber.java b/src/main/java/frc/lib/util/LoggedTunableNumber.java index 0db3a4e9..50f4526c 100644 --- a/src/main/java/frc/lib/util/LoggedTunableNumber.java +++ b/src/main/java/frc/lib/util/LoggedTunableNumber.java @@ -69,6 +69,9 @@ public void initDefault(double defaultValue) if (!hasDefault) { hasDefault = true; this.defaultValue = defaultValue; + if (Constants.tuningMode) { + dashboardNumber = new LoggedNetworkNumber(key, defaultValue); + } } } @@ -81,22 +84,8 @@ public double get() { if (!hasDefault) { return 0.0; - } else if (Constants.tuningMode) { - if (dashboardNumber == null) { - dashboardNumber = new LoggedNetworkNumber(key, defaultValue); - } - double value = dashboardNumber.get(); - if (key.contains("STOW")) { - System.out.println("TunableNumber " + key + " returning dashboard value: " + value); - } - return value; } else { - if (key.contains("STOW")) { - System.out - .println("TunableNumber " + key + " returning default value: " + defaultValue - + " (tuningMode=" + Constants.tuningMode + ")"); - } - return defaultValue; + return Constants.tuningMode ? dashboardNumber.get() : defaultValue; } } diff --git a/src/main/java/frc/robot/subsystems/revRotary/RevRotary.java b/src/main/java/frc/robot/subsystems/revRotary/RevRotary.java index 45eae9f4..8e198a9a 100644 --- a/src/main/java/frc/robot/subsystems/revRotary/RevRotary.java +++ b/src/main/java/frc/robot/subsystems/revRotary/RevRotary.java @@ -14,14 +14,12 @@ import frc.lib.mechanisms.rotary.RotaryMechanism; import frc.lib.util.LoggedTunableNumber; import frc.lib.util.LoggerHelper; -import frc.robot.RobotState; import lombok.Getter; import lombok.RequiredArgsConstructor; public class RevRotary extends SubsystemBase { private final RotaryMechanism io; - private final RobotState robotstate; private static final LoggedTunableNumber STOW_SETPOINT = new LoggedTunableNumber("REV STOW", 0.0); @@ -46,7 +44,6 @@ public Angle getSetpoint() public RevRotary(RotaryMechanism io) { this.io = io; - this.robotstate = RobotState.getInstance(); setSetpoint(RevRotaryConstants.DEFAULT_SETPOINT).ignoringDisable(true).schedule(); }