Merge branch 'beta-bot-pull-request' of https://github.com/iron-claw-972/FRC2026...

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

diff --cc src/main/java/frc/robot/constants/IdConstants.java
Simple merge

diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
index 661c053e02d97ee2d238d89a02e1d39ddf08de62,11f2607341a633fed366ab98cd670dff27cd3ab9..4f97cdbd8b9b151b613141a5f4d0dd526c98dc4e
--- 1/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
--- 2/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
+++ b/src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java
@@@ -73,11 -88,9 +88,10 @@@ public class PS5ControllerDriverConfig 
                      intake.extend();
                      intake.spinStart();
                      intakeBoolean = false;
-                 }
-                 else{
+                 } else {
                      intake.retract();
                      intake.spinStop();
 +                    intakeBoolean = true;
                  }
              }));
          }