Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[commands] Test no-op behavior of scheduling a scheduled command (#4806)

Browse Source
This commit is contained in:
Starlight220
2022-12-13 06:29:47 +02:00
committed by GitHub
parent a865f48e96
commit 61c75deb2a
4 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/CommandScheduler.java
View File

@@ -217,8 +217,8 @@ public final class CommandScheduler implements NTSendable, AutoCloseable {
// Do nothing if the scheduler is disabled, the robot is disabled and the command doesn't
// run when disabled, or the command is already scheduled.
if (m_disabled
|| RobotState.isDisabled() && !command.runsWhenDisabled()
|| isScheduled(command)) {
|| isScheduled(command)
|| RobotState.isDisabled() && !command.runsWhenDisabled()) {
return;
}

5
wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
View File

@@ -119,9 +119,8 @@ void CommandScheduler::Schedule(Command* command) {
RequireUngrouped(command);
if (m_impl->disabled ||
(frc::RobotState::IsDisabled() && !command->RunsWhenDisabled()) ||
m_impl->scheduledCommands.contains(command)) {
if (m_impl->disabled || m_impl->scheduledCommands.contains(command) ||
(frc::RobotState::IsDisabled() && !command->RunsWhenDisabled())) {
return;
}