From: iefomit <timofei.stem@gmail.com>
Date: Mon, 9 Mar 2026 00:50:37 +0000 (-0700)
Subject: Merge branch 'main' into LEDs
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=d3169ad440ada1a3bebe398cb47c6069b2ca16a5;p=FRC2026.git

Merge branch 'main' into LEDs
---

d3169ad440ada1a3bebe398cb47c6069b2ca16a5
diff --cc src/main/java/frc/robot/RobotContainer.java
index 3d33ad7,e7b1d9a..a200206
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -65,8 -74,11 +75,11 @@@ public class RobotContainer 
    private BaseDriverConfig driver = null;
    private Operator operator = null;
    private LinearClimb linearClimb = null;
 +  private LED led = null;
 +
+   // TODO: move to correct robot and put the correct port?
+   private PS5Controller ps5 = new PS5Controller(0);
+ 
 -
 -
    // Auto Command selection
    private final SendableChooser<Command> autoChooser = new SendableChooser<>();