From f66a667321707ddd64ff90f8a1ca3e4e9e3838b0 Mon Sep 17 00:00:00 2001 From: Ryan Blue Date: Mon, 12 Dec 2022 18:38:29 -0500 Subject: [PATCH] [commands] Fix incorrect Trigger docs (NFC) (#4792) --- .../java/edu/wpi/first/wpilibj2/command/button/Trigger.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6b16adc840..19b8b20974 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 @@ -472,10 +472,10 @@ public class Trigger implements BooleanSupplier { } /** - * Composes two triggers with logical OR. + * Composes two triggers with logical AND. * * @param trigger the condition to compose with - * @return A trigger which is active when either component trigger is active. + * @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());