From: iefomit <timofei.stem@gmail.com>
Date: Wed, 18 Feb 2026 18:49:59 +0000 (-0800)
Subject: Merge branch 'main' into Linear-Climb
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=d58bc8d538cfb92d512003b85918f606d60f2662;p=FRC2026.git

Merge branch 'main' into Linear-Climb
---

d58bc8d538cfb92d512003b85918f606d60f2662
diff --cc src/main/java/frc/robot/RobotContainer.java
index b3a7fb2,b9478b6..8e0cce8
--- a/src/main/java/frc/robot/RobotContainer.java
+++ b/src/main/java/frc/robot/RobotContainer.java
@@@ -26,7 -26,7 +26,8 @@@ import frc.robot.constants.VisionConsta
  import frc.robot.controls.BaseDriverConfig;
  import frc.robot.controls.Operator;
  import frc.robot.controls.PS5ControllerDriverConfig;
 +import frc.robot.subsystems.Climb.LinearClimb;
+ import frc.robot.subsystems.Intake.Intake;
  import frc.robot.subsystems.drivetrain.Drivetrain;
  import frc.robot.subsystems.drivetrain.GyroIOPigeon2;
  import frc.robot.util.PathGroupLoader;
@@@ -51,7 -51,8 +52,8 @@@ public class RobotContainer 
    // Controllers are defined here
    private BaseDriverConfig driver = null;
    private Operator operator = null;
 +  private LinearClimb linearClimb = null;
+   private Intake intake = null;
  
    // Auto Command selection
    private final SendableChooser<Command> autoChooser = new SendableChooser<>();
@@@ -97,6 -99,8 +101,7 @@@
          drive = new Drivetrain(vision, new GyroIOPigeon2());
          driver = new PS5ControllerDriverConfig(drive);
          operator = new Operator(drive);
+         // added indexer here for now
 -        
  
          // Detected objects need access to the drivetrain
          DetectedObject.setDrive(drive);
diff --cc src/main/java/frc/robot/constants/IdConstants.java
index 84e3248,1685f3f..645f67f
--- a/src/main/java/frc/robot/constants/IdConstants.java
+++ b/src/main/java/frc/robot/constants/IdConstants.java
@@@ -19,6 -19,10 +19,13 @@@ public class IdConstants 
      // LEDs
      public static final int CANDLE_ID = 1;
  
 +    // Climb
-     public static final int CLIMB_MOTOR_ID = 8; 
++    public static final int CLIMB_MOTOR_ID = 8;
++    
+     // Intake
+     // extender right and left motor CAN ID
+     public static final int RIGHT_MOTOR_ID = 1;
+     public static final int LEFT_MOTOR_ID = 2;
 -    // roller motor CAN ID 
++    // roller motor CAN ID
+     public static final int ROLLER_MOTOR_ID = 3;
  }