From 63f739645e24ec46b9b6a86f73610d4e32c4affe Mon Sep 17 00:00:00 2001 From: Kevin Cooney Date: Thu, 6 Nov 2025 19:13:24 -0800 Subject: [PATCH] Revert "Made methods non final, so we can override them (#93)" This reverts commit a820ca29b1719e3a3b2075ec720ee4aa7a86c0cb. --- .../lib2813/subsystems/MotorSubsystem.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/src/main/java/com/team2813/lib2813/subsystems/MotorSubsystem.java b/lib/src/main/java/com/team2813/lib2813/subsystems/MotorSubsystem.java index bac2e7e3..9901c463 100644 --- a/lib/src/main/java/com/team2813/lib2813/subsystems/MotorSubsystem.java +++ b/lib/src/main/java/com/team2813/lib2813/subsystems/MotorSubsystem.java @@ -108,7 +108,7 @@ protected MotorSubsystem(MotorSubsystemConfiguration builder) { * * @param position the position to go to. */ - public void setSetpoint(T position) { + public final void setSetpoint(T position) { if (!isEnabled()) { enable(); } @@ -126,7 +126,7 @@ public final Command setSetpointCommand(T setpoint) { } /** Returns the current setpoint as an angle. */ - public Angle getSetpoint() { + public final Angle getSetpoint() { return rotationUnit.of(controller.getSetpoint()); } @@ -141,13 +141,13 @@ public final boolean atPosition() { *

Additionally, this method disables PID control of the subsystem */ @Override - public void set(ControlMode mode, double demand, double feedForward) { + public final void set(ControlMode mode, double demand, double feedForward) { isEnabled = false; motor.set(mode, demand, feedForward); } @Override - public Current getAppliedCurrent() { + public final Current getAppliedCurrent() { return motor.getAppliedCurrent(); } @@ -160,7 +160,7 @@ public Current getAppliedCurrent() { *

If this method is called after the motor drive toward setpoint was interrupted by user * interruption, the motor will resume its movement towards the last set setpoint. */ - public void enable() { + public final void enable() { isEnabled = true; } @@ -171,7 +171,7 @@ public void enable() { * current setpoint. */ @Override - public void stopMotor() { + public final void stopMotor() { isEnabled = false; motor.stopMotor(); } @@ -185,7 +185,7 @@ public void stopMotor() { * * @return Whether the PID controller is engaged. */ - public boolean isEnabled() { + public final boolean isEnabled() { return isEnabled; } @@ -196,7 +196,7 @@ public boolean isEnabled() { * the provided value. */ @Override - public void set(ControlMode mode, double demand) { + public final void set(ControlMode mode, double demand) { isEnabled = false; motor.set(mode, demand); } @@ -248,17 +248,17 @@ protected final double getMeasurement() { } @Override - public Angle getPositionMeasure() { + public final Angle getPositionMeasure() { return encoder.getPositionMeasure(); } @Override - public void setPosition(Angle position) { + public final void setPosition(Angle position) { encoder.setPosition(position); } @Override - public AngularVelocity getVelocityMeasure() { + public final AngularVelocity getVelocityMeasure() { return encoder.getVelocityMeasure(); }