diff --git a/lib2813 b/lib2813 index 210dcf33..546f5b0e 160000 --- a/lib2813 +++ b/lib2813 @@ -1 +1 @@ -Subproject commit 210dcf336b295eb981d529ccc5719eb46756a654 +Subproject commit 546f5b0e134695bc8ac1be7c89f7d0f9f6b1a1eb diff --git a/src/main/java/com/team2813/subsystems/Elevator.java b/src/main/java/com/team2813/subsystems/Elevator.java index c410f48e..f679a411 100644 --- a/src/main/java/com/team2813/subsystems/Elevator.java +++ b/src/main/java/com/team2813/subsystems/Elevator.java @@ -16,7 +16,6 @@ import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.units.Units; import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.Current; import java.util.function.Supplier; /** This is the Elevator. His name is Pablo. Please be kind to him and say hi. Have a nice day! */ @@ -52,11 +51,6 @@ protected void useOutput(double output, double setpoint) { super.useOutput(MathUtil.clamp(output, -6, 6), setpoint); } - @Override - public Current getAppliedCurrent() { - return motor.getAppliedCurrent(); - } - public enum Position implements Supplier { BOTTOM(-0.212500), TEST(10), diff --git a/src/main/java/com/team2813/subsystems/GroundIntakePivot.java b/src/main/java/com/team2813/subsystems/GroundIntakePivot.java index 58f57215..938ffacd 100644 --- a/src/main/java/com/team2813/subsystems/GroundIntakePivot.java +++ b/src/main/java/com/team2813/subsystems/GroundIntakePivot.java @@ -17,7 +17,6 @@ import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.units.Units; import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.Current; import edu.wpi.first.wpilibj.DriverStation; import java.util.function.Supplier; @@ -55,11 +54,6 @@ private static PIDMotor pivotMotor() { return pivotMotor; } - @Override - public Current getAppliedCurrent() { - return motor.getAppliedCurrent(); - } - @Override public void periodic() { super.periodic(); diff --git a/src/main/java/com/team2813/subsystems/IntakePivot.java b/src/main/java/com/team2813/subsystems/IntakePivot.java index b872778e..1c13a539 100644 --- a/src/main/java/com/team2813/subsystems/IntakePivot.java +++ b/src/main/java/com/team2813/subsystems/IntakePivot.java @@ -13,7 +13,6 @@ import edu.wpi.first.networktables.NetworkTableInstance; import edu.wpi.first.units.Units; import edu.wpi.first.units.measure.Angle; -import edu.wpi.first.units.measure.Current; import java.util.function.Supplier; /** @@ -46,11 +45,6 @@ protected void useOutput(double output, double setPoint) { super.useOutput(output, setPoint); } - @Override - public Current getAppliedCurrent() { - return motor.getAppliedCurrent(); - } - private static PIDMotor pivotMotor() { TalonFXWrapper pivotMotor = new TalonFXWrapper(com.team2813.Constants.INTAKE_PIVOT, InvertType.COUNTER_CLOCKWISE);