From 366091fa877041b99a16cf4844cccd066686bfbb Mon Sep 17 00:00:00 2001 From: sciencewhiz Date: Sun, 29 Sep 2019 20:35:41 -0700 Subject: [PATCH] Document that ConditionalCommand requires all subsystems (#1909) Fixes #1683 Fixes typo --- .../main/native/include/frc/commands/ConditionalCommand.h | 4 ++-- .../edu/wpi/first/wpilibj/command/ConditionalCommand.java | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h b/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h index 142c5b0079..f5cd73897f 100644 --- a/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h +++ b/wpilibc/src/main/native/include/frc/commands/ConditionalCommand.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -26,7 +26,7 @@ namespace frc { * If no Command is specified for onFalse, the occurrence of that condition * will be a no-op. * - * A CondtionalCommand will require the superset of subsystems of the onTrue + * A ConditionalCommand will require the superset of subsystems of the onTrue * and onFalse commands. * * @see Command diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java index 626f744fc4..2dc6f66c15 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/command/ConditionalCommand.java @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2017-2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2017-2019 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -28,6 +28,11 @@ import java.util.Enumeration; * no-op. *

* + *

+ * A ConditionalCommand will require the superset of subsystems of the onTrue + * and onFalse commands. + *

+ * * @see Command * @see Scheduler */