From 518916ba029701d2846054aa6c3b7c8e8dceb24b Mon Sep 17 00:00:00 2001 From: Thad House Date: Wed, 14 Dec 2022 10:17:13 -0800 Subject: [PATCH] [wpilib] Fix DS mode thread event being manual reset accidentally (#4818) These need to be automatic reset. --- .../src/main/native/cpp/internal/DriverStationModeThread.cpp | 2 +- .../src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp | 2 +- .../edu/wpi/first/wpilibj/internal/DriverStationModeThread.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp b/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp index 7c28bad08a..40856580f0 100644 --- a/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp +++ b/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp @@ -39,7 +39,7 @@ void DriverStationModeThread::InTest(bool entering) { } void DriverStationModeThread::Run() { - wpi::Event event{true, false}; + wpi::Event event{false, false}; HAL_ProvideNewDataEventHandle(event.GetHandle()); while (m_keepAlive.load()) { diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp index a521b47257..0c67d6d7f0 100644 --- a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp +++ b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp @@ -26,7 +26,7 @@ void Robot::StartCompetition() { frc::internal::DriverStationModeThread modeThread; - wpi::Event event{true, false}; + wpi::Event event{false, false}; frc::DriverStation::ProvideRefreshedDataEventHandle(event.GetHandle()); // Tell the DS that the robot is ready to be enabled diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java index ca71c9f6c2..03d6397394 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/internal/DriverStationModeThread.java @@ -29,7 +29,7 @@ public class DriverStationModeThread implements AutoCloseable { } private void run() { - int handle = WPIUtilJNI.createEvent(true, false); + int handle = WPIUtilJNI.createEvent(false, false); DriverStationJNI.provideNewDataEventHandle(handle); while (m_keepAlive.get()) {