Merge branch 'turret' of https://github.com/iron-claw-972/FRC2026 into turret

diff --cc src/main/java/frc/robot/commands/gpm/TurretAutoShoot.java
Simple merge

diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
Simple merge

diff --cc src/main/java/frc/robot/subsystems/shooter/Shooter.java
index fc8190d0af4a0f46ccf80333307176827d830ab9,7a055517f4a5507aeb075410f1f3d8d4cb389527..2247f833fd0b9e9fd84d1b7c34b3c02df5211daa
--- 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
@@@ -63,10 -66,10 +66,12 @@@ public class Shooter extends SubsystemB
      }
  
      public void periodic(){
+         updateInputs();
+ 
          shooterMotorLeft.setControl(voltageRequest.withVelocity(shooterTargetSpeed));
          shooterMotorRight.setControl(voltageRequest.withVelocity(shooterTargetSpeed));
 +        shooterMotorLeft.set(-1);
 +        shooterMotorRight.set(-1);
          feederMotor.set(feederPower);
      }
  

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