diff --git a/src/main/java/frc/robot/subsystems/AlgaeRoller/AlgaeRoller.java b/src/main/java/frc/robot/subsystems/AlgaeRoller/AlgaeRoller.java index d98fe6c..888983e 100644 --- a/src/main/java/frc/robot/subsystems/AlgaeRoller/AlgaeRoller.java +++ b/src/main/java/frc/robot/subsystems/AlgaeRoller/AlgaeRoller.java @@ -6,10 +6,10 @@ import edu.wpi.first.hal.HALUtil; import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import frc.robot.subsystems.Team360SubSystemBase; import org.littletonrobotics.junction.Logger; -public class AlgaeRoller extends SubsystemBase { +public class AlgaeRoller extends Team360SubSystemBase { private final AlgaeRollerIO io; private final AlgaeRollerIOInputsAutoLogged inputs = new AlgaeRollerIOInputsAutoLogged(); @@ -34,8 +34,8 @@ public Command setDutyCycleCmd(double duty) { public void periodic() { long periodicStartTime = HALUtil.getFPGATime(); io.updateInputs(inputs); - Logger.processInputs("Algae Intake Roller", inputs); + Logger.processInputs(getName(), inputs); long periodicLoopTime = HALUtil.getFPGATime() - periodicStartTime; - Logger.recordOutput("Algae Intake Roller: periodic loop time", (periodicLoopTime / 1000.0)); + Logger.recordOutput(getLogPreFix() + "periodic loop time", (periodicLoopTime / 1000.0)); } } diff --git a/src/main/java/frc/robot/subsystems/AlgaeTilt/AlgaeTilt.java b/src/main/java/frc/robot/subsystems/AlgaeTilt/AlgaeTilt.java index 7b57815..c72e5a0 100644 --- a/src/main/java/frc/robot/subsystems/AlgaeTilt/AlgaeTilt.java +++ b/src/main/java/frc/robot/subsystems/AlgaeTilt/AlgaeTilt.java @@ -6,11 +6,11 @@ import edu.wpi.first.hal.HALUtil; import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import frc.robot.subsystems.Team360SubSystemBase; import java.util.function.DoubleSupplier; import org.littletonrobotics.junction.Logger; -public class AlgaeTilt extends SubsystemBase { +public class AlgaeTilt extends Team360SubSystemBase { private final AlgaeTiltIO io; private final AlgaeTiltIOInputsAutoLogged inputs = new AlgaeTiltIOInputsAutoLogged(); @@ -55,8 +55,8 @@ public Command setDutyCycleCmd(DoubleSupplier duty) { public void periodic() { long periodicStartTime = HALUtil.getFPGATime(); io.updateInputs(inputs); - Logger.processInputs("Algae Tilt", inputs); + Logger.processInputs(getLogPreFix(), inputs); long periodicLoopTime = HALUtil.getFPGATime() - periodicStartTime; - Logger.recordOutput("Algae Tilt: periodic loop time", (periodicLoopTime / 1000.0)); + Logger.recordOutput(getLogPreFix() + "periodic loop time", (periodicLoopTime / 1000.0)); } } diff --git a/src/main/java/frc/robot/subsystems/ClimberWinch/ClimberWinch.java b/src/main/java/frc/robot/subsystems/ClimberWinch/ClimberWinch.java index a5129cd..ae40617 100644 --- a/src/main/java/frc/robot/subsystems/ClimberWinch/ClimberWinch.java +++ b/src/main/java/frc/robot/subsystems/ClimberWinch/ClimberWinch.java @@ -6,11 +6,11 @@ import edu.wpi.first.hal.HALUtil; import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import frc.robot.subsystems.Team360SubSystemBase; import java.util.function.DoubleSupplier; import org.littletonrobotics.junction.Logger; -public class ClimberWinch extends SubsystemBase { +public class ClimberWinch extends Team360SubSystemBase { private final ClimberWinchIO io; private final ClimberWinchIOInputsAutoLogged inputs = new ClimberWinchIOInputsAutoLogged(); @@ -52,8 +52,8 @@ public Command setPositionCmd(double position) { public void periodic() { long periodicStartTime = HALUtil.getFPGATime(); io.updateInputs(inputs); - Logger.processInputs("Climber", inputs); + Logger.processInputs(getLogPreFix(), inputs); long periodicLoopTime = HALUtil.getFPGATime() - periodicStartTime; - Logger.recordOutput("Climber: periodic loop time", (periodicLoopTime / 1000.0)); + Logger.recordOutput(getLogPreFix() + "periodic loop time", (periodicLoopTime / 1000.0)); } } diff --git a/src/main/java/frc/robot/subsystems/Servo/Servo.java b/src/main/java/frc/robot/subsystems/Servo/Servo.java index a639b7c..d6d0643 100644 --- a/src/main/java/frc/robot/subsystems/Servo/Servo.java +++ b/src/main/java/frc/robot/subsystems/Servo/Servo.java @@ -7,11 +7,11 @@ import edu.wpi.first.hal.HALUtil; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; -import edu.wpi.first.wpilibj2.command.SubsystemBase; +import frc.robot.subsystems.Team360SubSystemBase; import java.util.function.DoubleSupplier; import org.littletonrobotics.junction.Logger; -public class Servo extends SubsystemBase { +public class Servo extends Team360SubSystemBase { private final ServoIO io; private final ServoIOInputsAutoLogged inputs = new ServoIOInputsAutoLogged(); @@ -46,9 +46,9 @@ public Command setSpeedCmd(DoubleSupplier speed) { public void periodic() { long periodicStartTime = HALUtil.getFPGATime(); io.updateInputs(inputs); - Logger.processInputs("Servo", inputs); + Logger.processInputs(getLogPreFix(), inputs); long periodicLoopTime = HALUtil.getFPGATime() - periodicStartTime; - Logger.recordOutput("Servo: periodic loop time", (periodicLoopTime / 1000.0)); + Logger.recordOutput(getLogPreFix() + "periodic loop time", (periodicLoopTime / 1000.0)); // This method will be called once per scheduler run } } diff --git a/src/main/java/frc/robot/subsystems/Team360SubSystemBase.java b/src/main/java/frc/robot/subsystems/Team360SubSystemBase.java new file mode 100644 index 0000000..feddcf7 --- /dev/null +++ b/src/main/java/frc/robot/subsystems/Team360SubSystemBase.java @@ -0,0 +1,9 @@ +package frc.robot.subsystems; + +import edu.wpi.first.wpilibj2.command.SubsystemBase; + +public abstract class Team360SubSystemBase extends SubsystemBase { + protected String getLogPreFix() { + return getName() + ":"; + } +}