Simple operator stuff for smart dashboard during comp

Works for tof, offset (hood & turret), shooter modified, power modifier

diff --git a/src/main/java/frc/robot/commands/gpm/Superstructure.java b/src/main/java/frc/robot/commands/gpm/Superstructure.java
index 5c483485d4602bb4911bd4ab8060cf3214b0dde2..4452550645a74b26aab13baa232aa5d087d6ba99 100644 (file)
--- a/src/main/java/frc/robot/commands/gpm/Superstructure.java
+++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java
@@ -53,7 +53,7 @@ public class Superstructure extends Command {
 
     private TurretState goalState;
 
-    private final double phaseDelay = 0.03; // Extrapolation delay due to latency
+    private double phaseDelay = 0.03; // Extrapolation delay due to latency
 
     private Translation2d target = FieldConstants.HUB_BLUE.toTranslation2d();
 
@@ -205,13 +205,12 @@ public class Superstructure extends Command {
 
     @Override
     public void execute() {
-        TOFAdjustment = SmartDashboard.getNumber("TOF Adjustment", TOFAdjustment);
-        SmartDashboard.putNumber("TOF Adjustment", TOFAdjustment);
-
-        hoodOffset = SmartDashboard.getNumber("Hood Offset", hoodOffset);
-        SmartDashboard.putNumber("Hood Offset", hoodOffset);
-        turretOffset = SmartDashboard.getNumber("Turret Offset", turretOffset);
-        SmartDashboard.putNumber("Turret Offset", turretOffset);
+        TOFAdjustment = SmartDashboard.getNumber("OPERATOR: TOF Adjustment", TOFAdjustment);
+        SmartDashboard.putNumber("OPERATOR: TOF Adjustment", TOFAdjustment);
+        hoodOffset = SmartDashboard.getNumber("OPERATOR: Hood Offset", hoodOffset);
+        SmartDashboard.putNumber("OPERATOR: Hood Offset", hoodOffset);
+        turretOffset = SmartDashboard.getNumber("OPERATOR: Turret Offset", turretOffset);
+        SmartDashboard.putNumber("OPERATOR: Turret Offset", turretOffset);
         // Phase manager stuff
         phaseManager.update(drivepose, shooter, turret);
         target = phaseManager.getTarget(drivepose);
@@ -249,6 +248,10 @@ public class Superstructure extends Command {
         Logger.recordOutput("DistanceToTarget", target.getDistance(drivepose.getTranslation()));
 
         SmartDashboard.putString("Phase Manager State", phaseManager.getCurrentState().toString());
+
+        // for operator
+        phaseDelay = SmartDashboard.getNumber("OPERATOR: Phase Delay", phaseDelay);
+        SmartDashboard.putNumber("OPERATOR: Phase Delay", phaseDelay);
     }
 
     @Override

diff --git a/src/main/java/frc/robot/subsystems/shooter/Shooter.java b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
index 30090472f4d866ed44d30e65cdfbecc7b11ffa78..f00e25663ab3c89ea089958c572aba7d37a82d46 100644 (file)
--- a/src/main/java/frc/robot/subsystems/shooter/Shooter.java
+++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
@@ -62,8 +62,8 @@ public class Shooter extends SubsystemBase implements ShooterIO {
         // shooterTargetSpeed = SmartDashboard.getNumber("Shooter Setpoint", shooterTargetSpeed);
         // SmartDashboard.putNumber("Shooter Setpoint", shooterTargetSpeed);
 
-        powerModifier = SmartDashboard.getNumber("shooter power modifier", powerModifier);
-        SmartDashboard.putNumber("shooter power modifier", powerModifier);
+        powerModifier = SmartDashboard.getNumber("OPERATOR: Shooter Power Modifier", powerModifier);
+        SmartDashboard.putNumber("OPERATOR: Shooter Power Modifier", powerModifier);
         
         // Convert to RPS
         double targetVelocityRPS = Units.radiansToRotations(shooterTargetSpeed / (ShooterConstants.SHOOTER_LAUNCH_DIAMETER/2)) * powerModifier;

diff --git a/src/main/java/frc/robot/subsystems/turret/Turret.java b/src/main/java/frc/robot/subsystems/turret/Turret.java
index 2c0e346d38feb76b82e5dc595b27c81e295571c4..84dc6815046f086108f3a30b82cfda2ed1923f1d 100644 (file)
--- a/src/main/java/frc/robot/subsystems/turret/Turret.java
+++ b/src/main/java/frc/robot/subsystems/turret/Turret.java
@@ -55,6 +55,7 @@ public class Turret extends SubsystemBase implements TurretIO{
        private double lastFilteredRad = 0.0;
        private double lastRawSetpoint = 0.0;
 
+
        /* ---------------- Visualization ---------------- */
 
        private final Mechanism2d mech = new Mechanism2d(100, 100);