Shuffleboard auto selection

Team3128 · Jan 15, 2024 · 641e590 · 641e590
1 parent f59d359
commit 641e590
Show file tree

Hide file tree

Showing 5 changed files with 192 additions and 120 deletions.
diff --git a/src/main/java/frc/team3128/Constants.java b/src/main/java/frc/team3128/Constants.java
@@ -25,12 +25,6 @@
 
 public class Constants {
 
-    public static class ShuffleboardConstants {
-        public static final int WINDOW_WIDTH = 100;
-        public static final int WINDOW_HEIGHT = 100;
-        public static final int SHUFFLEBOARD_TABS = 8;
-    }
-
     public static class TrajectoryConstants {
         public static final Rotation2d HEADING = Rotation2d.fromDegrees(180);
 

diff --git a/src/main/java/frc/team3128/autonomous/AutoPrograms.java b/src/main/java/frc/team3128/autonomous/AutoPrograms.java
@@ -11,8 +11,6 @@
 
 import static frc.team3128.commands.CmdManager.*;
 
-import java.util.function.DoubleSupplier;
-
 /**
  * Class to store information about autonomous routines.
  * @author Daniel Wang, Mason Lam
@@ -43,7 +41,8 @@ private void initAutoSelector() {
     }
 
     public Command getAutonomousCommand() {
-        String selectedAutoName = NarwhalDashboard.getSelectedAutoName();
+        String selectedAutoName = NarwhalDashboard.getSelectedAutoName(); // Priority to NarwhalDashboard
+        if (selectedAutoName == null) { selectedAutoName = NAR_Shuffleboard.getSelectedAutoName(); }
         final Command autoCommand;
 
         if (selectedAutoName == null) {