From: iefomit <timofei.stem@gmail.com>
Date: Fri, 17 Apr 2026 22:21:41 +0000 (-0700)
Subject: Merge branch 'main' into network-numbie
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=3b981144125b459e405cf91c61546afebea8b15d;p=FRC2026.git

Merge branch 'main' into network-numbie
---

3b981144125b459e405cf91c61546afebea8b15d
diff --cc src/main/java/frc/robot/commands/gpm/Superstructure.java
index 9954633,4853269..f5a11f5
--- a/src/main/java/frc/robot/commands/gpm/Superstructure.java
+++ b/src/main/java/frc/robot/commands/gpm/Superstructure.java
@@@ -241,12 -238,16 +241,6 @@@ public class Superstructure extends Com
  
      @Override
      public void execute() {
-         // If we ever need to lose a match use this code below
-         // SmartDashboard.putData("Hood: Shoot Higher", new InstantCommand(() -> bumpUpHoodOffset()));
-         // SmartDashboard.putData("Hood: Shoot Lower", new InstantCommand(() -> bumpDownHoodOffset()));
-         // SmartDashboard.putData("Turret: Aim Left", new InstantCommand(() -> bumpUpTurretOffset()));
-         // SmartDashboard.putData("Turret: Aim Right", new InstantCommand(() -> bumpDownTurretOffset()));
 -        if (!Constants.DISABLE_SMART_DASHBOARD) {
 -            TOFAdjustment = SmartDashboard.getNumber("OPERATOR: TOF Adjustment", TOFAdjustment);
 -            SmartDashboard.putNumber("OPERATOR: TOF Adjustment", TOFAdjustment);
 -            hoodOffset = SmartDashboard.getNumber("OPERATOR: Hood Offset", hoodOffset);
 -            SmartDashboard.putNumber("OPERATOR: Hood Offset", hoodOffset);
 -        }
 -
 -        turretOffset = SmartDashboard.getNumber("OPERATOR: Turret Offset", turretOffset);
 -        SmartDashboard.putNumber("OPERATOR: Turret Offset", turretOffset);
--
          // Phase manager stuff
          phaseManager.update(drivepose, shooter, turret);
          target = phaseManager.getTarget(drivepose);