From: iefomit <timofei.stem@gmail.com>
Date: Wed, 1 Apr 2026 06:03:30 +0000 (-0700)
Subject: Merge branch 'main' into angle-with-vision
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=406f15cd115905bc519ff06784c25c429e15557f;p=FRC2026.git

Merge branch 'main' into angle-with-vision
---

406f15cd115905bc519ff06784c25c429e15557f
diff --cc src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
index 81efc82,5b4448b..895d739
--- a/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
+++ b/src/main/java/frc/robot/subsystems/drivetrain/Drivetrain.java
@@@ -1,7 -1,7 +1,8 @@@
  package frc.robot.subsystems.drivetrain;
  
+ import java.util.ArrayList;
  import java.util.Arrays;
 +import java.util.ArrayList;
  import java.util.Optional;
  import java.util.concurrent.locks.Lock;
  import java.util.concurrent.locks.ReentrantLock;
@@@ -26,11 -27,12 +28,13 @@@ import edu.wpi.first.units.measure.Volt
  import edu.wpi.first.wpilibj.RobotBase;
  import edu.wpi.first.wpilibj.Timer;
  import edu.wpi.first.wpilibj.smartdashboard.Field2d;
+ import edu.wpi.first.wpilibj.motorcontrol.Talon;
  import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
  import edu.wpi.first.wpilibj2.command.SubsystemBase;
+ import frc.robot.commands.Music;
  import frc.robot.constants.Constants;
  import frc.robot.constants.FieldConstants;
 +import frc.robot.constants.GyroBiasConstants;
  import frc.robot.constants.VisionConstants;
  import frc.robot.constants.swerve.DriveConstants;
  import frc.robot.constants.swerve.ModuleConstants;