Merge remote-tracking branch 'origin/browning-out-protection' into week5shuttling

diff --cc src/main/java/frc/robot/RobotContainer.java
index 4d3eb8e7fb46f0d75d1c591db19b98fe97742b3d,af6f5c8c10f90e7228894ffc4e46738f63a42c54..8400118e866ed75496a4ce98a5486dbdf2f4bf38
--- 1/src/main/java/frc/robot/RobotContainer.java
--- 2/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -19,10 -20,12 +20,11 @@@ import edu.wpi.first.wpilibj.smartdashb
  import edu.wpi.first.wpilibj2.command.Command;
  import edu.wpi.first.wpilibj2.command.CommandScheduler;
  import edu.wpi.first.wpilibj2.command.InstantCommand;
- import frc.robot.commands.LogCommand;
+ import edu.wpi.first.wpilibj2.command.ScheduleCommand;
  import frc.robot.commands.drive_comm.DefaultDriveCommand;
  import frc.robot.commands.gpm.AutoShootCommand;
+ import frc.robot.commands.gpm.BrownOutControl;
  import frc.robot.commands.gpm.ClimbDriveCommand;
 -import frc.robot.commands.gpm.HardstopWarning;
  import frc.robot.commands.gpm.IntakeMovementCommand;
  import frc.robot.commands.gpm.RunSpindexer;
  import frc.robot.commands.gpm.Superstructure;

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

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

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

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

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

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

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

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

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