diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java index 5bdee377b4..46aa5e2c1d 100644 --- a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java +++ b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java @@ -237,7 +237,7 @@ public class Trigger implements BooleanSupplier { * @return A trigger which is active when both component triggers are active. */ public Trigger and(BooleanSupplier trigger) { - return new Trigger(() -> m_condition.getAsBoolean() && trigger.getAsBoolean()); + return new Trigger(m_loop, () -> m_condition.getAsBoolean() && trigger.getAsBoolean()); } /** @@ -247,7 +247,7 @@ public class Trigger implements BooleanSupplier { * @return A trigger which is active when either component trigger is active. */ public Trigger or(BooleanSupplier trigger) { - return new Trigger(() -> m_condition.getAsBoolean() || trigger.getAsBoolean()); + return new Trigger(m_loop, () -> m_condition.getAsBoolean() || trigger.getAsBoolean()); } /** @@ -257,7 +257,7 @@ public class Trigger implements BooleanSupplier { * @return the negated trigger */ public Trigger negate() { - return new Trigger(() -> !m_condition.getAsBoolean()); + return new Trigger(m_loop, () -> !m_condition.getAsBoolean()); } /** @@ -281,6 +281,7 @@ public class Trigger implements BooleanSupplier { */ public Trigger debounce(double seconds, Debouncer.DebounceType type) { return new Trigger( + m_loop, new BooleanSupplier() { final Debouncer m_debouncer = new Debouncer(seconds, type);