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] Allow BooleanSupplier for Trigger operations (#4103)

Browse Source
This commit is contained in:
ohowe
2022-04-24 08:20:46 -06:00
committed by GitHub
parent 9d20ab3024
commit b3aee28388
3 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -348,25 +348,25 @@ public class Trigger implements BooleanSupplier {
}
/**
* Composes this trigger with another trigger, returning a new trigger that is active when both
* Composes this trigger with a boolean supplier, returning a new trigger that is active when both
* triggers are active.
*
* @param trigger the trigger to compose with
* @param booleanSupplier the boolean supplier to compose with
* @return the trigger that is active when both triggers are active
*/
public Trigger and(Trigger trigger) {
return new Trigger(() -> get() && trigger.get());
public Trigger and(BooleanSupplier booleanSupplier) {
return new Trigger(() -> get() && booleanSupplier.getAsBoolean());
}
/**
* Composes this trigger with another trigger, returning a new trigger that is active when either
* trigger is active.
* Composes this trigger with a boolean supplier, returning a new trigger that is active when
* either trigger is active.
*
* @param trigger the trigger to compose with
* @param booleanSupplier the boolean supplier to compose with
* @return the trigger that is active when either trigger is active
*/
public Trigger or(Trigger trigger) {
return new Trigger(() -> get() || trigger.get());
public Trigger or(BooleanSupplier booleanSupplier) {
return new Trigger(() -> get() || booleanSupplier.getAsBoolean());
}
/**