Merge branch 'sdashboard-things' into elastic

diff --cc src/main/java/frc/robot/subsystems/Intake/Intake.java
Simple merge

diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
index 230a38f5766b612b1af27ca998c25d13f31b7414,71f6733be26f32145931143837e77e092e424c41..ba902d289e7e4dbbcad01a366416cb3007cd8d95
--- 1/src/main/java/frc/robot/subsystems/shooter/Shooter.java
--- 2/src/main/java/frc/robot/subsystems/shooter/Shooter.java
+++ b/src/main/java/frc/robot/subsystems/shooter/Shooter.java
@@@ -81,13 -81,10 +81,17 @@@ public class Shooter extends SubsystemB
          Logger.recordOutput("Shooter/realVelocity", shooterMotorLeft.getVelocity().getValueAsDouble() * ShooterConstants.SHOOTER_LAUNCH_DIAMETER);
          Logger.recordOutput("Shooter/targetVelocity", shooterTargetSpeed);
  
 +        // SmartDashboard.putString("WON AUTO?", (HubActive.wonAuto()) ? "WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOON" : "lost");
 +        double actualWheelVelocity = shooterMotorLeft.getVelocity().getValueAsDouble() * ShooterConstants.SHOOTER_LAUNCH_DIAMETER;
 +        SmartDashboard.putNumber("Shooter Speed Error (mps)", shooterTargetSpeed - actualWheelVelocity);
 +
 +        boolean autoWon = HubActive.wonAuto();
 +        SmartDashboard.putBoolean("Auto Won", autoWon);
 +        SmartDashboard.putString("Auto Result", autoWon ? "WON" : "LOST");
+         SmartDashboard.putBoolean("Shooter At Speed", atTargetSpeed());
+         SmartDashboard.putBoolean("Shooter Running", shooterTargetSpeed > 0);
+ 
+         SmartDashboard.putString("WON AUTO?", (HubActive.wonAuto()) ? "WOOOOOOON" : "lost");
      }
  
      /**

diff --cc src/main/java/frc/robot/subsystems/turret/Turret.java
Simple merge