Update example projects (#962)

mjansen4857 · Jan 2, 2025 · 86e9d15 · 86e9d15
1 parent bb073a5
commit 86e9d15
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 36 deletions.
diff --git a/examples/cpp/.wpilib/wpilib_preferences.json b/examples/cpp/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": true,
     "currentLanguage": "cpp",
-    "projectYear": "2024",
+    "projectYear": "2025",
     "teamNumber": 3015
 }
diff --git a/examples/cpp/build.gradle b/examples/cpp/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "cpp"
     id "google-test-test-suite"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
 }
 
 // Define my targets (RoboRIO) and artifacts (deployable files)

diff --git a/examples/cpp/src/main/deploy/pathplanner/autos/Example Auto.auto b/examples/cpp/src/main/deploy/pathplanner/autos/Example Auto.auto
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "command": {
     "type": "sequential",
     "data": {

diff --git a/examples/cpp/src/main/deploy/pathplanner/paths/Pickup.path b/examples/cpp/src/main/deploy/pathplanner/paths/Pickup.path
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "waypoints": [
     {
       "anchor": {
@@ -9,7 +9,7 @@
       "prevControl": null,
       "nextControl": {
         "x": 3.820494796624656,
-        "y": 1.2776543621065768
+        "y": 1.2776543621065766
       },
       "isLocked": false,
       "linkedName": null
@@ -21,7 +21,7 @@
       },
       "prevControl": {
         "x": 5.891321406971974,
-        "y": 0.8077125277685265
+        "y": 0.8077125277685268
       },
       "nextControl": null,
       "isLocked": false,
@@ -55,7 +55,9 @@
     "maxVelocity": 3.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0
+    "maxAngularAcceleration": 720.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
   },
   "goalEndState": {
     "velocity": 0,

diff --git a/examples/cpp/src/main/deploy/pathplanner/paths/Score.path b/examples/cpp/src/main/deploy/pathplanner/paths/Score.path
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "waypoints": [
     {
       "anchor": {
@@ -82,7 +82,9 @@
     "maxVelocity": 3.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0
+    "maxAngularAcceleration": 720.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
   },
   "goalEndState": {
     "velocity": 0,

diff --git a/examples/cpp/src/main/deploy/pathplanner/settings.json b/examples/cpp/src/main/deploy/pathplanner/settings.json
@@ -8,14 +8,25 @@
   "defaultMaxAccel": 3.0,
   "defaultMaxAngVel": 540.0,
   "defaultMaxAngAccel": 720.0,
+  "defaultNominalVoltage": 12.0,
   "robotMass": 74.088,
   "robotMOI": 6.883,
-  "robotWheelbase": 0.546,
   "robotTrackwidth": 0.546,
   "driveWheelRadius": 0.048,
   "driveGearing": 5.143,
   "maxDriveSpeed": 5.45,
   "driveMotorType": "krakenX60",
   "driveCurrentLimit": 60.0,
-  "wheelCOF": 1.2
+  "wheelCOF": 1.2,
+  "flModuleX": 0.273,
+  "flModuleY": 0.273,
+  "frModuleX": 0.273,
+  "frModuleY": -0.273,
+  "blModuleX": -0.273,
+  "blModuleY": 0.273,
+  "brModuleX": -0.273,
+  "brModuleY": -0.273,
+  "bumperOffsetX": 0.0,
+  "bumperOffsetY": 0.0,
+  "robotFeatures": []
 }
diff --git a/...s/cpp/vendordeps/PathplannerLib-beta.json → examples/cpp/vendordeps/PathplannerLib.json b/...s/cpp/vendordeps/PathplannerLib-beta.json → examples/cpp/vendordeps/PathplannerLib.json
@@ -1,26 +1,26 @@
 {
-    "fileName": "PathplannerLib-beta.json",
+    "fileName": "PathplannerLib.json",
     "name": "PathplannerLib",
-    "version": "2025.0.0-beta-1.1",
+    "version": "2025.1.1",
     "uuid": "1b42324f-17c6-4875-8e77-1c312bc8c786",
-    "frcYear": "2024",
+    "frcYear": "2025",
     "mavenUrls": [
         "https://3015rangerrobotics.github.io/pathplannerlib/repo"
     ],
-    "jsonUrl": "https://3015rangerrobotics.github.io/pathplannerlib/PathplannerLib-beta.json",
+    "jsonUrl": "https://3015rangerrobotics.github.io/pathplannerlib/PathplannerLib.json",
     "javaDependencies": [
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-java",
-            "version": "2025.0.0-beta-1.1"
+            "version": "2025.1.1"
         }
     ],
     "jniDependencies": [],
     "cppDependencies": [
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-cpp",
-            "version": "2025.0.0-beta-1.1",
+            "version": "2025.1.1",
             "libName": "PathplannerLib",
             "headerClassifier": "headers",
             "sharedLibrary": false,

diff --git a/examples/cpp/vendordeps/WPILibNewCommands.json b/examples/cpp/vendordeps/WPILibNewCommands.json
@@ -3,7 +3,7 @@
   "name": "WPILib-New-Commands",
   "version": "1.0.0",
   "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
-  "frcYear": "2024",
+  "frcYear": "2025",
   "mavenUrls": [],
   "jsonUrl": "",
   "javaDependencies": [

diff --git a/examples/java/.wpilib/wpilib_preferences.json b/examples/java/.wpilib/wpilib_preferences.json
@@ -1,6 +1,6 @@
 {
     "enableCppIntellisense": false,
     "currentLanguage": "java",
-    "projectYear": "2024",
+    "projectYear": "2025",
     "teamNumber": 3015
 }
diff --git a/examples/java/build.gradle b/examples/java/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id "java"
-    id "edu.wpi.first.GradleRIO" version "2024.3.2"
+    id "edu.wpi.first.GradleRIO" version "2025.1.1"
 }
 
 java {

diff --git a/examples/java/src/main/deploy/pathplanner/autos/Example Auto.auto b/examples/java/src/main/deploy/pathplanner/autos/Example Auto.auto
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "command": {
     "type": "sequential",
     "data": {

diff --git a/examples/java/src/main/deploy/pathplanner/paths/Pickup.path b/examples/java/src/main/deploy/pathplanner/paths/Pickup.path
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "waypoints": [
     {
       "anchor": {
@@ -9,7 +9,7 @@
       "prevControl": null,
       "nextControl": {
         "x": 3.820494796624656,
-        "y": 1.2776543621065768
+        "y": 1.2776543621065766
       },
       "isLocked": false,
       "linkedName": null
@@ -21,7 +21,7 @@
       },
       "prevControl": {
         "x": 5.891321406971974,
-        "y": 0.8077125277685265
+        "y": 0.8077125277685268
       },
       "nextControl": null,
       "isLocked": false,
@@ -55,7 +55,9 @@
     "maxVelocity": 3.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0
+    "maxAngularAcceleration": 720.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
   },
   "goalEndState": {
     "velocity": 0,

diff --git a/examples/java/src/main/deploy/pathplanner/paths/Score.path b/examples/java/src/main/deploy/pathplanner/paths/Score.path
@@ -1,5 +1,5 @@
 {
-  "version": 1.0,
+  "version": "2025.0",
   "waypoints": [
     {
       "anchor": {
@@ -82,7 +82,9 @@
     "maxVelocity": 3.0,
     "maxAcceleration": 3.0,
     "maxAngularVelocity": 540.0,
-    "maxAngularAcceleration": 720.0
+    "maxAngularAcceleration": 720.0,
+    "nominalVoltage": 12.0,
+    "unlimited": false
   },
   "goalEndState": {
     "velocity": 0,

diff --git a/examples/java/src/main/deploy/pathplanner/settings.json b/examples/java/src/main/deploy/pathplanner/settings.json
@@ -8,14 +8,25 @@
   "defaultMaxAccel": 3.0,
   "defaultMaxAngVel": 540.0,
   "defaultMaxAngAccel": 720.0,
+  "defaultNominalVoltage": 12.0,
   "robotMass": 74.088,
   "robotMOI": 6.883,
-  "robotWheelbase": 0.546,
   "robotTrackwidth": 0.546,
   "driveWheelRadius": 0.048,
   "driveGearing": 5.143,
   "maxDriveSpeed": 5.45,
   "driveMotorType": "krakenX60",
   "driveCurrentLimit": 60.0,
-  "wheelCOF": 1.2
+  "wheelCOF": 1.2,
+  "flModuleX": 0.273,
+  "flModuleY": 0.273,
+  "frModuleX": 0.273,
+  "frModuleY": -0.273,
+  "blModuleX": -0.273,
+  "blModuleY": 0.273,
+  "brModuleX": -0.273,
+  "brModuleY": -0.273,
+  "bumperOffsetX": 0.0,
+  "bumperOffsetY": 0.0,
+  "robotFeatures": []
 }
diff --git a/.../java/vendordeps/PathplannerLib-beta.json → examples/java/vendordeps/PathplannerLib.json b/.../java/vendordeps/PathplannerLib-beta.json → examples/java/vendordeps/PathplannerLib.json
@@ -1,26 +1,26 @@
 {
-    "fileName": "PathplannerLib-beta.json",
+    "fileName": "PathplannerLib.json",
     "name": "PathplannerLib",
-    "version": "2025.0.0-beta-1.1",
+    "version": "2025.1.1",
     "uuid": "1b42324f-17c6-4875-8e77-1c312bc8c786",
-    "frcYear": "2024",
+    "frcYear": "2025",
     "mavenUrls": [
         "https://3015rangerrobotics.github.io/pathplannerlib/repo"
     ],
-    "jsonUrl": "https://3015rangerrobotics.github.io/pathplannerlib/PathplannerLib-beta.json",
+    "jsonUrl": "https://3015rangerrobotics.github.io/pathplannerlib/PathplannerLib.json",
     "javaDependencies": [
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-java",
-            "version": "2025.0.0-beta-1.1"
+            "version": "2025.1.1"
         }
     ],
     "jniDependencies": [],
     "cppDependencies": [
         {
             "groupId": "com.pathplanner.lib",
             "artifactId": "PathplannerLib-cpp",
-            "version": "2025.0.0-beta-1.1",
+            "version": "2025.1.1",
             "libName": "PathplannerLib",
             "headerClassifier": "headers",
             "sharedLibrary": false,

diff --git a/examples/java/vendordeps/WPILibNewCommands.json b/examples/java/vendordeps/WPILibNewCommands.json
@@ -3,7 +3,7 @@
   "name": "WPILib-New-Commands",
   "version": "1.0.0",
   "uuid": "111e20f7-815e-48f8-9dd6-e675ce75b266",
-  "frcYear": "2024",
+  "frcYear": "2025",
   "mavenUrls": [],
   "jsonUrl": "",
   "javaDependencies": [