Merge branch 'main' of https://github.com/StuyPulse/PulseCrewPrep

StuyPulse · Apr 3, 2024 · f64eee0 · f64eee0
2 parents de472e1 + 5cd57f3
commit f64eee0
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 22 deletions.
diff --git a/src/main/java/com/stuypulse/robot/commands/auton/Mobility.java b/src/main/java/com/stuypulse/robot/commands/auton/Mobility.java
@@ -9,7 +9,7 @@
 public class Mobility extends SequentialCommandGroup {
     public Mobility() {
         addCommands(
-            new WaitCommand(2),
+            new WaitCommand(1),
 
             new SwerveDriveBack(2).withTimeout(2)
             //new TankDriveBack().withTimeout(2)

diff --git a/src/main/java/com/stuypulse/robot/commands/auton/Preload.java b/src/main/java/com/stuypulse/robot/commands/auton/Preload.java
@@ -1,6 +1,7 @@
 package com.stuypulse.robot.commands.auton;
 
 import com.stuypulse.robot.commands.launcher.LauncherLaunch;
+import com.stuypulse.robot.commands.launcher.LauncherStop;
 import com.stuypulse.robot.commands.shooter.ShootCommand;
 
 import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
@@ -9,7 +10,7 @@
 public class Preload extends SequentialCommandGroup {
     public Preload() {
         addCommands(
-            new WaitCommand(2),
+            new WaitCommand(1),
             new LauncherLaunch(0,1).withTimeout(0.25),
             new LauncherLaunch(1, 1)
             // new ShootCommand(1,1)

diff --git a/src/main/java/com/stuypulse/robot/commands/launcher/LauncherLaunch.java b/src/main/java/com/stuypulse/robot/commands/launcher/LauncherLaunch.java
@@ -3,8 +3,9 @@
 import com.stuypulse.robot.subsystems.Launcher;
 
 import edu.wpi.first.wpilibj2.command.Command;
+import edu.wpi.first.wpilibj2.command.InstantCommand;
 
-public class LauncherLaunch extends Command {
+public class LauncherLaunch extends InstantCommand {
 
     private final Launcher launcher;
     private final Number feederSpeed;

diff --git a/vendordeps/PathplannerLib.json b/vendordeps/PathplannerLib.json
@@ -1,7 +1,7 @@
 {
     "fileName": "PathplannerLib.json",
     "name": "PathplannerLib",
-    "version": "2024.2.3",
+    "version": "2024.2.7",
     "uuid": "1b42324f-17c6-4875-8e77-1c312bc8c786",
     "frcYear": "2024",
     "mavenUrls": [
@@ -12,15 +12,15 @@
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-java",
-            "version": "2024.2.3"
+            "version": "2024.2.7"
         }
     ],
     "jniDependencies": [],
     "cppDependencies": [
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-cpp",
-            "version": "2024.2.3",
+            "version": "2024.2.7",
             "libName": "PathplannerLib",
             "headerClassifier": "headers",
             "sharedLibrary": false,

diff --git a/vendordeps/Phoenix5.json b/vendordeps/Phoenix5.json
@@ -1,7 +1,7 @@
 {
     "fileName": "Phoenix5.json",
     "name": "CTRE-Phoenix (v5)",
-    "version": "5.33.0",
+    "version": "5.33.1",
     "frcYear": 2024,
     "uuid": "ab676553-b602-441f-a38d-f1296eff6537",
     "mavenUrls": [
@@ -20,19 +20,19 @@
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "api-java",
-            "version": "5.33.0"
+            "version": "5.33.1"
         },
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "wpiapi-java",
-            "version": "5.33.0"
+            "version": "5.33.1"
         }
     ],
     "jniDependencies": [
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "cci",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -45,7 +45,7 @@
         {
             "groupId": "com.ctre.phoenix.sim",
             "artifactId": "cci-sim",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -60,7 +60,7 @@
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "wpiapi-cpp",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_Phoenix_WPI",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -75,7 +75,7 @@
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "api-cpp",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_Phoenix",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -90,7 +90,7 @@
         {
             "groupId": "com.ctre.phoenix",
             "artifactId": "cci",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_PhoenixCCI",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -105,7 +105,7 @@
         {
             "groupId": "com.ctre.phoenix.sim",
             "artifactId": "wpiapi-cpp-sim",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_Phoenix_WPISim",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -120,7 +120,7 @@
         {
             "groupId": "com.ctre.phoenix.sim",
             "artifactId": "api-cpp-sim",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_PhoenixSim",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -135,7 +135,7 @@
         {
             "groupId": "com.ctre.phoenix.sim",
             "artifactId": "cci-sim",
-            "version": "5.33.0",
+            "version": "5.33.1",
             "libName": "CTRE_PhoenixCCISim",
             "headerClassifier": "headers",
             "sharedLibrary": true,

diff --git a/vendordeps/REVLib.json b/vendordeps/REVLib.json
@@ -1,7 +1,7 @@
 {
     "fileName": "REVLib.json",
     "name": "REVLib",
-    "version": "2024.2.1",
+    "version": "2024.2.4",
     "frcYear": "2024",
     "uuid": "3f48eb8c-50fe-43a6-9cb7-44c86353c4cb",
     "mavenUrls": [
@@ -12,14 +12,14 @@
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "REVLib-java",
-            "version": "2024.2.1"
+            "version": "2024.2.4"
         }
     ],
     "jniDependencies": [
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "REVLib-driver",
-            "version": "2024.2.1",
+            "version": "2024.2.4",
             "skipInvalidPlatforms": true,
             "isJar": false,
             "validPlatforms": [
@@ -37,7 +37,7 @@
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "REVLib-cpp",
-            "version": "2024.2.1",
+            "version": "2024.2.4",
             "libName": "REVLib",
             "headerClassifier": "headers",
             "sharedLibrary": false,
@@ -55,7 +55,7 @@
         {
             "groupId": "com.revrobotics.frc",
             "artifactId": "REVLib-driver",
-            "version": "2024.2.1",
+            "version": "2024.2.4",
             "libName": "REVLibDriver",
             "headerClassifier": "headers",
             "sharedLibrary": false,