From: Arnav495 <arnieincyberland@gmail.com>
Date: Sat, 28 Mar 2026 19:18:34 +0000 (-0700)
Subject: Merge branch 'Twintake' into ValenceV2
X-Git-Url: https://git.taranathan.com/?a=commitdiff_plain;h=63152c351a2c250765c1a016316be6fda180b21f;p=FRC2026.git

Merge branch 'Twintake' into ValenceV2
---

63152c351a2c250765c1a016316be6fda180b21f
diff --cc src/main/java/frc/robot/util/HubActive.java
index d0c5b3e,1d6296a..e6d7ade
--- a/src/main/java/frc/robot/util/HubActive.java
+++ b/src/main/java/frc/robot/util/HubActive.java
@@@ -1,17 -1,13 +1,13 @@@
  package frc.robot.util;
  
 +
  import java.util.Optional;
  
- 
  import edu.wpi.first.wpilibj.DriverStation;
  import edu.wpi.first.wpilibj.DriverStation.Alliance;
  import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard;
  
- 
  public class HubActive {
- 
--
    static public boolean isHubActive() {
      Optional<Alliance> alliance = DriverStation.getAlliance();
      // If we have no alliance, we cannot be enabled, therefore no hub.
@@@ -164,10 -149,8 +160,8 @@@
      }
    }
  
- 
 -  static public Optional<Double> timeToUnactive() {
 +  static public Optional<Double> timeToInactive() {
  
- 
      Alliance alliance = DriverStation.getAlliance().orElse(Alliance.Blue);
      if (alliance == Alliance.Blue) {
        alliance = Alliance.Red;
@@@ -204,9 -185,7 +196,6 @@@
        }
      }
  
- 
- 
--
      // Shift was is active for blue if red won auto, or red if blue won auto.
      boolean shift1Active = switch (alliance) {
        case Red -> !redInactiveFirst;