From 6008671c305bc058d628ad20692c56b268cf2de7 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Thu, 26 Dec 2019 22:34:10 -0600 Subject: [PATCH] Report WPILib version as part of usage reporting (#2199) --- wpilibc/src/main/native/cppcs/RobotBase.cpp | 2 +- wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp index 5fd824d46e..f468f73010 100644 --- a/wpilibc/src/main/native/cppcs/RobotBase.cpp +++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp @@ -36,7 +36,7 @@ int frc::RunHALInitialization() { return -1; } HAL_Report(HALUsageReporting::kResourceType_Language, - HALUsageReporting::kLanguage_CPlusPlus); + HALUsageReporting::kLanguage_CPlusPlus, 0, GetWPILibVersion()); wpi::outs() << "\n********** Robot program starting **********\n"; return 0; } diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java index 94ad8845ef..80c445f7f0 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/RobotBase.java @@ -317,7 +317,8 @@ public abstract class RobotBase implements AutoCloseable { // Needed because all the OpenCV JNI functions don't have built in loading CameraServerJNI.enumerateSinks(); - HAL.report(tResourceType.kResourceType_Language, tInstances.kLanguage_Java); + HAL.report(tResourceType.kResourceType_Language, tInstances.kLanguage_Java, 0, + WPILibVersion.Version); if (HAL.hasMain()) { Thread thread = new Thread(() -> {