diff --git a/lib2813 b/lib2813 index bf7754c4..35e4960e 160000 --- a/lib2813 +++ b/lib2813 @@ -1 +1 @@ -Subproject commit bf7754c4d23a24a8f944a7658401b8e3679c1c1e +Subproject commit 35e4960e170bd2926da60c4078b87cd3f73e43fc diff --git a/src/main/java/com/team2813/subsystems/Elevator.java b/src/main/java/com/team2813/subsystems/Elevator.java index f679a411..c410f48e 100644 --- a/src/main/java/com/team2813/subsystems/Elevator.java +++ b/src/main/java/com/team2813/subsystems/Elevator.java @@ -16,6 +16,7 @@ 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! */ @@ -51,6 +52,11 @@ 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 938ffacd..58f57215 100644 --- a/src/main/java/com/team2813/subsystems/GroundIntakePivot.java +++ b/src/main/java/com/team2813/subsystems/GroundIntakePivot.java @@ -17,6 +17,7 @@ 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; @@ -54,6 +55,11 @@ 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 1c13a539..b872778e 100644 --- a/src/main/java/com/team2813/subsystems/IntakePivot.java +++ b/src/main/java/com/team2813/subsystems/IntakePivot.java @@ -13,6 +13,7 @@ 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; /** @@ -45,6 +46,11 @@ 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);