Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-22 01:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[commands] Trigger: pass m_loop to new Trigger in composition functions (#6441)

Browse Source
This commit is contained in:
person4268
2024-03-15 15:05:48 -04:00
committed by GitHub
parent a1af2357e8
commit 0b13459469
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/button/Trigger.java
View File

@@ -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);