From 40119f141960cf3b97f84cd69d4ba7f6c4f66815 Mon Sep 17 00:00:00 2001 From: iefomit Date: Mon, 20 Apr 2026 07:47:30 -0700 Subject: [PATCH] quick format --- .../robot/subsystems/PowerControl/Battery.java | 15 +++++++++++---- .../PowerControl/BatteryConstants.java | 2 +- .../PowerControl/BreakerConstants.java | 12 ++++++------ .../subsystems/PowerControl/EMABreaker.java | 17 ++++++++++------- 4 files changed, 28 insertions(+), 18 deletions(-) diff --git a/src/main/java/frc/robot/subsystems/PowerControl/Battery.java b/src/main/java/frc/robot/subsystems/PowerControl/Battery.java index e6dda68..78af853 100644 --- a/src/main/java/frc/robot/subsystems/PowerControl/Battery.java +++ b/src/main/java/frc/robot/subsystems/PowerControl/Battery.java @@ -5,17 +5,24 @@ import edu.wpi.first.wpilibj2.command.SubsystemBase; public class Battery extends SubsystemBase { private double voltage; + public Battery() { updateVoltageFromBattery(); } - private void updateVoltageFromBattery() { + private void updateVoltageFromBattery() { voltage = RobotController.getBatteryVoltage(); } - public double getVoltage() { return voltage; } - public double voltsTillBrownOut() { return voltage - RobotController.getBrownoutVoltage(); } - public double toBrownOut() { + public double getVoltage() { + return voltage; + } + + public double voltsTillBrownOut() { + return voltage - RobotController.getBrownoutVoltage(); + } + + public double toBrownOut() { // percent of volts we've got left over what we had to start with return voltsTillBrownOut() / (BatteryConstants.MAX_STARTING_VOLTS - RobotController.getBrownoutVoltage()); } diff --git a/src/main/java/frc/robot/subsystems/PowerControl/BatteryConstants.java b/src/main/java/frc/robot/subsystems/PowerControl/BatteryConstants.java index 0f83c59..cad6d86 100644 --- a/src/main/java/frc/robot/subsystems/PowerControl/BatteryConstants.java +++ b/src/main/java/frc/robot/subsystems/PowerControl/BatteryConstants.java @@ -1,5 +1,5 @@ package frc.robot.subsystems.PowerControl; public class BatteryConstants { - public static final double MAX_STARTING_VOLTS = 12.5; // V + public static final double MAX_STARTING_VOLTS = 12.5; // V } diff --git a/src/main/java/frc/robot/subsystems/PowerControl/BreakerConstants.java b/src/main/java/frc/robot/subsystems/PowerControl/BreakerConstants.java index 8d57e45..d7f183b 100644 --- a/src/main/java/frc/robot/subsystems/PowerControl/BreakerConstants.java +++ b/src/main/java/frc/robot/subsystems/PowerControl/BreakerConstants.java @@ -16,10 +16,10 @@ public class BreakerConstants { public static final double WARNING_PERCENTAGE = 0.6; // percent that the system reacts to approaching thresholds // ports - public static int[] DRIVETRAIN_PORTS = {8,9,10,11,18,19,0,1}; // bls, bld, fld, fls, frs, frd, brd, brs - public static int[] TURRET_PORTS = {2}; - public static int[] INTAKE_PORTS = {15,14,13}; // right, left, roller - public static int[] SHOOTER_PORTS = {3,4}; // left, right - public static int[] HOOD_PORTS = {5}; // shooter - public static int[] SPINDEXER_PORTS = {12}; // spindexer (unupdated on sheets) + public static int[] DRIVETRAIN_PORTS = { 8, 9, 10, 11, 18, 19, 0, 1 }; // bls, bld, fld, fls, frs, frd, brd, brs + public static int[] TURRET_PORTS = { 2 }; + public static int[] INTAKE_PORTS = { 15, 14, 13 }; // right, left, roller + public static int[] SHOOTER_PORTS = { 3, 4 }; // left, right + public static int[] HOOD_PORTS = { 5 }; // shooter + public static int[] SPINDEXER_PORTS = { 12 }; // spindexer (unupdated on sheets) } diff --git a/src/main/java/frc/robot/subsystems/PowerControl/EMABreaker.java b/src/main/java/frc/robot/subsystems/PowerControl/EMABreaker.java index 39770fb..2ee9e95 100644 --- a/src/main/java/frc/robot/subsystems/PowerControl/EMABreaker.java +++ b/src/main/java/frc/robot/subsystems/PowerControl/EMABreaker.java @@ -34,13 +34,13 @@ public class EMABreaker extends SubsystemBase { Current w = new Current(); // create a filter for the threshold w.tau = tau; w.threshold = threshold; - w.alpha = 1 - Math.exp(-Constants.LOOP_TIME / tau); // 1 - e^(-0.02/1) = 0.0198, 1 - e^(-0.02/2) = 0.00995 + w.alpha = 1 - Math.exp(-Constants.LOOP_TIME / tau); // 1 - e^(-0.02/1) = 0.0198, 1 - e^(-0.02/2) = 0.00995 filters.add(w); } // subsystems - for (int i=0; i