From 0a2ab4f0d7823614f8a0b4ec1a06830a0560212c Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 20 Oct 2018 21:25:37 -0700 Subject: [PATCH] Revert change in behavior in HeldButtonScheduler (#1381) Originally, the command was restarted every time the scheduler was executed if the button was pressed. #1340 changed this behavior in a breaking manner. --- wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp | 2 +- .../src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp b/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp index d386b5870c..feaa3c6927 100644 --- a/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp +++ b/wpilibc/src/main/native/cpp/buttons/HeldButtonScheduler.cpp @@ -19,7 +19,7 @@ HeldButtonScheduler::HeldButtonScheduler(bool last, Trigger* button, void HeldButtonScheduler::Execute() { bool pressed = m_button->Grab(); - if (!m_pressedLast && pressed) { + if (pressed) { m_command->Start(); } else if (m_pressedLast && !pressed) { m_command->Cancel(); diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java index 795778b45f..c20e62ee15 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/buttons/Trigger.java @@ -83,7 +83,7 @@ public abstract class Trigger extends SendableBase { public void execute() { boolean pressed = grab(); - if (!m_pressedLast && pressed) { + if (pressed) { command.start(); } else if (m_pressedLast && !pressed) { command.cancel();