From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com> Date: Sun, 1 Mar 2026 04:42:09 +0000 (-0800) Subject: a X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=2a02e0e4ae8ffd70ad58ffc35553855d9b242b10;p=FRC2026.git a --- diff --git a/src/main/java/frc/robot/commands/gpm/Superstructure.java b/src/main/java/frc/robot/commands/gpm/Superstructure.java index e4aaf45..bdffb1b 100644 --- a/src/main/java/frc/robot/commands/gpm/Superstructure.java +++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java @@ -1,7 +1,5 @@ package frc.robot.commands.gpm; -import static edu.wpi.first.units.Units.Rotation; - import org.littletonrobotics.junction.Logger; import edu.wpi.first.math.MathUtil; @@ -27,9 +25,7 @@ import frc.robot.subsystems.spindexer.Spindexer; import frc.robot.subsystems.turret.Turret; import frc.robot.subsystems.turret.TurretConstants; import frc.robot.util.PhaseManager; -import frc.robot.util.PhaseManager.CurrentState; import frc.robot.util.ShooterPhysics; -import frc.robot.util.ShooterPhysics.Constraints; import frc.robot.util.ShooterPhysics.TurretState; public class Superstructure extends Command { @@ -39,9 +35,6 @@ public class Superstructure extends Command { private Shooter shooter; private Spindexer spindexer; - //TODO: find maximum interpolation - private Constraints shooterConstraints = new Constraints(Units.inchesToMeters(80.0), 67676767, HoodConstants.MIN_ANGLE, HoodConstants.MAX_ANGLE); - private double turretSetpoint; private double hoodSetpoint; diff --git a/src/main/java/frc/robot/constants/ShotInterpolation.java b/src/main/java/frc/robot/constants/ShotInterpolation.java index fc6c2b6..a132a67 100644 --- a/src/main/java/frc/robot/constants/ShotInterpolation.java +++ b/src/main/java/frc/robot/constants/ShotInterpolation.java @@ -1,8 +1,6 @@ package frc.robot.constants; import edu.wpi.first.math.interpolation.InterpolatingDoubleTreeMap; -import edu.wpi.first.math.util.Units; -import frc.robot.subsystems.hood.HoodConstants; public class ShotInterpolation { public static final InterpolatingDoubleTreeMap timeOfFlightMap = new InterpolatingDoubleTreeMap(); @@ -44,7 +42,6 @@ public class ShotInterpolation { exitVelocityMap.put(10.0, 19.2); exitVelocityMap.put(11.0, 26.0); exitVelocityMap.put(25.0, 25.0* 3.2); - //exitVelocityMap.put(null, null); shooterVelocityMap.put(1.49, 11.5); shooterVelocityMap.put(2.09, 12.5); diff --git a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java index aa53754..216bce9 100644 --- a/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java +++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java @@ -12,7 +12,6 @@ import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; import edu.wpi.first.wpilibj2.command.StartEndCommand; import edu.wpi.first.wpilibj2.command.WaitCommand; import frc.robot.Robot; -import frc.robot.commands.gpm.AutoShootCommand; import frc.robot.commands.gpm.ClimbDriveCommand; import frc.robot.commands.gpm.IntakeMovementCommand; import frc.robot.commands.gpm.ReverseMotors; @@ -23,7 +22,6 @@ import frc.robot.subsystems.Climb.LinearClimb; import frc.robot.subsystems.Intake.Intake; import frc.robot.subsystems.drivetrain.Drivetrain; import frc.robot.subsystems.hood.Hood; -import frc.robot.subsystems.hood.HoodConstants; import frc.robot.subsystems.shooter.Shooter; import frc.robot.subsystems.spindexer.Spindexer; import frc.robot.subsystems.turret.Turret;