Merge pull request #147 from Robocubs/selfridge-changes

Robocubs · Jun 18, 2024 · f924a54 · f924a54
2 parents 2c7f2c3 + 0fc70c6
commit f924a54
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/main/java/com/team1701/robot/RobotContainer.java b/src/main/java/com/team1701/robot/RobotContainer.java
@@ -101,7 +101,7 @@ public RobotContainer() {
                                         TalonFxMotorFactory.createDriveMotorIOTalonFxFoc(10),
                                         TalonFxMotorFactory.createSteerMotorIOTalonFxFoc(11),
                                         new EncoderIOAnalog(0),
-                                        Rotation2d.fromRadians(-2.262)),
+                                        Rotation2d.fromRadians(-2.237)),
                                 new SwerveModuleIO(
                                         TalonFxMotorFactory.createDriveMotorIOTalonFxFoc(12),
                                         TalonFxMotorFactory.createSteerMotorIOTalonFxFoc(13),
@@ -501,7 +501,9 @@ private void setupControllerBindings() {
         var setAmpModeCommand = runOnce(() -> mRobotState.setScoringMode(ScoringMode.AMP))
                 .ignoringDisable(true)
                 .withName("SetAmpScoringMode");
-        var setDriveAssist = runOnce(() -> mDrive.toggleDriveAssist(), mDrive);
+        var setDriveAssist = runOnce(() -> mDrive.toggleDriveAssist(), mDrive)
+                .ignoringDisable(true)
+                .withName("SetDriveAssist");
         var setClimbModeCommand = runOnce(() -> mRobotState.setScoringMode(ScoringMode.CLIMB))
                 .ignoringDisable(true)
                 .withName("SetClimbScoringMode");

diff --git a/vendordeps/photonlib.json b/vendordeps/photonlib.json
@@ -1,7 +1,7 @@
 {
     "fileName": "photonlib.json",
     "name": "photonlib",
-    "version": "v2024.2.9",
+    "version": "v2024.3.1",
     "uuid": "515fe07e-bfc6-11fa-b3de-0242ac130004",
     "frcYear": "2024",
     "mavenUrls": [
@@ -14,7 +14,7 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photonlib-cpp",
-            "version": "v2024.2.9",
+            "version": "v2024.3.1",
             "libName": "photonlib",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -29,7 +29,7 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photontargeting-cpp",
-            "version": "v2024.2.9",
+            "version": "v2024.3.1",
             "libName": "photontargeting",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -46,12 +46,12 @@
         {
             "groupId": "org.photonvision",
             "artifactId": "photonlib-java",
-            "version": "v2024.2.9"
+            "version": "v2024.3.1"
         },
         {
             "groupId": "org.photonvision",
             "artifactId": "photontargeting-java",
-            "version": "v2024.2.9"
+            "version": "v2024.3.1"
         }
     ]
 }