From df5e439b0c484dec0b1da4818cffd53c20bf119a Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Fri, 22 Dec 2023 10:33:03 -0800 Subject: [PATCH] [wpilib] PS4Controller: enable usage reporting (#6081) --- wpilibc/src/main/native/cpp/PS4Controller.cpp | 3 +-- .../src/main/java/edu/wpi/first/wpilibj/PS4Controller.java | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wpilibc/src/main/native/cpp/PS4Controller.cpp b/wpilibc/src/main/native/cpp/PS4Controller.cpp index 5ac3420756c..e59e18cd3b3 100644 --- a/wpilibc/src/main/native/cpp/PS4Controller.cpp +++ b/wpilibc/src/main/native/cpp/PS4Controller.cpp @@ -11,8 +11,7 @@ using namespace frc; PS4Controller::PS4Controller(int port) : GenericHID(port) { - // re-enable when PS4Controller is added to Usage Reporting - // HAL_Report(HALUsageReporting::kResourceType_PS4Controller, port + 1); + HAL_Report(HALUsageReporting::kResourceType_PS4Controller, port + 1); } double PS4Controller::GetLeftX() const { diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java index 2359b7b8308..ccb236e2356 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java @@ -4,6 +4,8 @@ package edu.wpi.first.wpilibj; +import edu.wpi.first.hal.FRCNetComm.tResourceType; +import edu.wpi.first.hal.HAL; import edu.wpi.first.wpilibj.event.BooleanEvent; import edu.wpi.first.wpilibj.event.EventLoop; @@ -23,8 +25,7 @@ public class PS4Controller extends GenericHID { public PS4Controller(int port) { super(port); - // re-enable when PS4Controller is added to Usage Reporting - // HAL.report(tResourceType.kResourceType_PS4Controller, port + 1); / + HAL.report(tResourceType.kResourceType_PS4Controller, port + 1); } /** Represents a digital button on a PS4Controller. */