diff --git a/hal/src/generate/ResourceType.txt b/hal/src/generate/ResourceType.txt index f48cb596d0..943d8b00be 100644 --- a/hal/src/generate/ResourceType.txt +++ b/hal/src/generate/ResourceType.txt @@ -92,4 +92,11 @@ kResourceType_TrapezoidProfile = 90 kResourceType_DutyCycle = 91 kResourceType_AddressableLEDs = 92 kResourceType_FusionVenom = 93 -kResourceType_PS4Controller = 94 +kResourceType_CTRE_future7 = 94 +kResourceType_CTRE_future8 = 95 +kResourceType_CTRE_future9 = 96 +kResourceType_CTRE_future10 = 97 +kResourceType_CTRE_future11 = 98 +kResourceType_CTRE_future12 = 99 +kResourceType_CTRE_future13 = 100 +kResourceType_CTRE_future14 = 101 diff --git a/wpilibc/src/main/native/cpp/PS4Controller.cpp b/wpilibc/src/main/native/cpp/PS4Controller.cpp index e59e18cd3b..5ac3420756 100644 --- a/wpilibc/src/main/native/cpp/PS4Controller.cpp +++ b/wpilibc/src/main/native/cpp/PS4Controller.cpp @@ -11,7 +11,8 @@ using namespace frc; PS4Controller::PS4Controller(int port) : GenericHID(port) { - HAL_Report(HALUsageReporting::kResourceType_PS4Controller, port + 1); + // re-enable when PS4Controller is added to Usage Reporting + // 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 c418e54f0f..2359b7b830 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/PS4Controller.java @@ -4,8 +4,6 @@ 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; @@ -24,7 +22,9 @@ public class PS4Controller extends GenericHID { */ public PS4Controller(int port) { super(port); - HAL.report(tResourceType.kResourceType_PS4Controller, port + 1); + + // re-enable when PS4Controller is added to Usage Reporting + // HAL.report(tResourceType.kResourceType_PS4Controller, port + 1); / } /** Represents a digital button on a PS4Controller. */