studia 2

WindingMotor · Jan 6, 2025 · ed63665 · ed63665
1 parent 86731fa
commit ed63665
Show file tree

Hide file tree

Showing 4 changed files with 89 additions and 55 deletions.
diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java
@@ -7,9 +7,11 @@
 
 package frc.robot;
 
+import com.pathplanner.lib.auto.NamedCommands;
 import edu.wpi.first.math.geometry.Pose2d;
 import edu.wpi.first.wpilibj.Filesystem;
 import edu.wpi.first.wpilibj2.command.Command;
+import edu.wpi.first.wpilibj2.command.PrintCommand;
 import edu.wpi.first.wpilibj2.command.button.CommandXboxController;
 import frc.robot.commands.CMD_AimAtAprilTag;
 import frc.robot.commands.CMD_AimAtPose;
@@ -48,19 +50,10 @@ public RobotContainer() {
 
 		configureDefaultCommands();
 		configureWebserverCommands();
-	}
-
-	private void configureWebserverCommands() {
-		webServer.registerCommand("T1", new CMD_AimAtAprilTag(swerve, 4, 0.1));
-		webServer.registerCommand("T2", new CMD_AimAtAprilTag(swerve, 12, 0.1));
+		configurePathPlannerCommands();
 	}
 
 	private void configureDefaultCommands() {
-		// swerve.setDefaultCommand(new CMD_Drive(swerve, driverController, globalInputMap)); Drive
-		// normal
-		// swerve.setDefaultCommand(new CMD_AimAtSpeaker(swerve, 0.1)); Aim at speaker
-
-		// swerve.setDefaultCommand(swerve.driveToPose(new Pose2d(5.0, 5.0, new Rotation2d())));
 
 		swerve.setDefaultCommand(
 				new CMD_DriveAlign(swerve, driverController, globalInputMap)); // Drive and aim at speaker
@@ -72,6 +65,16 @@ private void configureDefaultCommands() {
 		driverController.b().onTrue(new CMD_AimAtAprilTag(swerve, 16, 0.1));
 	}
 
+	private void configureWebserverCommands() {
+		webServer.registerCommand("T1", new CMD_AimAtAprilTag(swerve, 4, 0.1));
+		webServer.registerCommand("T2", new CMD_AimAtAprilTag(swerve, 12, 0.1));
+	}
+
+	private void configurePathPlannerCommands() {
+
+		NamedCommands.registerCommand("Intake_Algae", new PrintCommand("Hi"));
+	}
+
 	public Command getAutonomousCommand() {
 		return swerve.getAutonomousCommand("Test");
 	}

diff --git a/src/main/java/frc/robot/constants/BuildConstants.java b/src/main/java/frc/robot/constants/BuildConstants.java
@@ -12,12 +12,12 @@ public final class BuildConstants {
 	public static final String MAVEN_GROUP = "";
 	public static final String MAVEN_NAME = "SwerveDrive2025";
 	public static final String VERSION = "unspecified";
-	public static final int GIT_REVISION = 24;
-	public static final String GIT_SHA = "87c01dbf21a68bf0a22ba8c04978ece88e20f094";
-	public static final String GIT_DATE = "2025-01-05 14:32:51 EST";
+	public static final int GIT_REVISION = 25;
+	public static final String GIT_SHA = "86731fa5b99debfd39bfccb543864411412d9b50";
+	public static final String GIT_DATE = "2025-01-05 18:35:25 EST";
 	public static final String GIT_BRANCH = "main";
-	public static final String BUILD_DATE = "2025-01-05 18:34:58 EST";
-	public static final long BUILD_UNIX_TIME = 1736120098034L;
+	public static final String BUILD_DATE = "2025-01-05 18:55:22 EST";
+	public static final long BUILD_UNIX_TIME = 1736121322804L;
 	public static final int DIRTY = 1;
 
 	private BuildConstants() {}

diff --git a/vendordeps/NavX.json b/vendordeps/NavX.json
diff --git a/vendordeps/Studica-2025.1.1-beta-4.json b/vendordeps/Studica-2025.1.1-beta-4.json
@@ -0,0 +1,71 @@
+{
+    "fileName": "Studica-2025.1.1-beta-4.json",
+    "name": "Studica",
+    "version": "2025.1.1-beta-4",
+    "uuid": "cb311d09-36e9-4143-a032-55bb2b94443b",
+    "frcYear": "2025",
+    "mavenUrls": [
+        "https://dev.studica.com/maven/release/2025/"
+    ],
+    "jsonUrl": "https://dev.studica.com/releases/2025/Studica-2025.1.1-beta-4.json",
+    "cppDependencies": [
+        {
+            "artifactId": "Studica-cpp",
+            "binaryPlatforms": [
+                "linuxathena",
+                "linuxarm32",
+                "linuxarm64",
+                "linuxx86-64",
+                "osxuniversal",
+                "windowsx86-64"
+            ],
+            "groupId": "com.studica.frc",
+            "headerClassifier": "headers",
+            "libName": "Studica",
+            "sharedLibrary": false,
+            "skipInvalidPlatforms": true,
+            "version": "2025.1.1-beta-4"
+        },
+        {
+            "artifactId": "Studica-driver",
+            "binaryPlatforms": [
+                "linuxathena",
+                "linuxarm32",
+                "linuxarm64",
+                "linuxx86-64",
+                "osxuniversal",
+                "windowsx86-64"
+            ],
+            "groupId": "com.studica.frc",
+            "headerClassifier": "headers",
+            "libName": "StudicaDriver",
+            "sharedLibrary": false,
+            "skipInvalidPlatforms": true,
+            "version": "2025.1.1-beta-4"
+        }
+    ],
+    "javaDependencies": [
+        {
+            "artifactId": "Studica-java",
+            "groupId": "com.studica.frc",
+            "version": "2025.1.1-beta-4"
+        }
+    ],
+    "jniDependencies": [
+        {
+            "artifactId": "Studica-driver",
+            "groupId": "com.studica.frc",
+            "isJar": false,
+            "skipInvalidPlatforms": true,
+            "validPlatforms": [
+                "linuxathena",
+                "linuxarm32",
+                "linuxarm64",
+                "linuxx86-64",
+                "osxuniversal",
+                "windowsx86-64"
+            ],
+            "version": "2025.1.1-beta-4"
+        }
+    ]
+}