Merge pull request #25 from CrossTheRoadElec/beta-5

Updates for Phoenix6 beta-5
CrossTheRoadElec · Dec 16, 2023 · c4247bd · c4247bd
2 parents 5942179 + 8c617ec
commit c4247bd
Show file tree

Hide file tree

Showing 59 changed files with 670 additions and 669 deletions.
diff --git 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 "2024.1.1-beta-3"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4"
 }
 
 // Define my targets (RoboRIO) and artifacts (deployable files)

diff --git a/cpp/BasicLatencyCompensation/src/main/cpp/Robot.cpp b/cpp/BasicLatencyCompensation/src/main/cpp/Robot.cpp
@@ -20,9 +20,9 @@ void Robot::RobotPeriodic() {
    * angular velocity Z value comes from the pre-mount orientation gyroscope.
    * For more information on what signals have what algorithms applied to them,
    * see section 1.6 of the Pigeon 2's User's Guide
-   * https://store.ctr-electronics.com/content/user-manual/Pigeon2%20User's%20Guide.pdf 
+   * https://store.ctr-electronics.com/content/user-manual/Pigeon2%20User's%20Guide.pdf
    */
-  auto p2Rate = m_p2.GetAngularVelocityZ().GetValue();
+  auto p2Rate = m_p2.GetAngularVelocityZWorld().GetValue();
 
   /* Multiply the latency (in seconds) by the rates (in seconds) to get the amount to offset by */
   /* This automatically uses the best timestamp, CANivore will perform better than RIO since its timestamp */

diff --git a/cpp/BasicLatencyCompensation/vendordeps/Phoenix6.json b/cpp/BasicLatencyCompensation/vendordeps/Phoenix6.json
@@ -1,7 +1,7 @@
 {
     "fileName": "Phoenix6.json",
     "name": "CTRE-Phoenix (v6)",
-    "version": "24.0.0-beta-4",
+    "version": "24.0.0-beta-5",
     "frcYear": 2024,
     "uuid": "e995de00-2c64-4df5-8831-c1441420ff19",
     "mavenUrls": [
@@ -19,14 +19,14 @@
         {
             "groupId": "com.ctre.phoenix6",
             "artifactId": "wpiapi-java",
-            "version": "24.0.0-beta-4"
+            "version": "24.0.0-beta-5"
         }
     ],
     "jniDependencies": [
         {
             "groupId": "com.ctre.phoenix6",
             "artifactId": "tools",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -39,7 +39,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "tools-sim",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -52,7 +52,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simTalonSRX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -65,7 +65,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simTalonFX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -78,7 +78,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simVictorSPX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -91,7 +91,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simPigeonIMU",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -104,7 +104,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simCANCoder",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -117,7 +117,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProTalonFX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -130,7 +130,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProCANcoder",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -143,7 +143,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProPigeon2",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "isJar": false,
             "skipInvalidPlatforms": true,
             "validPlatforms": [
@@ -158,7 +158,7 @@
         {
             "groupId": "com.ctre.phoenix6",
             "artifactId": "wpiapi-cpp",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_Phoenix6_WPI",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -173,7 +173,7 @@
         {
             "groupId": "com.ctre.phoenix6",
             "artifactId": "tools",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_PhoenixTools",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -188,7 +188,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "wpiapi-cpp-sim",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_Phoenix6_WPISim",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -203,7 +203,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "tools-sim",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_PhoenixTools_Sim",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -218,7 +218,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simTalonSRX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimTalonSRX",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -233,7 +233,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simTalonFX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimTalonFX",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -248,7 +248,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simVictorSPX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimVictorSPX",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -263,7 +263,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simPigeonIMU",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimPigeonIMU",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -278,7 +278,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simCANCoder",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimCANCoder",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -293,7 +293,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProTalonFX",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimProTalonFX",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -308,7 +308,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProCANcoder",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimProCANcoder",
             "headerClassifier": "headers",
             "sharedLibrary": true,
@@ -323,7 +323,7 @@
         {
             "groupId": "com.ctre.phoenix6.sim",
             "artifactId": "simProPigeon2",
-            "version": "24.0.0-beta-4",
+            "version": "24.0.0-beta-5",
             "libName": "CTRE_SimProPigeon2",
             "headerClassifier": "headers",
             "sharedLibrary": true,

diff --git 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 "2024.1.1-beta-3"
+    id "edu.wpi.first.GradleRIO" version "2024.1.1-beta-4"
 }
 
 // Define my targets (RoboRIO) and artifacts (deployable files)