Replace most usages of schedule()

wpilibsuite · Sep 17, 2024 · 8c8d94d · 8c8d94d
1 parent 717f82e
commit 8c8d94d
Show file tree

Hide file tree

Showing 38 changed files with 56 additions and 56 deletions.
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ProxyCommand.java
@@ -59,7 +59,7 @@ public ProxyCommand(Command command) {
   @Override
   public void initialize() {
     m_command = m_supplier.get();
-    m_command.schedule();
+    CommandScheduler.getInstance().schedule(m_command);
   }
 
   @Override

diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/ScheduleCommand.java
@@ -28,7 +28,7 @@ public ScheduleCommand(Command... toSchedule) {
   @Override
   public void initialize() {
     for (Command command : m_toSchedule) {
-      command.schedule();
+      CommandScheduler.getInstance().schedule(command);
     }
   }
 

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
@@ -66,7 +66,7 @@ public void run() {
             boolean pressed = m_condition.getAsBoolean();
 
             if (m_pressedLast != pressed) {
-              command.schedule();
+              CommandScheduler.getInstance().schedule(command);
             }
 
             m_pressedLast = pressed;
@@ -92,7 +92,7 @@ public void run() {
             boolean pressed = m_condition.getAsBoolean();
 
             if (!m_pressedLast && pressed) {
-              command.schedule();
+              CommandScheduler.getInstance().schedule(command);
             }
 
             m_pressedLast = pressed;
@@ -118,7 +118,7 @@ public void run() {
             boolean pressed = m_condition.getAsBoolean();
 
             if (m_pressedLast && !pressed) {
-              command.schedule();
+              CommandScheduler.getInstance().schedule(command);
             }
 
             m_pressedLast = pressed;
@@ -148,7 +148,7 @@ public void run() {
             boolean pressed = m_condition.getAsBoolean();
 
             if (!m_pressedLast && pressed) {
-              command.schedule();
+              CommandScheduler.getInstance().schedule(command);
             } else if (m_pressedLast && !pressed) {
               command.cancel();
             }
@@ -180,7 +180,7 @@ public void run() {
             boolean pressed = m_condition.getAsBoolean();
 
             if (m_pressedLast && !pressed) {
-              command.schedule();
+              CommandScheduler.getInstance().schedule(command);
             } else if (!m_pressedLast && pressed) {
               command.cancel();
             }
@@ -211,7 +211,7 @@ public void run() {
               if (command.isScheduled()) {
                 command.cancel();
               } else {
-                command.schedule();
+                CommandScheduler.getInstance().schedule(command);
               }
             }
 
@@ -241,7 +241,7 @@ public void run() {
               if (command.isScheduled()) {
                 command.cancel();
               } else {
-                command.schedule();
+                CommandScheduler.getInstance().schedule(command);
               }
             }
 

diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
@@ -200,7 +200,7 @@ void Command::InitSendable(wpi::SendableBuilder& builder) {
       [this](bool value) {
         bool isScheduled = IsScheduled();
         if (value && !isScheduled) {
-          Schedule();
+          CommandScheduler::GetInstance().Schedule(this);
         } else if (!value && isScheduled) {
           Cancel();
         }

diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp
@@ -34,7 +34,7 @@ ProxyCommand::ProxyCommand(std::unique_ptr<Command> command) {
 
 void ProxyCommand::Initialize() {
   m_command = m_supplier();
-  m_command->Schedule();
+  frc2::CommandScheduler::GetInstance().Schedule(m_command);
 }
 
 void ProxyCommand::End(bool interrupted) {

diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ScheduleCommand.cpp
@@ -18,7 +18,7 @@ ScheduleCommand::ScheduleCommand(Command* toSchedule) {
 
 void ScheduleCommand::Initialize() {
   for (auto command : m_toSchedule) {
-    command->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(command);
   }
 }
 

diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
@@ -19,7 +19,7 @@ Trigger Trigger::OnChange(Command* command) {
         bool current = condition();
 
         if (previous != current) {
-          command->Schedule();
+          frc2::CommandScheduler::GetInstance().Schedule(command);
         }
 
         previous = current;
@@ -47,7 +47,7 @@ Trigger Trigger::OnTrue(Command* command) {
         bool current = condition();
 
         if (!previous && current) {
-          command->Schedule();
+          frc2::CommandScheduler::GetInstance().Schedule(command);
         }
 
         previous = current;
@@ -75,7 +75,7 @@ Trigger Trigger::OnFalse(Command* command) {
         bool current = condition();
 
         if (previous && !current) {
-          command->Schedule();
+          frc2::CommandScheduler::GetInstance().Schedule(command);
         }
 
         previous = current;
@@ -103,7 +103,7 @@ Trigger Trigger::WhileTrue(Command* command) {
         bool current = condition();
 
         if (!previous && current) {
-          command->Schedule();
+          frc2::CommandScheduler::GetInstance().Schedule(command);
         } else if (previous && !current) {
           command->Cancel();
         }
@@ -135,7 +135,7 @@ Trigger Trigger::WhileFalse(Command* command) {
         bool current = condition();
 
         if (previous && !current) {
-          command->Schedule();
+          frc2::CommandScheduler::GetInstance().Schedule(command);
         } else if (!previous && current) {
           command->Cancel();
         }
@@ -170,7 +170,7 @@ Trigger Trigger::ToggleOnTrue(Command* command) {
       if (command->IsScheduled()) {
         command->Cancel();
       } else {
-        command->Schedule();
+        frc2::CommandScheduler::GetInstance().Schedule(command);
       }
     }
 
@@ -206,7 +206,7 @@ Trigger Trigger::ToggleOnFalse(Command* command) {
       if (command->IsScheduled()) {
         command->Cancel();
       } else {
-        command->Schedule();
+        frc2::CommandScheduler::GetInstance().Schedule(command);
       }
     }
 

diff --git a/...ibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java b/...ibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/CommandSendableButtonTest.java
@@ -55,7 +55,7 @@ void trueAndNotScheduledSchedules() {
   @Test
   void trueAndScheduledNoOp() {
     // Scheduled and true -> no-op
-    m_command.schedule();
+    CommandScheduler.getInstance().schedule(m_command);
     CommandScheduler.getInstance().run();
     SmartDashboard.updateValues();
     assertTrue(m_command.isScheduled());
@@ -90,7 +90,7 @@ void falseAndNotScheduledNoOp() {
   @Test
   void falseAndScheduledCancel() {
     // Scheduled and false -> cancel
-    m_command.schedule();
+    CommandScheduler.getInstance().schedule(m_command);
     CommandScheduler.getInstance().run();
     SmartDashboard.updateValues();
     assertTrue(m_command.isScheduled());

diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ProxyCommandTest.java
@@ -22,7 +22,7 @@ void proxyCommandScheduleTest() {
 
       scheduler.schedule(scheduleCommand);
 
-      verify(command1).schedule();
+      verify(command1).initialize();
     }
   }
 

diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/ScheduleCommandTest.java
@@ -22,8 +22,8 @@ void scheduleCommandScheduleTest() {
 
       scheduler.schedule(scheduleCommand);
 
-      verify(command1).schedule();
-      verify(command2).schedule();
+      verify(command1).initialize();
+      verify(command2).initialize();
     }
   }
 

diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/NetworkButtonTest.java
@@ -39,10 +39,10 @@ void setNetworkButtonTest() {
     pub.set(false);
     button.onTrue(command);
     scheduler.run();
-    verify(command, never()).schedule();
+    verify(command, never()).initialize();
     pub.set(true);
     scheduler.run();
     scheduler.run();
-    verify(command).schedule();
+    verify(command).initialize();
   }
 }
diff --git a/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java b/wpilibNewCommands/src/test/java/edu/wpi/first/wpilibj2/command/button/TriggerTest.java
@@ -207,7 +207,7 @@ void cancelWhenActiveTest() {
             .until(button);
 
     button.setPressed(false);
-    command1.schedule();
+    scheduler.schedule(command1);
     scheduler.run();
     assertEquals(1, startCounter.get());
     assertEquals(0, endCounter.get());
@@ -258,13 +258,13 @@ void debounceTest() {
 
     button.setPressed(true);
     scheduler.run();
-    verify(command, never()).schedule();
+    verify(command, never()).initialize();
 
     SimHooks.stepTiming(0.3);
 
     button.setPressed(true);
     scheduler.run();
-    verify(command).schedule();
+    verify(command).initialize();
   }
 
   @Test

diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
@@ -49,7 +49,7 @@ TEST_F(CommandSendableButtonTest, trueAndNotScheduledSchedules) {
 
 TEST_F(CommandSendableButtonTest, trueAndScheduledNoOp) {
   // Scheduled and true -> no-op
-  m_command->Schedule();
+  frc2::CommandScheduler::GetInstance().Schedule(m_command);
   GetScheduler().Run();
   frc::SmartDashboard::UpdateValues();
   EXPECT_TRUE(m_command->IsScheduled());
@@ -82,7 +82,7 @@ TEST_F(CommandSendableButtonTest, falseAndNotScheduledNoOp) {
 
 TEST_F(CommandSendableButtonTest, falseAndScheduledCancel) {
   // Scheduled and false -> cancel
-  m_command->Schedule();
+  frc2::CommandScheduler::GetInstance().Schedule(m_command);
   GetScheduler().Run();
   frc::SmartDashboard::UpdateValues();
   EXPECT_TRUE(m_command->IsScheduled());

diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp
@@ -38,7 +38,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
@@ -47,7 +47,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand != nullptr) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumControllerCommand/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumControllerCommand/cpp/Robot.cpp
@@ -38,7 +38,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/Robot.cpp
@@ -26,7 +26,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_robot.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp
@@ -37,7 +37,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand != nullptr) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
@@ -38,7 +38,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand != nullptr) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveControllerCommand/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveControllerCommand/cpp/Robot.cpp
@@ -38,7 +38,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/SysId/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SysId/cpp/Robot.cpp
@@ -22,7 +22,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp
@@ -37,7 +37,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand != nullptr) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
@@ -37,7 +37,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp
@@ -22,7 +22,7 @@ void Robot::AutonomousInit() {
   m_autonomousCommand = m_container.GetAutonomousCommand();
 
   if (m_autonomousCommand) {
-    m_autonomousCommand->Schedule();
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
   }
 }
 

diff --git a/...ibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Robot.java b/...ibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/drivedistanceoffboard/Robot.java
@@ -65,7 +65,7 @@ public void autonomousInit() {
 
     // schedule the autonomous command (example)
     if (m_autonomousCommand != null) {
-      m_autonomousCommand.schedule();
+      CommandScheduler.getInstance().schedule(m_autonomousCommand);
     }
   }
 

diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbotinlined/Robot.java
@@ -67,7 +67,7 @@ public void autonomousInit() {
 
     // schedule the autonomous command (example)
     if (m_autonomousCommand != null) {
-      m_autonomousCommand.schedule();
+      CommandScheduler.getInstance().schedule(m_autonomousCommand);
     }
   }
 

diff --git a/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Robot.java b/wpilibjExamples/src/main/java/edu/wpi/first/wpilibj/examples/hatchbottraditional/Robot.java
@@ -74,7 +74,7 @@ public void autonomousInit() {
 
     // schedule the autonomous command (example)
     if (m_autonomousCommand != null) {
-      m_autonomousCommand.schedule();
+      CommandScheduler.getInstance().schedule(m_autonomousCommand);
     }
   }
 

diff --git a/...Examples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumcontrollercommand/Robot.java b/...Examples/src/main/java/edu/wpi/first/wpilibj/examples/mecanumcontrollercommand/Robot.java
@@ -65,7 +65,7 @@ public void autonomousInit() {
 
     // schedule the autonomous command (example)
     if (m_autonomousCommand != null) {
-      m_autonomousCommand.schedule();
+      CommandScheduler.getInstance().schedule(m_autonomousCommand);
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ void proxyCommandScheduleTest() { @@
           scheduler.schedule(scheduleCommand);
-          verify(command1).schedule();
+          verify(command1).initialize();
         }
       }
@@ Expand Down @@