From cbd1eae9f72137f1f3bec9086e9036d1c1fd28b5 Mon Sep 17 00:00:00 2001 From: Benjamin Hall Date: Fri, 20 Dec 2024 12:10:27 -0500 Subject: [PATCH] Update to Choreo beta-9 and WPILib beta-3 --- .automation/cpp_template/build.gradle | 4 +- .../java_template/.vscode/settings.json | 33 ++++++++- .automation/java_template/build.gradle | 4 +- cpp/ArcadeDrive/build.gradle | 4 +- cpp/BasicLatencyCompensation/build.gradle | 4 +- cpp/CANcoder/build.gradle | 4 +- cpp/CommandBasedDrive/build.gradle | 4 +- cpp/ControlRequestLimits/build.gradle | 4 +- cpp/CurrentLimits/build.gradle | 4 +- cpp/FusedCANcoder/build.gradle | 4 +- cpp/MotionMagic/build.gradle | 4 +- cpp/PhoenixSysId/build.gradle | 4 +- cpp/Pigeon2/build.gradle | 4 +- cpp/PositionClosedLoop/build.gradle | 4 +- cpp/Simulation/build.gradle | 4 +- cpp/SwerveWithPathPlanner/build.gradle | 6 +- cpp/VelocityClosedLoop/build.gradle | 4 +- cpp/WaitForAll/build.gradle | 4 +- java/ArcadeDrive/.vscode/settings.json | 33 ++++++++- java/ArcadeDrive/build.gradle | 4 +- .../.vscode/settings.json | 33 ++++++++- java/BasicLatencyCompensation/build.gradle | 4 +- java/CANcoder/.vscode/settings.json | 33 ++++++++- java/CANcoder/build.gradle | 4 +- java/CommandBasedDrive/.vscode/settings.json | 33 ++++++++- java/CommandBasedDrive/build.gradle | 4 +- .../.vscode/settings.json | 33 ++++++++- java/ControlRequestLimits/build.gradle | 4 +- java/CurrentLimits/.vscode/settings.json | 33 ++++++++- java/CurrentLimits/build.gradle | 4 +- java/FusedCANcoder/.vscode/settings.json | 33 ++++++++- java/FusedCANcoder/build.gradle | 4 +- java/MotionMagic/.vscode/settings.json | 33 ++++++++- java/MotionMagic/build.gradle | 4 +- java/PhoenixSysId/.vscode/settings.json | 33 ++++++++- java/PhoenixSysId/build.gradle | 4 +- java/Pigeon2/.vscode/settings.json | 33 ++++++++- java/Pigeon2/build.gradle | 4 +- java/PositionClosedLoop/.vscode/settings.json | 33 ++++++++- java/PositionClosedLoop/build.gradle | 4 +- java/Simulation/.vscode/settings.json | 33 ++++++++- java/Simulation/build.gradle | 4 +- java/SwerveWithChoreo/.vscode/settings.json | 33 ++++++++- java/SwerveWithChoreo/build.gradle | 6 +- .../src/main/deploy/choreo/SimplePath.traj | 67 ++++++++++--------- .../src/main/deploy/choreo/Tests.chor | 8 ++- .../src/main/java/frc/robot/AutoRoutines.java | 29 +++----- .../src/main/java/frc/robot/Robot.java | 3 - .../main/java/frc/robot/RobotContainer.java | 28 +++----- .../subsystems/CommandSwerveDrivetrain.java | 49 +++++++++++++- .../vendordeps/ChoreoLib2025Beta.json | 10 +-- .../.vscode/settings.json | 33 ++++++++- java/SwerveWithPathPlanner/build.gradle | 6 +- .../main/java/frc/robot/RobotContainer.java | 2 +- java/VelocityClosedLoop/.vscode/settings.json | 33 ++++++++- java/VelocityClosedLoop/build.gradle | 4 +- java/WaitForAll/.vscode/settings.json | 33 ++++++++- java/WaitForAll/build.gradle | 4 +- 58 files changed, 726 insertions(+), 169 deletions(-) diff --git a/.automation/cpp_template/build.gradle b/.automation/cpp_template/build.gradle index 8e31da3f..890878f8 100644 --- a/.automation/cpp_template/build.gradle +++ b/.automation/cpp_template/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/.automation/java_template/.vscode/settings.json b/.automation/java_template/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/.automation/java_template/.vscode/settings.json +++ b/.automation/java_template/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/.automation/java_template/build.gradle b/.automation/java_template/build.gradle index c30eef6c..0211f777 100644 --- a/.automation/java_template/build.gradle +++ b/.automation/java_template/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/ArcadeDrive/build.gradle b/cpp/ArcadeDrive/build.gradle index 8e31da3f..890878f8 100644 --- a/cpp/ArcadeDrive/build.gradle +++ b/cpp/ArcadeDrive/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/BasicLatencyCompensation/build.gradle b/cpp/BasicLatencyCompensation/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/BasicLatencyCompensation/build.gradle +++ b/cpp/BasicLatencyCompensation/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/CANcoder/build.gradle b/cpp/CANcoder/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/CANcoder/build.gradle +++ b/cpp/CANcoder/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/CommandBasedDrive/build.gradle b/cpp/CommandBasedDrive/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/CommandBasedDrive/build.gradle +++ b/cpp/CommandBasedDrive/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/ControlRequestLimits/build.gradle b/cpp/ControlRequestLimits/build.gradle index 8e31da3f..890878f8 100644 --- a/cpp/ControlRequestLimits/build.gradle +++ b/cpp/ControlRequestLimits/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/CurrentLimits/build.gradle b/cpp/CurrentLimits/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/CurrentLimits/build.gradle +++ b/cpp/CurrentLimits/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/FusedCANcoder/build.gradle b/cpp/FusedCANcoder/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/FusedCANcoder/build.gradle +++ b/cpp/FusedCANcoder/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/MotionMagic/build.gradle b/cpp/MotionMagic/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/MotionMagic/build.gradle +++ b/cpp/MotionMagic/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/PhoenixSysId/build.gradle b/cpp/PhoenixSysId/build.gradle index 8e31da3f..890878f8 100644 --- a/cpp/PhoenixSysId/build.gradle +++ b/cpp/PhoenixSysId/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/Pigeon2/build.gradle b/cpp/Pigeon2/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/Pigeon2/build.gradle +++ b/cpp/Pigeon2/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/PositionClosedLoop/build.gradle b/cpp/PositionClosedLoop/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/PositionClosedLoop/build.gradle +++ b/cpp/PositionClosedLoop/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/Simulation/build.gradle b/cpp/Simulation/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/Simulation/build.gradle +++ b/cpp/Simulation/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/SwerveWithPathPlanner/build.gradle b/cpp/SwerveWithPathPlanner/build.gradle index 8e31da3f..17d13dab 100644 --- a/cpp/SwerveWithPathPlanner/build.gradle +++ b/cpp/SwerveWithPathPlanner/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -27,8 +27,8 @@ deploy { frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' - deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + deleteOldFiles = true // Change to true to delete files on roboRIO that no + // longer exist in deploy directory of this project } } } diff --git a/cpp/VelocityClosedLoop/build.gradle b/cpp/VelocityClosedLoop/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/VelocityClosedLoop/build.gradle +++ b/cpp/VelocityClosedLoop/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/cpp/WaitForAll/build.gradle b/cpp/WaitForAll/build.gradle index 9d9fdf1a..0b7b40d9 100644 --- a/cpp/WaitForAll/build.gradle +++ b/cpp/WaitForAll/build.gradle @@ -1,7 +1,7 @@ plugins { id "cpp" id "google-test-test-suite" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } // Define my targets (RoboRIO) and artifacts (deployable files) @@ -28,7 +28,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/ArcadeDrive/.vscode/settings.json b/java/ArcadeDrive/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/ArcadeDrive/.vscode/settings.json +++ b/java/ArcadeDrive/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/ArcadeDrive/build.gradle b/java/ArcadeDrive/build.gradle index c30eef6c..0211f777 100644 --- a/java/ArcadeDrive/build.gradle +++ b/java/ArcadeDrive/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/BasicLatencyCompensation/.vscode/settings.json b/java/BasicLatencyCompensation/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/BasicLatencyCompensation/.vscode/settings.json +++ b/java/BasicLatencyCompensation/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/BasicLatencyCompensation/build.gradle b/java/BasicLatencyCompensation/build.gradle index dbdf997e..fabda960 100644 --- a/java/BasicLatencyCompensation/build.gradle +++ b/java/BasicLatencyCompensation/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/CANcoder/.vscode/settings.json b/java/CANcoder/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/CANcoder/.vscode/settings.json +++ b/java/CANcoder/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/CANcoder/build.gradle b/java/CANcoder/build.gradle index dbdf997e..fabda960 100644 --- a/java/CANcoder/build.gradle +++ b/java/CANcoder/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/CommandBasedDrive/.vscode/settings.json b/java/CommandBasedDrive/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/CommandBasedDrive/.vscode/settings.json +++ b/java/CommandBasedDrive/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/CommandBasedDrive/build.gradle b/java/CommandBasedDrive/build.gradle index dbdf997e..fabda960 100644 --- a/java/CommandBasedDrive/build.gradle +++ b/java/CommandBasedDrive/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/ControlRequestLimits/.vscode/settings.json b/java/ControlRequestLimits/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/ControlRequestLimits/.vscode/settings.json +++ b/java/ControlRequestLimits/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/ControlRequestLimits/build.gradle b/java/ControlRequestLimits/build.gradle index c30eef6c..0211f777 100644 --- a/java/ControlRequestLimits/build.gradle +++ b/java/ControlRequestLimits/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/CurrentLimits/.vscode/settings.json b/java/CurrentLimits/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/CurrentLimits/.vscode/settings.json +++ b/java/CurrentLimits/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/CurrentLimits/build.gradle b/java/CurrentLimits/build.gradle index dbdf997e..fabda960 100644 --- a/java/CurrentLimits/build.gradle +++ b/java/CurrentLimits/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/FusedCANcoder/.vscode/settings.json b/java/FusedCANcoder/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/FusedCANcoder/.vscode/settings.json +++ b/java/FusedCANcoder/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/FusedCANcoder/build.gradle b/java/FusedCANcoder/build.gradle index dbdf997e..fabda960 100644 --- a/java/FusedCANcoder/build.gradle +++ b/java/FusedCANcoder/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/MotionMagic/.vscode/settings.json b/java/MotionMagic/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/MotionMagic/.vscode/settings.json +++ b/java/MotionMagic/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/MotionMagic/build.gradle b/java/MotionMagic/build.gradle index dbdf997e..fabda960 100644 --- a/java/MotionMagic/build.gradle +++ b/java/MotionMagic/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/PhoenixSysId/.vscode/settings.json b/java/PhoenixSysId/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/PhoenixSysId/.vscode/settings.json +++ b/java/PhoenixSysId/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/PhoenixSysId/build.gradle b/java/PhoenixSysId/build.gradle index c30eef6c..0211f777 100644 --- a/java/PhoenixSysId/build.gradle +++ b/java/PhoenixSysId/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/Pigeon2/.vscode/settings.json b/java/Pigeon2/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/Pigeon2/.vscode/settings.json +++ b/java/Pigeon2/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/Pigeon2/build.gradle b/java/Pigeon2/build.gradle index dbdf997e..fabda960 100644 --- a/java/Pigeon2/build.gradle +++ b/java/Pigeon2/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/PositionClosedLoop/.vscode/settings.json b/java/PositionClosedLoop/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/PositionClosedLoop/.vscode/settings.json +++ b/java/PositionClosedLoop/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/PositionClosedLoop/build.gradle b/java/PositionClosedLoop/build.gradle index dbdf997e..fabda960 100644 --- a/java/PositionClosedLoop/build.gradle +++ b/java/PositionClosedLoop/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/Simulation/.vscode/settings.json b/java/Simulation/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/Simulation/.vscode/settings.json +++ b/java/Simulation/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/Simulation/build.gradle b/java/Simulation/build.gradle index dbdf997e..fabda960 100644 --- a/java/Simulation/build.gradle +++ b/java/Simulation/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/SwerveWithChoreo/.vscode/settings.json b/java/SwerveWithChoreo/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/SwerveWithChoreo/.vscode/settings.json +++ b/java/SwerveWithChoreo/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/SwerveWithChoreo/build.gradle b/java/SwerveWithChoreo/build.gradle index c30eef6c..7025be08 100644 --- a/java/SwerveWithChoreo/build.gradle +++ b/java/SwerveWithChoreo/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -33,8 +33,8 @@ deploy { frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' - deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + deleteOldFiles = true // Change to true to delete files on roboRIO that no + // longer exist in deploy directory of this project } } } diff --git a/java/SwerveWithChoreo/src/main/deploy/choreo/SimplePath.traj b/java/SwerveWithChoreo/src/main/deploy/choreo/SimplePath.traj index b81e28af..e886170c 100644 --- a/java/SwerveWithChoreo/src/main/deploy/choreo/SimplePath.traj +++ b/java/SwerveWithChoreo/src/main/deploy/choreo/SimplePath.traj @@ -1,6 +1,6 @@ { "name":"SimplePath", - "version":"v2025.0.0", + "version":1, "snapshot":{ "waypoints":[ {"x":4.062, "y":5.039, "heading":0.0, "intervals":15, "split":false, "fixTranslation":true, "fixHeading":true, "overrideIntervals":false}, @@ -29,39 +29,40 @@ } }, "trajectory":{ - "waypoints":[0.0,0.5697684177504896,1.0926420849095964], + "sampleType":"Swerve", + "waypoints":[0.0,0.56977,1.09264], "samples":[ - {"t":0.0, "x":4.062, "y":5.039, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":29.226458822189535, "ay":-12.424796441743036, "alpha":25.02487346105948, "fx":[308.66375142931423,118.2281283217828,256.3850513508591,310.9904731878708], "fy":[32.17344906648464,-287.6695818306081,-176.35209560720307,9.16376351299228]}, - {"t":0.03798456118336597, "x":4.08308436031912, "y":5.030036584806144, "heading":0.0, "vx":1.1101542133045843, "vy":-0.4719504406322561, "omega":0.9505588370876052, "ax":29.021758238876433, "ay":-12.07119821332368, "alpha":25.78921823332505, "fx":[306.2166540936873,114.45097851791286,256.04716744650557,310.58880752731835], "fy":[42.657858451708805,-288.738405766401,-176.3894323043004,11.81472414489855]}, - {"t":0.07596912236673194, "x":4.146189767523652, "y":5.003401429740383, "heading":0.03610656030574334, "vx":2.212532964778042, "vy":-0.9304696077227876, "omega":1.9301509749425176, "ax":-5.315878660499058, "ay":5.733966718633051, "alpha":57.24869949145691, "fx":[-206.30006834011385,-257.3487409635288,190.7307809589154,92.07487832611284], "fy":[198.6755951461055,-105.55381254440157,-161.88633874149653,263.8308226452342]}, - {"t":0.11395368355009793, "x":4.226396914961343, "y":4.972194510675685, "heading":0.10942249810658088, "vx":2.0106116465549655, "vy":-0.7126673980754862, "omega":4.104717703443895, "ax":-14.85421527076752, "ay":1.7900763501026262, "alpha":35.169356623635565, "fx":[-221.64642597565933,-217.8085179657918,-19.047496376066427,-46.829462869304706], "fy":[103.27062466367552,-95.72339988244455,-139.34234880126178,192.6924970793308]}, - {"t":0.15193824473346387, "x":4.292053085467321, "y":4.946415537435109, "heading":0.265338398853491, "vx":1.4463807977716068, "vy":-0.6446721334321163, "omega":5.440610281894, "ax":1.87865415324475, "ay":-12.069381361863892, "alpha":-17.57272954129737, "fx":[84.37697252110135,70.1020588457297,-66.58460191226365,-23.983690221020176], "fy":[-137.69418022294582,-36.91127952292192,-71.99502473592722,-163.99296274533037]}, - {"t":0.18992280591682983, "x":4.3483485117377745, "y":4.913220935362567, "heading":0.4719975929809436, "vx":1.5177406513979177, "vy":-1.103122288217213, "omega":4.773117861473843, "ax":6.729116420714396, "ay":-9.426907219822809, "alpha":-22.954990510598343, "fx":[147.43351150590618,110.99549997339378,-54.43224924954307,24.92392766607512], "fy":[-105.79432002739296,22.954753871071947,-63.820368974565866,-174.03805393982847]}, - {"t":0.2279073671001958, "x":4.41085369942441, "y":4.864518621707944, "heading":0.6533023804255137, "vx":1.7733431857905364, "vy":-1.4611992222784869, "omega":3.901182619960436, "ax":6.217212503653662, "ay":-5.363273704941779, "alpha":-17.017852030853437, "fx":[125.1957022037703,70.8271420047267,-27.14760101229933,42.63076837824471], "fy":[-54.043516257935,34.310332066852396,-41.500362262106535,-121.22195585555252]}, - {"t":0.2658919282835618, "x":4.482698542849427, "y":4.8051464726928375, "heading":0.8014870903408847, "vx":2.0095012745255563, "vy":-1.6649208204669856, "omega":3.2547669782850157, "ax":7.452297109521514, "ay":-0.7638505668761703, "alpha":-16.002906071348082, "fx":[130.73340422281083,66.00340850569457,-10.17432983130126,66.96040019169689], "fy":[-5.13399005852738,69.58721024287266,-8.93518948065377,-81.50378987533193]}, - {"t":0.30387648946692775, "x":4.564404754284277, "y":4.741354133854086, "heading":0.925117985765151, "vx":2.292573510038798, "vy":-1.6939353490594422, "omega":2.6469036135062356, "ax":7.1884593920664095, "ay":3.818034260590328, "alpha":-11.910038807587478, "fx":[111.42368834322436,53.46840279853804,7.055691780048093,72.59949200040163], "fy":[38.599253433555575,87.31169861138011,27.53575831360324,-23.559369683361584]}, - {"t":0.3418610506502937, "x":4.656673004291847, "y":4.6797651241928735, "heading":1.0256594580188512, "vx":2.565623985630886, "vy":-1.5489089930878617, "omega":2.194506015723166, "ax":2.723181317765863, "ay":5.779809499044349, "alpha":1.3149162094791331, "fx":[17.237452910502054,24.76903049316307,29.049576865635597,21.58500982058484], "fy":[47.90557286513214,43.397061253469744,50.43156616299465,54.891611379906394]}, - {"t":0.37984561183365967, "x":4.756091645161041, "y":4.625100128054678, "heading":1.1090168060403525, "vx":2.6690628330089625, "vy":-1.3293654655432117, "omega":2.244452530933126, "ax":-1.6577212706357212, "ay":7.714780667545829, "alpha":14.673305524362782, "fx":[-81.57053672741239,8.297740564223327,50.85551212702628,-33.97744495986733], "fy":[46.588403532014816,2.458568899281396,89.5164898000497,123.88896129532614]}, - {"t":0.4178301730170256, "x":4.856278923232433, "y":4.580170310685905, "heading":1.1942713505247422, "vx":2.606095017979533, "vy":-1.0363229072605682, "omega":2.8018116023855058, "ax":-5.0005666993769635, "ay":9.36496492674863, "alpha":23.194455968434497, "fx":[-147.17469622055927,-2.2379332041393987,57.49367627088672,-78.19746438469859], "fy":[41.90057052998772,-20.495938115090336,133.76600311948602,163.4201121724257]}, - {"t":0.4558147342003916, "x":4.95166282284726, "y":4.547562051411459, "heading":1.3006969347598192, "vx":2.4161506862355457, "vy":-0.6805988240204084, "omega":3.682842834233394, "ax":6.8738129624669035, "ay":-3.904023420766954, "alpha":-29.79573890174241, "fx":[174.06517618077348,-0.9561061006684474,-59.05323057541544,119.78734393896669], "fy":[27.23921591658561,99.80438837463473,-119.21491896314672,-140.64132802516286]}, - {"t":0.4937992953837575, "x":5.0483981075004785, "y":4.518893388757126, "heading":1.4405881037254784, "vx":2.677249455271384, "vy":-0.8288914405078245, "omega":2.5510647669165616, "ax":16.88750155862789, "ay":7.461571076732664, "alpha":-44.07592406956584, "fx":[243.3503743643859,41.43767722148993,4.0201436014902105,285.69494396438773], "fy":[169.89802561155176,286.9921470883066,-143.50308199455745,-59.54871255890434]}, - {"t":0.5317838565671236, "x":5.162275123899805, "y":4.492791188809997, "heading":1.5374891794471497, "vx":3.318713791459273, "vy":-0.5454669374196388, "omega":0.8768601323827456, "ax":6.466457031376719, "ay":31.782237542095473, "alpha":-23.08464557876047, "fx":[131.34583520578482,-38.73569427885679,-101.76576644307411,229.1407932935459], "fy":[280.1132982326035,306.79025429889623,288.9853074972303,205.32467376792448]}, - {"t":0.5697684177504896, "x":5.293, "y":4.495, "heading":1.5707963267948966, "vx":3.564339324207209, "vy":0.6617674090423575, "omega":0.0, "ax":-17.46995262929559, "ay":29.018547812206343, "alpha":-17.231876555711285, "fx":[-39.50542738838971,-184.48359090699591,-273.6713547280688,-96.65741824478924], "fy":[306.4819959225835,248.4794912616831,142.4475943346916,289.7853091883159]}, - {"t":0.6071165368332829, "x":5.413937108308784, "y":4.539954492988536, "heading":1.5707963267948966, "vx":2.911869453037518, "vy":1.7455555883423737, "omega":-0.6435781776227005, "ax":-23.364641119392896, "ay":5.7807117477879935, "alpha":-39.67090658706738, "fx":[-67.34423076259405,-252.6730740798265,-297.2001208453638,-177.6342947780813], "fy":[289.77837510305454,168.01639761931054,-53.64736080012576,-207.49090627478944]}, - {"t":0.6444646559160763, "x":5.506394496738847, "y":4.609179416346846, "heading":1.5467598923779569, "vx":2.039244054183701, "vy":1.9614542990820625, "omega":-2.125211920958866, "ax":-17.08062391895474, "ay":-6.113696994733446, "alpha":-43.98571665319571, "fx":[-45.13948058631435,-279.97389696639857,-232.99854159165108,-22.961132191438647], "fy":[187.3372315018108,55.16288998573377,-173.33039167205808,-277.154203013213]}, - {"t":0.6818127749988696, "x":5.570643699095066, "y":4.678172102141704, "heading":1.467387224477813, "vx":1.4013148780501703, "vy":1.7331192156866413, "omega":-3.767995704464427, "ax":-13.783674765700583, "ay":-2.060787922443541, "alpha":-33.13955160972574, "fx":[-13.955054195494917,-206.469783817391,-209.47327070653645,-39.014619101826874], "fy":[120.73464042758,88.84614026474486,-101.22862305402826,-178.45898347393725]}, - {"t":0.719160894081663, "x":5.613366874127446, "y":4.741463567005436, "heading":1.3266596722040216, "vx":0.8865205515022906, "vy":1.6561526629548375, "omega":-5.005695624334843, "ax":2.672856932809343, "ay":9.54645245402934, "alpha":16.0222098923521, "fx":[-47.38196837882718,70.11939865428032,83.23389464940595,-15.042261613065044], "fy":[49.59058204687828,20.06847309949008,115.03442906944572,140.0713653128472]}, - {"t":0.7565090131644563, "x":5.648340909265066, "y":4.8099758412220845, "heading":1.139706355934146, "vx":0.9863467305201242, "vy":2.01269470602615, "omega":-4.4072962213057645, "ax":12.859139992620332, "ay":3.667765887073824, "alpha":26.60201862217061, "fx":[-4.295504320648231,164.00355143520014,201.0275711835912,76.72496560793975], "fy":[-16.39144275639421,-87.29775417519376,66.37748920237186,162.08700432843872]}, - {"t":0.7938571322472496, "x":5.694147595862764, "y":4.88770425308631, "heading":0.9751021318276732, "vx":1.4666114222668192, "vy":2.1496788631443913, "omega":-3.4137608619622495, "ax":9.05159801140143, "ay":-2.8712116541580657, "alpha":9.840448242313665, "fx":[33.74996676276294,84.39228031979921,117.89061174702113,71.89732574133126], "fy":[-36.34012022303755,-69.3187976732754,-14.902156768284591,22.88409724100924]}, - {"t":0.831205251330043, "x":5.755235729474016, "y":4.965988214530906, "heading":0.8476045846349277, "vx":1.8046715826862156, "vy":2.042444508372992, "omega":-3.046238629180254, "ax":3.140941449362886, "ay":-8.186298171812115, "alpha":-10.876582378244004, "fx":[77.7135813106321,26.038748456400604,-25.48154243504908,28.582243371597357], "fy":[-66.39100380634368,-20.537552718511357,-76.11454639420802,-115.45007627685624]}, - {"t":0.8685533704128363, "x":5.8248274399933635, "y":5.036560215270374, "heading":0.7338333015576982, "vx":1.9219798379691024, "vy":1.7367016694048991, "omega":-3.4524585230567233, "ax":-2.1136936679481573, "ay":-12.199823559824065, "alpha":-26.5652580412972, "fx":[113.85459795703362,-18.463577787989276,-145.61248556710063,-21.685183624338517], "fy":[-125.93798736716592,20.908405277057756,-106.13010292994028,-203.87133113613396]}, - {"t":0.9059014894956297, "x":5.8951355952321265, "y":5.09291409889317, "heading":0.6048904695101708, "vx":1.843037355154028, "vy":1.2810612063035216, "omega":-4.444620943848226, "ax":-4.975894252152143, "ay":-12.842141108806985, "alpha":-28.569652725571643, "fx":[98.33440398761331,-32.790105159095255,-176.94929691499476,-57.87207691625341], "fy":[-156.51287788540583,25.786971604579417,-93.35174350373175,-212.8046418218059]}, - {"t":0.943249608578423, "x":5.960499181185772, "y":5.131802689647749, "heading":0.4388922372214496, "vx":1.6571970640812623, "vy":0.801431390893762, "omega":-5.511643735996928, "ax":1.5837604531226042, "ay":16.193366722649536, "alpha":43.88839575402028, "fx":[-149.68061371021807,-121.31934856991572,246.5150473068684,78.36353928157708], "fy":[232.0159727719713,-66.98157990187129,112.687353810509,273.16732256982107]}, - {"t":0.9805977276612164, "x":6.023496953952147, "y":5.173028562544035, "heading":0.23304271062750417, "vx":1.7163475380831044, "vy":1.4062231796026206, "omega":-3.8724947050230143, "ax":0.4044973447465699, "ay":8.038246855365111, "alpha":60.94919355877796, "fx":[-190.75104638704465,-208.20122535075024,289.0879228400815,123.6251170923862], "fy":[226.59281633314,-191.0430903735248,-33.154933301743746,271.0617654748866]}, - {"t":1.0179458467440097, "x":6.087881419224354, "y":5.231154556233942, "heading":0.08841231723681776, "vx":1.731454753083373, "vy":1.706436580373686, "omega":-1.5961569659895516, "ax":-23.57280881417639, "ay":-22.046919504329445, "alpha":22.09119026985219, "fx":[-306.5951390537582,-209.05062942645768,-23.56351817578218,-262.7241796624389], "fy":[-50.58280431138501,-230.15481580587175,-309.79414240855715,-159.49182266178744]}, - {"t":1.055293965826803, "x":6.136107354188334, "y":5.279510327269729, "heading":0.028798856796209797, "vx":0.8510546823755913, "vy":0.88302560531723, "omega":-0.7710925611104655, "ax":-22.787082811023808, "ay":-23.643107792382715, "alpha":20.646088211326145, "fx":[-306.95613371172647,-214.45640732387,-35.299148510694714,-218.49182777660005], "fy":[-50.46330441881009,-225.4797127562022,-309.064962685133,-219.3170174682804]}, - {"t":1.0926420849095964, "x":6.152, "y":5.296, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[0.0,0.0,0.0,0.0], "fy":[0.0,0.0,0.0,0.0]}], + {"t":0.0, "x":4.062, "y":5.039, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":29.22646, "ay":-12.4248, "alpha":25.02487, "fx":[308.66375,118.22813,256.38505,310.99047], "fy":[32.17345,-287.66958,-176.3521,9.16376]}, + {"t":0.03798, "x":4.08308, "y":5.03004, "heading":0.0, "vx":1.11015, "vy":-0.47195, "omega":0.95056, "ax":29.02176, "ay":-12.0712, "alpha":25.78922, "fx":[306.21665,114.45098,256.04717,310.58881], "fy":[42.65786,-288.73841,-176.38943,11.81472]}, + {"t":0.07597, "x":4.14619, "y":5.0034, "heading":0.03611, "vx":2.21253, "vy":-0.93047, "omega":1.93015, "ax":-5.31588, "ay":5.73397, "alpha":57.2487, "fx":[-206.30007,-257.34874,190.73078,92.07488], "fy":[198.6756,-105.55381,-161.88634,263.83082]}, + {"t":0.11395, "x":4.2264, "y":4.97219, "heading":0.10942, "vx":2.01061, "vy":-0.71267, "omega":4.10472, "ax":-14.85422, "ay":1.79008, "alpha":35.16936, "fx":[-221.64643,-217.80852,-19.0475,-46.82946], "fy":[103.27062,-95.7234,-139.34235,192.6925]}, + {"t":0.15194, "x":4.29205, "y":4.94642, "heading":0.26534, "vx":1.44638, "vy":-0.64467, "omega":5.44061, "ax":1.87865, "ay":-12.06938, "alpha":-17.57273, "fx":[84.37697,70.10206,-66.5846,-23.98369], "fy":[-137.69418,-36.91128,-71.99502,-163.99296]}, + {"t":0.18992, "x":4.34835, "y":4.91322, "heading":0.472, "vx":1.51774, "vy":-1.10312, "omega":4.77312, "ax":6.72912, "ay":-9.42691, "alpha":-22.95499, "fx":[147.43351,110.9955,-54.43225,24.92393], "fy":[-105.79432,22.95475,-63.82037,-174.03805]}, + {"t":0.22791, "x":4.41085, "y":4.86452, "heading":0.6533, "vx":1.77334, "vy":-1.4612, "omega":3.90118, "ax":6.21721, "ay":-5.36327, "alpha":-17.01785, "fx":[125.1957,70.82714,-27.1476,42.63077], "fy":[-54.04352,34.31033,-41.50036,-121.22196]}, + {"t":0.26589, "x":4.4827, "y":4.80515, "heading":0.80149, "vx":2.0095, "vy":-1.66492, "omega":3.25477, "ax":7.4523, "ay":-0.76385, "alpha":-16.00291, "fx":[130.7334,66.00341,-10.17433,66.9604], "fy":[-5.13399,69.58721,-8.93519,-81.50379]}, + {"t":0.30388, "x":4.5644, "y":4.74135, "heading":0.92512, "vx":2.29257, "vy":-1.69394, "omega":2.6469, "ax":7.18846, "ay":3.81803, "alpha":-11.91004, "fx":[111.42369,53.4684,7.05569,72.59949], "fy":[38.59925,87.3117,27.53576,-23.55937]}, + {"t":0.34186, "x":4.65667, "y":4.67977, "heading":1.02566, "vx":2.56562, "vy":-1.54891, "omega":2.19451, "ax":2.72318, "ay":5.77981, "alpha":1.31492, "fx":[17.23745,24.76903,29.04958,21.58501], "fy":[47.90557,43.39706,50.43157,54.89161]}, + {"t":0.37985, "x":4.75609, "y":4.6251, "heading":1.10902, "vx":2.66906, "vy":-1.32937, "omega":2.24445, "ax":-1.65772, "ay":7.71478, "alpha":14.67331, "fx":[-81.57054,8.29774,50.85551,-33.97744], "fy":[46.5884,2.45857,89.51649,123.88896]}, + {"t":0.41783, "x":4.85628, "y":4.58017, "heading":1.19427, "vx":2.6061, "vy":-1.03632, "omega":2.80181, "ax":-5.00057, "ay":9.36496, "alpha":23.19446, "fx":[-147.1747,-2.23793,57.49368,-78.19746], "fy":[41.90057,-20.49594,133.766,163.42011]}, + {"t":0.45581, "x":4.95166, "y":4.54756, "heading":1.3007, "vx":2.41615, "vy":-0.6806, "omega":3.68284, "ax":6.87381, "ay":-3.90402, "alpha":-29.79574, "fx":[174.06518,-0.95611,-59.05323,119.78734], "fy":[27.23922,99.80439,-119.21492,-140.64133]}, + {"t":0.4938, "x":5.0484, "y":4.51889, "heading":1.44059, "vx":2.67725, "vy":-0.82889, "omega":2.55106, "ax":16.8875, "ay":7.46157, "alpha":-44.07592, "fx":[243.35037,41.43768,4.02014,285.69494], "fy":[169.89803,286.99215,-143.50308,-59.54871]}, + {"t":0.53178, "x":5.16228, "y":4.49279, "heading":1.53749, "vx":3.31871, "vy":-0.54547, "omega":0.87686, "ax":6.46646, "ay":31.78224, "alpha":-23.08465, "fx":[131.34584,-38.73569,-101.76577,229.14079], "fy":[280.1133,306.79025,288.98531,205.32467]}, + {"t":0.56977, "x":5.293, "y":4.495, "heading":1.5708, "vx":3.56434, "vy":0.66177, "omega":0.0, "ax":-17.46995, "ay":29.01855, "alpha":-17.23188, "fx":[-39.50543,-184.48359,-273.67135,-96.65742], "fy":[306.482,248.47949,142.44759,289.78531]}, + {"t":0.60712, "x":5.41394, "y":4.53995, "heading":1.5708, "vx":2.91187, "vy":1.74556, "omega":-0.64358, "ax":-23.36464, "ay":5.78071, "alpha":-39.67091, "fx":[-67.34423,-252.67307,-297.20012,-177.63429], "fy":[289.77838,168.0164,-53.64736,-207.49091]}, + {"t":0.64446, "x":5.50639, "y":4.60918, "heading":1.54676, "vx":2.03924, "vy":1.96145, "omega":-2.12521, "ax":-17.08062, "ay":-6.1137, "alpha":-43.98572, "fx":[-45.13948,-279.9739,-232.99854,-22.96113], "fy":[187.33723,55.16289,-173.33039,-277.1542]}, + {"t":0.68181, "x":5.57064, "y":4.67817, "heading":1.46739, "vx":1.40131, "vy":1.73312, "omega":-3.768, "ax":-13.78367, "ay":-2.06079, "alpha":-33.13955, "fx":[-13.95505,-206.46978,-209.47327,-39.01462], "fy":[120.73464,88.84614,-101.22862,-178.45898]}, + {"t":0.71916, "x":5.61337, "y":4.74146, "heading":1.32666, "vx":0.88652, "vy":1.65615, "omega":-5.0057, "ax":2.67286, "ay":9.54645, "alpha":16.02221, "fx":[-47.38197,70.1194,83.23389,-15.04226], "fy":[49.59058,20.06847,115.03443,140.07137]}, + {"t":0.75651, "x":5.64834, "y":4.80998, "heading":1.13971, "vx":0.98635, "vy":2.01269, "omega":-4.4073, "ax":12.85914, "ay":3.66777, "alpha":26.60202, "fx":[-4.2955,164.00355,201.02757,76.72497], "fy":[-16.39144,-87.29775,66.37749,162.087]}, + {"t":0.79386, "x":5.69415, "y":4.8877, "heading":0.9751, "vx":1.46661, "vy":2.14968, "omega":-3.41376, "ax":9.0516, "ay":-2.87121, "alpha":9.84045, "fx":[33.74997,84.39228,117.89061,71.89733], "fy":[-36.34012,-69.3188,-14.90216,22.8841]}, + {"t":0.83121, "x":5.75524, "y":4.96599, "heading":0.8476, "vx":1.80467, "vy":2.04244, "omega":-3.04624, "ax":3.14094, "ay":-8.1863, "alpha":-10.87658, "fx":[77.71358,26.03875,-25.48154,28.58224], "fy":[-66.391,-20.53755,-76.11455,-115.45008]}, + {"t":0.86855, "x":5.82483, "y":5.03656, "heading":0.73383, "vx":1.92198, "vy":1.7367, "omega":-3.45246, "ax":-2.11369, "ay":-12.19982, "alpha":-26.56526, "fx":[113.8546,-18.46358,-145.61249,-21.68518], "fy":[-125.93799,20.90841,-106.1301,-203.87133]}, + {"t":0.9059, "x":5.89514, "y":5.09291, "heading":0.60489, "vx":1.84304, "vy":1.28106, "omega":-4.44462, "ax":-4.97589, "ay":-12.84214, "alpha":-28.56965, "fx":[98.3344,-32.79011,-176.9493,-57.87208], "fy":[-156.51288,25.78697,-93.35174,-212.80464]}, + {"t":0.94325, "x":5.9605, "y":5.1318, "heading":0.43889, "vx":1.6572, "vy":0.80143, "omega":-5.51164, "ax":1.58376, "ay":16.19337, "alpha":43.8884, "fx":[-149.68061,-121.31935,246.51505,78.36354], "fy":[232.01597,-66.98158,112.68735,273.16732]}, + {"t":0.9806, "x":6.0235, "y":5.17303, "heading":0.23304, "vx":1.71635, "vy":1.40622, "omega":-3.87249, "ax":0.4045, "ay":8.03825, "alpha":60.94919, "fx":[-190.75105,-208.20123,289.08792,123.62512], "fy":[226.59282,-191.04309,-33.15493,271.06177]}, + {"t":1.01795, "x":6.08788, "y":5.23115, "heading":0.08841, "vx":1.73145, "vy":1.70644, "omega":-1.59616, "ax":-23.57281, "ay":-22.04692, "alpha":22.09119, "fx":[-306.59514,-209.05063,-23.56352,-262.72418], "fy":[-50.5828,-230.15482,-309.79414,-159.49182]}, + {"t":1.05529, "x":6.13611, "y":5.27951, "heading":0.0288, "vx":0.85105, "vy":0.88303, "omega":-0.77109, "ax":-22.78708, "ay":-23.64311, "alpha":20.64609, "fx":[-306.95613,-214.45641,-35.29915,-218.49183], "fy":[-50.4633,-225.47971,-309.06496,-219.31702]}, + {"t":1.09264, "x":6.152, "y":5.296, "heading":0.0, "vx":0.0, "vy":0.0, "omega":0.0, "ax":0.0, "ay":0.0, "alpha":0.0, "fx":[0.0,0.0,0.0,0.0], "fy":[0.0,0.0,0.0,0.0]}], "splits":[0] }, "events":[] -} \ No newline at end of file +} diff --git a/java/SwerveWithChoreo/src/main/deploy/choreo/Tests.chor b/java/SwerveWithChoreo/src/main/deploy/choreo/Tests.chor index f424b0c1..58d5ce55 100644 --- a/java/SwerveWithChoreo/src/main/deploy/choreo/Tests.chor +++ b/java/SwerveWithChoreo/src/main/deploy/choreo/Tests.chor @@ -1,6 +1,6 @@ { "name":"Tests", - "version":"v2025.0.0", + "version":1, "type":"Swerve", "variables":{ "expressions":{}, @@ -51,6 +51,10 @@ "exp":"2.327950310559006 N m", "val":2.327950310559006 }, + "cof":{ + "exp":"1.5", + "val":1.5 + }, "bumper":{ "front":{ "exp":"16 in", @@ -71,4 +75,4 @@ } }, "generationFeatures":[] -} \ No newline at end of file +} diff --git a/java/SwerveWithChoreo/src/main/java/frc/robot/AutoRoutines.java b/java/SwerveWithChoreo/src/main/java/frc/robot/AutoRoutines.java index 3c64cf8d..5c2eeb1e 100644 --- a/java/SwerveWithChoreo/src/main/java/frc/robot/AutoRoutines.java +++ b/java/SwerveWithChoreo/src/main/java/frc/robot/AutoRoutines.java @@ -1,31 +1,24 @@ package frc.robot; import choreo.auto.AutoFactory; -import choreo.auto.AutoLoop; +import choreo.auto.AutoRoutine; import choreo.auto.AutoTrajectory; -import edu.wpi.first.wpilibj2.command.Command; -import frc.robot.subsystems.CommandSwerveDrivetrain; public class AutoRoutines { - private final CommandSwerveDrivetrain m_drivetrain; + private final AutoFactory m_factory; - public AutoRoutines(CommandSwerveDrivetrain drivetrain) { - m_drivetrain = drivetrain; + public AutoRoutines(AutoFactory factory) { + m_factory = factory; } - public Command simplePathAuto(AutoFactory factory) { - final AutoLoop routine = factory.newLoop("SimplePath Auto"); - final AutoTrajectory simplePath = factory.trajectory("SimplePath", routine); + public AutoRoutine simplePathAuto() { + final AutoRoutine routine = m_factory.newRoutine("SimplePath Auto"); + final AutoTrajectory simplePath = routine.trajectory("SimplePath"); - routine.enabled().onTrue( - m_drivetrain.runOnce(() -> - simplePath.getInitialPose().ifPresentOrElse( - pose -> m_drivetrain.resetPose(pose), - routine::kill - ) - ) - .andThen(simplePath.cmd()) + routine.active().onTrue( + routine.resetOdometry(simplePath) + .andThen(simplePath.cmd()) ); - return routine.cmd(); + return routine; } } diff --git a/java/SwerveWithChoreo/src/main/java/frc/robot/Robot.java b/java/SwerveWithChoreo/src/main/java/frc/robot/Robot.java index 191040e9..fd9601c9 100644 --- a/java/SwerveWithChoreo/src/main/java/frc/robot/Robot.java +++ b/java/SwerveWithChoreo/src/main/java/frc/robot/Robot.java @@ -25,9 +25,6 @@ public Robot() { public void robotPeriodic() { CommandScheduler.getInstance().run(); - /* update auto routine selection */ - m_robotContainer.autoChooser.update(); - /* * This example of adding Limelight is very simple and may not be sufficient for on-field use. * Users typically need to provide a standard deviation that scales with the distance to target diff --git a/java/SwerveWithChoreo/src/main/java/frc/robot/RobotContainer.java b/java/SwerveWithChoreo/src/main/java/frc/robot/RobotContainer.java index 547e4f8a..87870ae4 100644 --- a/java/SwerveWithChoreo/src/main/java/frc/robot/RobotContainer.java +++ b/java/SwerveWithChoreo/src/main/java/frc/robot/RobotContainer.java @@ -7,16 +7,13 @@ import static edu.wpi.first.units.Units.*; import com.ctre.phoenix6.swerve.SwerveModule.DriveRequestType; +import com.ctre.phoenix6.swerve.SwerveRequest; -import choreo.Choreo; import choreo.auto.AutoChooser; import choreo.auto.AutoFactory; -import com.ctre.phoenix6.swerve.SwerveRequest; - import edu.wpi.first.math.geometry.Rotation2d; -import edu.wpi.first.wpilibj.DriverStation; -import edu.wpi.first.wpilibj.DriverStation.Alliance; +import edu.wpi.first.wpilibj.smartdashboard.SmartDashboard; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.button.CommandXboxController; import edu.wpi.first.wpilibj2.command.sysid.SysIdRoutine.Direction; @@ -44,21 +41,16 @@ public class RobotContainer { public final CommandSwerveDrivetrain drivetrain = TunerConstants.createDrivetrain(); /* Path follower */ - private final AutoRoutines autoRoutines = new AutoRoutines(drivetrain); private final AutoFactory autoFactory; - public final AutoChooser autoChooser; + private final AutoRoutines autoRoutines; + private final AutoChooser autoChooser = new AutoChooser(); public RobotContainer() { - autoFactory = Choreo.createAutoFactory( - drivetrain, - () -> drivetrain.getState().Pose, - drivetrain::followPath, - () -> DriverStation.getAlliance().orElse(Alliance.Blue) == Alliance.Red, - new AutoFactory.AutoBindings() - ); + autoFactory = drivetrain.createAutoFactory(); + autoRoutines = new AutoRoutines(autoFactory); - autoChooser = new AutoChooser(autoFactory, ""); - autoChooser.addAutoRoutine("SimplePath", autoRoutines::simplePathAuto); + autoChooser.addRoutine("SimplePath", autoRoutines::simplePathAuto); + SmartDashboard.putData("Auto Chooser", autoChooser); configureBindings(); } @@ -101,7 +93,7 @@ private void configureBindings() { } public Command getAutonomousCommand() { - /* First put the drivetrain into auto run mode, then run the auto */ - return autoChooser.getSelectedAutoRoutine(); + /* Run the routine selected from the auto chooser */ + return autoChooser.selectedCommand(); } } diff --git a/java/SwerveWithChoreo/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java b/java/SwerveWithChoreo/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java index b56053f0..86e77432 100644 --- a/java/SwerveWithChoreo/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java +++ b/java/SwerveWithChoreo/src/main/java/frc/robot/subsystems/CommandSwerveDrivetrain.java @@ -11,10 +11,12 @@ import com.ctre.phoenix6.swerve.SwerveModuleConstants; import com.ctre.phoenix6.swerve.SwerveRequest; +import choreo.Choreo.TrajectoryLogger; +import choreo.auto.AutoFactory; +import choreo.auto.AutoFactory.AutoBindings; import choreo.trajectory.SwerveSample; import edu.wpi.first.math.Matrix; import edu.wpi.first.math.controller.PIDController; -import edu.wpi.first.math.geometry.Pose2d; import edu.wpi.first.math.geometry.Rotation2d; import edu.wpi.first.math.numbers.N1; import edu.wpi.first.math.numbers.N3; @@ -177,6 +179,46 @@ public CommandSwerveDrivetrain( } } + /** + * Creates a new auto factory for this drivetrain. + * + * @return AutoFactory for this drivetrain + */ + public AutoFactory createAutoFactory() { + return createAutoFactory(new AutoBindings()); + } + + /** + * Creates a new auto factory for this drivetrain with the given + * global auto bindings. + * + * @param autoBindings Global bindings to apply to the factory + * @return AutoFactory for this drivetrain + */ + public AutoFactory createAutoFactory(AutoBindings autoBindings) { + return createAutoFactory(autoBindings, (sample, isStart) -> {}); + } + + /** + * Creates a new auto factory for this drivetrain with the given + * global auto bindings and trajectory logger. + * + * @param autoBindings Global bindings to apply to the factory + * @param trajLogger Logger for the trajectory + * @return AutoFactory for this drivetrain + */ + public AutoFactory createAutoFactory(AutoBindings autoBindings, TrajectoryLogger trajLogger) { + return new AutoFactory( + () -> getState().Pose, + this::resetPose, + this::followPath, + true, + this, + autoBindings, + trajLogger + ); + } + /** * Returns a command that applies the specified control request to this swerve drivetrain. * @@ -190,12 +232,13 @@ public Command applyRequest(Supplier requestSupplier) { /** * Follows the given field-centric path sample with PID. * - * @param pose Current pose of the robot * @param sample Sample along the path to follow */ - public void followPath(Pose2d pose, SwerveSample sample) { + public void followPath(SwerveSample sample) { m_pathThetaController.enableContinuousInput(-Math.PI, Math.PI); + var pose = getState().Pose; + var targetSpeeds = sample.getChassisSpeeds(); targetSpeeds.vxMetersPerSecond += m_pathXController.calculate( pose.getX(), sample.x diff --git a/java/SwerveWithChoreo/vendordeps/ChoreoLib2025Beta.json b/java/SwerveWithChoreo/vendordeps/ChoreoLib2025Beta.json index 1f6b2b3f..f63c8bc2 100644 --- a/java/SwerveWithChoreo/vendordeps/ChoreoLib2025Beta.json +++ b/java/SwerveWithChoreo/vendordeps/ChoreoLib2025Beta.json @@ -1,19 +1,19 @@ { "fileName": "ChoreoLib2025Beta.json", "name": "ChoreoLib", - "version": "2025.0.0-beta-6", + "version": "2025.0.0-beta-9", "uuid": "b5e23f0a-dac9-4ad2-8dd6-02767c520aca", "frcYear": "2025", "mavenUrls": [ - "https://SleipnirGroup.github.io/ChoreoLib/dep", + "https://lib.choreo.autos/dep", "https://repo1.maven.org/maven2" ], - "jsonUrl": "https://SleipnirGroup.github.io/ChoreoLib/dep/ChoreoLib2025Beta.json", + "jsonUrl": "https://lib.choreo.autos/dep/ChoreoLib2025Beta.json", "javaDependencies": [ { "groupId": "choreo", "artifactId": "ChoreoLib-java", - "version": "2025.0.0-beta-6" + "version": "2025.0.0-beta-9" }, { "groupId": "com.google.code.gson", @@ -26,7 +26,7 @@ { "groupId": "choreo", "artifactId": "ChoreoLib-cpp", - "version": "2025.0.0-beta-6", + "version": "2025.0.0-beta-9", "libName": "ChoreoLib", "headerClassifier": "headers", "sharedLibrary": false, diff --git a/java/SwerveWithPathPlanner/.vscode/settings.json b/java/SwerveWithPathPlanner/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/SwerveWithPathPlanner/.vscode/settings.json +++ b/java/SwerveWithPathPlanner/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/SwerveWithPathPlanner/build.gradle b/java/SwerveWithPathPlanner/build.gradle index c30eef6c..7025be08 100644 --- a/java/SwerveWithPathPlanner/build.gradle +++ b/java/SwerveWithPathPlanner/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -33,8 +33,8 @@ deploy { frcStaticFileDeploy(getArtifactTypeClass('FileTreeArtifact')) { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' - deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + deleteOldFiles = true // Change to true to delete files on roboRIO that no + // longer exist in deploy directory of this project } } } diff --git a/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java b/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java index 2192251c..30dd632d 100644 --- a/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java +++ b/java/SwerveWithPathPlanner/src/main/java/frc/robot/RobotContainer.java @@ -88,7 +88,7 @@ private void configureBindings() { } public Command getAutonomousCommand() { - /* First put the drivetrain into auto run mode, then run the auto */ + /* Run the path selected from the auto chooser */ return autoChooser.getSelected(); } } diff --git a/java/VelocityClosedLoop/.vscode/settings.json b/java/VelocityClosedLoop/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/VelocityClosedLoop/.vscode/settings.json +++ b/java/VelocityClosedLoop/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/VelocityClosedLoop/build.gradle b/java/VelocityClosedLoop/build.gradle index dbdf997e..fabda960 100644 --- a/java/VelocityClosedLoop/build.gradle +++ b/java/VelocityClosedLoop/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } } diff --git a/java/WaitForAll/.vscode/settings.json b/java/WaitForAll/.vscode/settings.json index 4ed293b7..612cdd0d 100644 --- a/java/WaitForAll/.vscode/settings.json +++ b/java/WaitForAll/.vscode/settings.json @@ -25,5 +25,36 @@ } }, ], - "java.test.defaultConfig": "WPIlibUnitTests" + "java.test.defaultConfig": "WPIlibUnitTests", + "java.import.gradle.annotationProcessing.enabled": false, + "java.completion.favoriteStaticMembers": [ + "org.junit.Assert.*", + "org.junit.Assume.*", + "org.junit.jupiter.api.Assertions.*", + "org.junit.jupiter.api.Assumptions.*", + "org.junit.jupiter.api.DynamicContainer.*", + "org.junit.jupiter.api.DynamicTest.*", + "org.mockito.Mockito.*", + "org.mockito.ArgumentMatchers.*", + "org.mockito.Answers.*", + "edu.wpi.first.units.Units.*" + ], + "java.completion.filteredTypes": [ + "java.awt.*", + "com.sun.*", + "sun.*", + "jdk.*", + "org.graalvm.*", + "io.micrometer.shaded.*", + "java.beans.*", + "java.util.Base64.*", + "java.util.Timer", + "java.sql.*", + "javax.swing.*", + "javax.management.*", + "javax.smartcardio.*", + "edu.wpi.first.math.proto.*", + "edu.wpi.first.math.**.proto.*", + "edu.wpi.first.math.**.struct.*", + ] } diff --git a/java/WaitForAll/build.gradle b/java/WaitForAll/build.gradle index dbdf997e..fabda960 100644 --- a/java/WaitForAll/build.gradle +++ b/java/WaitForAll/build.gradle @@ -1,6 +1,6 @@ plugins { id "java" - id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-2" + id "edu.wpi.first.GradleRIO" version "2025.1.1-beta-3" } java { @@ -34,7 +34,7 @@ deploy { files = project.fileTree('src/main/deploy') directory = '/home/lvuser/deploy' deleteOldFiles = false // Change to true to delete files on roboRIO that no - // longer exist in deploy directory on roboRIO + // longer exist in deploy directory of this project } } }