From 2086531774af3abd3eaebbd72079f7064bcc5869 Mon Sep 17 00:00:00 2001 From: aidnem <99768676+aidnem@users.noreply.github.com> Date: Wed, 9 Oct 2024 20:05:46 -0400 Subject: [PATCH] update aim intake angle and format --- src/main/java/frc/robot/RobotContainer.java | 2 +- .../java/frc/robot/subsystems/scoring/ScoringSubsystem.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 19fcdb8..a3ed807 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -38,9 +38,9 @@ import frc.robot.subsystems.scoring.ShooterIO; import frc.robot.subsystems.scoring.ShooterIOSim; import frc.robot.subsystems.scoring.ShooterIOTalonFX; -import java.util.function.BooleanSupplier; import frc.robot.utils.feedforward.TuneG; import frc.robot.utils.feedforward.TuneS; +import java.util.function.BooleanSupplier; public class RobotContainer { PhoenixDrive drive; diff --git a/src/main/java/frc/robot/subsystems/scoring/ScoringSubsystem.java b/src/main/java/frc/robot/subsystems/scoring/ScoringSubsystem.java index f2f1f34..a2b6a70 100644 --- a/src/main/java/frc/robot/subsystems/scoring/ScoringSubsystem.java +++ b/src/main/java/frc/robot/subsystems/scoring/ScoringSubsystem.java @@ -134,7 +134,8 @@ public boolean atAimerGoalPosition() { } public boolean aimerReadyForNote() { - return Math.abs(aimerInputs.aimAngleRad) < 1e-10 && !shooterInputs.noteInShooter; + return Math.abs(aimerInputs.aimAngleRad - ScoringConstants.aimMinAngleRadians) < 1e-5 + && !shooterInputs.noteInShooter; } private void idle() { @@ -178,7 +179,7 @@ private void idle() { private void intake() { if (!aimerReadyForNote() && !shooterInputs.noteInShooter) { - aimerIo.setAimAngleRad(ScoringConstants.intakeAngleToleranceRadians, true); + aimerIo.setAimAngleRad(ScoringConstants.aimMinAngleRadians); } shooterIo.setKickerVolts(ScoringConstants.kickerIntakeVolts);