From 2fa58839f7fea445010eb0a522f6a1dac446c2f9 Mon Sep 17 00:00:00 2001 From: iefomit Date: Sun, 5 Apr 2026 21:35:17 -0700 Subject: [PATCH] spelling fixes etc --- src/main/java/frc/robot/RobotContainer.java | 9 +++------ .../frc/robot/commands/gpm/RunSpindexer.java | 1 - .../robot/subsystems/LED/{LED2.java => LED.java} | 5 ++--- .../robot/subsystems/drivetrain/Drivetrain.java | 4 ++-- .../frc/robot/subsystems/drivetrain/Module.java | 16 ++++++++-------- .../robot/util/BrownOut/BrownOutConstants.java | 2 +- 6 files changed, 16 insertions(+), 21 deletions(-) rename src/main/java/frc/robot/subsystems/LED/{LED2.java => LED.java} (98%) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 5dcbaee..51f3dc5 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -37,7 +37,7 @@ import frc.robot.controls.Operator; import frc.robot.controls.PS5ControllerDriverConfig; import frc.robot.subsystems.Climb.LinearClimb; import frc.robot.subsystems.Intake.Intake; -import frc.robot.subsystems.LED.LED2; +import frc.robot.subsystems.LED.LED; import frc.robot.subsystems.drivetrain.Drivetrain; import frc.robot.subsystems.drivetrain.GyroIOPigeon2; import frc.robot.subsystems.hood.Hood; @@ -74,7 +74,7 @@ public class RobotContainer { private BaseDriverConfig driver = null; private Operator operator = null; private LinearClimb linearClimb = null; - private LED2 led = null; + private LED led = null; // TODO: move to correct robot and put the correct port? private PS5Controller ps5 = new PS5Controller(0); @@ -124,9 +124,7 @@ public class RobotContainer { case PrimeJr: // AKA Valence spindexer = new Spindexer(); intake = new Intake(); - // led = new LED(); - // led.setDefaultCommand(new LEDDefaultCommand(led)); - led = new LED2(); + led = new LED(); case WaffleHouse: // AKA Betabot turret = new Turret(); @@ -142,7 +140,6 @@ public class RobotContainer { // fall-through case Vivace: - // linearClimb = new LinearClimb(); case Phil: // AKA "IHOP" diff --git a/src/main/java/frc/robot/commands/gpm/RunSpindexer.java b/src/main/java/frc/robot/commands/gpm/RunSpindexer.java index adc423f..d730b69 100644 --- a/src/main/java/frc/robot/commands/gpm/RunSpindexer.java +++ b/src/main/java/frc/robot/commands/gpm/RunSpindexer.java @@ -5,7 +5,6 @@ import edu.wpi.first.math.filter.Debouncer.DebounceType; import edu.wpi.first.wpilibj.Timer; import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.Command; -import edu.wpi.first.wpilibj2.command.ScheduleCommand; import frc.robot.constants.Constants; import frc.robot.constants.IntakeConstants; import frc.robot.subsystems.Intake.Intake; diff --git a/src/main/java/frc/robot/subsystems/LED/LED2.java b/src/main/java/frc/robot/subsystems/LED/LED.java similarity index 98% rename from src/main/java/frc/robot/subsystems/LED/LED2.java rename to src/main/java/frc/robot/subsystems/LED/LED.java index 1d7f91f..b1e1062 100644 --- a/src/main/java/frc/robot/subsystems/LED/LED2.java +++ b/src/main/java/frc/robot/subsystems/LED/LED.java @@ -11,7 +11,6 @@ import com.ctre.phoenix6.controls.RainbowAnimation; import com.ctre.phoenix6.controls.RgbFadeAnimation; import com.ctre.phoenix6.controls.SolidColor; import com.ctre.phoenix6.controls.StrobeAnimation; -import com.ctre.phoenix6.controls.TorqueCurrentFOC; import com.ctre.phoenix6.controls.TwinkleAnimation; import com.ctre.phoenix6.hardware.CANdle; import com.ctre.phoenix6.signals.Enable5VRailValue; @@ -31,7 +30,7 @@ import frc.robot.constants.Constants; import frc.robot.constants.IdConstants; import frc.robot.util.HubActive; -public class LED2 extends SubsystemBase { +public class LED extends SubsystemBase { private CANdle candle; public static final int stripLength = 67; @@ -41,7 +40,7 @@ public class LED2 extends SubsystemBase { private Color color; - public LED2() { + public LED() { candle = new CANdle(IdConstants.CANDLE_ID, Constants.RIO_CAN); CANdleConfigurator configurator = candle.getConfigurator(); diff --git a/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java b/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java index 425d86d..dd7fbf5 100644 --- a/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java +++ b/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java @@ -431,9 +431,9 @@ public class Drivetrain extends SubsystemBase { } // for current limit setting (brownout protection) - public void applyNewModuleCurrents(double steerCurrent, double driveCurren) { + public void applyNewModuleCurrents(double steerCurrent, double driveCurrent) { for (Module module : modules) { // iterate over our modules - module.setNewCurrentLimit(steerCurrent, driveCurren); + module.setNewCurrentLimit(steerCurrent, driveCurrent); } } diff --git a/src/main/java/frc/robot/subsystems/drivetrain/Module.java b/src/main/java/frc/robot/subsystems/drivetrain/Module.java index f9db325..49910f1 100644 --- a/src/main/java/frc/robot/subsystems/drivetrain/Module.java +++ b/src/main/java/frc/robot/subsystems/drivetrain/Module.java @@ -359,14 +359,14 @@ public class Module implements ModuleIO{ angleMotor.getConfigurator().apply(steerConfig); // apply // drive - CurrentLimitsConfigs dirveConfig = new CurrentLimitsConfigs(); - dirveConfig.SupplyCurrentLimitEnable = DriveConstants.DRIVE_ENABLE_CURRENT_LIMIT; - dirveConfig.SupplyCurrentLimit = currentDrive; - dirveConfig.SupplyCurrentLowerLimit = currentDrive; - dirveConfig.SupplyCurrentLowerTime = DriveConstants.DRIVE_PEAK_CURRENT_DURATION; - dirveConfig.StatorCurrentLimit = currentDrive; - dirveConfig.StatorCurrentLimitEnable = DriveConstants.DRIVE_ENABLE_CURRENT_LIMIT; - driveMotor.getConfigurator().apply(dirveConfig); // apply + CurrentLimitsConfigs driveConfig = new CurrentLimitsConfigs(); + driveConfig.SupplyCurrentLimitEnable = DriveConstants.DRIVE_ENABLE_CURRENT_LIMIT; + driveConfig.SupplyCurrentLimit = currentDrive; + driveConfig.SupplyCurrentLowerLimit = currentDrive; + driveConfig.SupplyCurrentLowerTime = DriveConstants.DRIVE_PEAK_CURRENT_DURATION; + driveConfig.StatorCurrentLimit = currentDrive; + driveConfig.StatorCurrentLimitEnable = DriveConstants.DRIVE_ENABLE_CURRENT_LIMIT; + driveMotor.getConfigurator().apply(driveConfig); // apply } private void configDriveMotor() { diff --git a/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java b/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java index a48a97c..f9dc0c6 100644 --- a/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java +++ b/src/main/java/frc/robot/util/BrownOut/BrownOutConstants.java @@ -83,4 +83,4 @@ public class BrownOutConstants { DriveConstants.DRIVE_PEAK_CURRENT_LIMIT * 0.45 // lower drive movement ); -} \ No newline at end of file +} -- 2.39.5