From: WesleyWong-972 <wesleycwong@gmail.com>
Date: Sun, 29 Mar 2026 17:31:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/browning-out-protection' into week5shuttling
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=fc45f9f6a7cc632f3673b5f40b2b1ce463c90f50;p=FRC2026.git

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

fc45f9f6a7cc632f3673b5f40b2b1ce463c90f50
diff --cc src/main/java/frc/robot/RobotContainer.java
index 4d3eb8e,af6f5c8..8400118
--- a/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;