Merge branch 'main' into phoenix-pro

author iefomit <timofei.stem@gmail.com>

Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)

committer iefomit <timofei.stem@gmail.com>

Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)
author iefomit <timofei.stem@gmail.com>
Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)
committer iefomit <timofei.stem@gmail.com>
Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)
diff --cc src/main/java/frc/robot/subsystems/turret/Turret.java
Simple merge
author	iefomit <timofei.stem@gmail.com>
	Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)
committer	iefomit <timofei.stem@gmail.com>
	Wed, 8 Apr 2026 22:59:07 +0000 (15:59 -0700)