From 1f4440a383753be66c662bf5fcd0a0d57ebf2c2d Mon Sep 17 00:00:00 2001 From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com> Date: Fri, 3 Apr 2026 11:32:14 -0700 Subject: [PATCH] leds work, enabling showing we wo autos, and adding by trench shuttling interp key --- .../frc/robot/constants/ShuttleInterpolation.java | 2 ++ src/main/java/frc/robot/subsystems/LED/LED2.java | 13 ------------- .../java/frc/robot/subsystems/shooter/Shooter.java | 4 +++- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/src/main/java/frc/robot/constants/ShuttleInterpolation.java b/src/main/java/frc/robot/constants/ShuttleInterpolation.java index a2ec911..dac1640 100644 --- a/src/main/java/frc/robot/constants/ShuttleInterpolation.java +++ b/src/main/java/frc/robot/constants/ShuttleInterpolation.java @@ -21,11 +21,13 @@ public class ShuttleInterpolation { shooterVelocityMap.put(0.0, 9.0); shooterVelocityMap.put(4.0, 12.8); shooterVelocityMap.put(7.6, 19.0); + shooterVelocityMap.put(11.2, 25.2); // always shoot at low angle to ground. newHoodMap.put(0.0, 60.0); newHoodMap.put(27.99, 60.0); + } } diff --git a/src/main/java/frc/robot/subsystems/LED/LED2.java b/src/main/java/frc/robot/subsystems/LED/LED2.java index fa0b0cf..829dd29 100644 --- a/src/main/java/frc/robot/subsystems/LED/LED2.java +++ b/src/main/java/frc/robot/subsystems/LED/LED2.java @@ -87,19 +87,6 @@ public class LED2 extends SubsystemBase { private boolean flippy = true; - public void setColor() { - var alliance = DriverStation.getAlliance(); - if (alliance.isEmpty()) { - color = Color.kWhite; - } else if (alliance.get() == Alliance.Red) { - color = Color.kRed; - } else if (alliance.get() == Alliance.Blue) { - color = Color.kBlue; - } else { - color = Color.kWhite; - } - } - @Override public void periodic() { if (underSecsToFlip(5.0) && flippy) { diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java index 7acdde0..818fede 100644 --- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java +++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java @@ -107,10 +107,12 @@ public class Shooter extends SubsystemBase implements ShooterIO { if (!Constants.DISABLE_SMART_DASHBOARD) { SmartDashboard.putNumber("Shooter Speed Error (mps)", shooterTargetSpeed - actualWheelVelocity); - SmartDashboard.putString("WON AUTO?", (HubActive.wonAuto()) ? "WON" : "LOST"); SmartDashboard.putBoolean("Shooter At Speed", atTargetSpeed()); SmartDashboard.putBoolean("Shooter Running", shooterTargetSpeed > 0); } + + // keep this + SmartDashboard.putString("WON AUTO?", (HubActive.wonAuto()) ? "WON" : "LOST"); } /** -- 2.39.5