From: maxwtan <100314265+MaxwellTTan20@users.noreply.github.com> Date: Wed, 18 Feb 2026 21:17:34 +0000 (-0800) Subject: Merge branch 'beta-bot-pull-request' of https://github.com/iron-claw-972/FRC2026... X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=0789831ce8e78554ad29f69aab82255a285d6981;p=FRC2026.git Merge branch 'beta-bot-pull-request' of https://github.com/iron-claw-972/FRC2026 into beta-bot-pull-request --- 0789831ce8e78554ad29f69aab82255a285d6981 diff --cc src/main/java/frc/robot/controls/PS5ControllerDriverConfig.java index 661c053,11f2607..4f97cdb --- a/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; } })); }