From faec79d64ceef530ee605a5e341563e0762b7e02 Mon Sep 17 00:00:00 2001 From: mimigamin Date: Tue, 7 Apr 2026 22:55:52 -0600 Subject: [PATCH] Chooser without filter --- ...h-Neutral-Shoot.auto => Center-Shoot.auto} | 22 ++--------------- .../autos/X. LeftTrench-Neutral-Shoot.auto | 24 ++++++++++++++++--- .../deploy/pathplanner/autos/X. Stupid.auto | 19 --------------- .../java/frc4388/robot/RobotContainer.java | 3 +-- .../robot/constants/BuildConstants.java | 10 ++++---- 5 files changed, 29 insertions(+), 49 deletions(-) rename src/main/deploy/pathplanner/autos/{LeftTrench-Neutral-Shoot.auto => Center-Shoot.auto} (57%) delete mode 100644 src/main/deploy/pathplanner/autos/X. Stupid.auto diff --git a/src/main/deploy/pathplanner/autos/LeftTrench-Neutral-Shoot.auto b/src/main/deploy/pathplanner/autos/Center-Shoot.auto similarity index 57% rename from src/main/deploy/pathplanner/autos/LeftTrench-Neutral-Shoot.auto rename to src/main/deploy/pathplanner/autos/Center-Shoot.auto index 35e60ec..03bbe7f 100644 --- a/src/main/deploy/pathplanner/autos/LeftTrench-Neutral-Shoot.auto +++ b/src/main/deploy/pathplanner/autos/Center-Shoot.auto @@ -10,34 +10,16 @@ "name": "Intake Extended" } }, - { - "type": "named", - "data": { - "name": "Intake Reference" - } - }, - { - "type": "path", - "data": { - "pathName": "LeftTrench-Neutral-Shoot" - } - }, { "type": "named", "data": { "name": "Robot Rev Up" } }, - { - "type": "named", - "data": { - "name": "BumpOffsetBackward" - } - }, { "type": "path", "data": { - "pathName": "LeftRamp-Shoot" + "pathName": "Center-Hub-Shoot" } }, { @@ -50,6 +32,6 @@ } }, "resetOdom": true, - "folder": null, + "folder": "Pikes Peak Autos", "choreoAuto": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/X. LeftTrench-Neutral-Shoot.auto b/src/main/deploy/pathplanner/autos/X. LeftTrench-Neutral-Shoot.auto index 03bbe7f..35e60ec 100644 --- a/src/main/deploy/pathplanner/autos/X. LeftTrench-Neutral-Shoot.auto +++ b/src/main/deploy/pathplanner/autos/X. LeftTrench-Neutral-Shoot.auto @@ -13,13 +13,31 @@ { "type": "named", "data": { - "name": "Robot Rev Up" + "name": "Intake Reference" } }, { "type": "path", "data": { - "pathName": "Center-Hub-Shoot" + "pathName": "LeftTrench-Neutral-Shoot" + } + }, + { + "type": "named", + "data": { + "name": "Robot Rev Up" + } + }, + { + "type": "named", + "data": { + "name": "BumpOffsetBackward" + } + }, + { + "type": "path", + "data": { + "pathName": "LeftRamp-Shoot" } }, { @@ -32,6 +50,6 @@ } }, "resetOdom": true, - "folder": "Pikes Peak Autos", + "folder": null, "choreoAuto": false } \ No newline at end of file diff --git a/src/main/deploy/pathplanner/autos/X. Stupid.auto b/src/main/deploy/pathplanner/autos/X. Stupid.auto deleted file mode 100644 index 4991348..0000000 --- a/src/main/deploy/pathplanner/autos/X. Stupid.auto +++ /dev/null @@ -1,19 +0,0 @@ -{ - "version": "2025.0", - "command": { - "type": "sequential", - "data": { - "commands": [ - { - "type": "path", - "data": { - "pathName": "Stupidauto" - } - } - ] - } - }, - "resetOdom": true, - "folder": null, - "choreoAuto": false -} \ No newline at end of file diff --git a/src/main/java/frc4388/robot/RobotContainer.java b/src/main/java/frc4388/robot/RobotContainer.java index f1f707e..52a8e06 100644 --- a/src/main/java/frc4388/robot/RobotContainer.java +++ b/src/main/java/frc4388/robot/RobotContainer.java @@ -622,8 +622,7 @@ public class RobotContainer { for (String auto : autos) { if (auto.endsWith(".auto")) - if (auto.startsWith("X. ")) // Mira! - autoChooser.addOption(auto.replaceAll(".auto", ""), auto.replaceAll(".auto", "")); + autoChooser.addOption(auto.replaceAll(".auto", ""), auto.replaceAll(".auto", "")); // System.out.println(auto); } diff --git a/src/main/java/frc4388/robot/constants/BuildConstants.java b/src/main/java/frc4388/robot/constants/BuildConstants.java index 277aea8..9fcfbec 100644 --- a/src/main/java/frc4388/robot/constants/BuildConstants.java +++ b/src/main/java/frc4388/robot/constants/BuildConstants.java @@ -7,12 +7,12 @@ public final class BuildConstants { public static final String MAVEN_GROUP = ""; public static final String MAVEN_NAME = "2026KPopRobotHunters"; public static final String VERSION = "unspecified"; - public static final int GIT_REVISION = 222; - public static final String GIT_SHA = "118dcee1c7dca32d23fa40f275d9ba433046fcf4"; - public static final String GIT_DATE = "2026-04-07 20:37:26 MDT"; + public static final int GIT_REVISION = 223; + public static final String GIT_SHA = "ecdc0bfd6f9e870efa2905e3c06d87254bfd7e39"; + public static final String GIT_DATE = "2026-04-07 22:46:24 MDT"; public static final String GIT_BRANCH = "New-Intake"; - public static final String BUILD_DATE = "2026-04-07 22:44:56 MDT"; - public static final long BUILD_UNIX_TIME = 1775623496023L; + public static final String BUILD_DATE = "2026-04-07 22:49:03 MDT"; + public static final long BUILD_UNIX_TIME = 1775623743749L; public static final int DIRTY = 1; private BuildConstants(){}