More fixes

wpilibsuite · Oct 24, 2024 · 8aa7f14 · 8aa7f14
1 parent 0477f78
commit 8aa7f14
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 17 deletions.
diff --git a/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java b/wpilibNewCommands/src/main/java/edu/wpi/first/wpilibj2/command/Command.java
@@ -596,7 +596,7 @@ public void initSendable(SendableBuilder builder) {
         value -> {
           if (value) {
             if (!isScheduled()) {
-              schedule();
+              CommandScheduler.getInstance().schedule(this);
             }
           } else {
             if (isScheduled()) {

diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
@@ -35,7 +35,7 @@ Trigger Trigger::OnChange(CommandPtr&& command) {
     bool current = condition();
 
     if (previous != current) {
-      command.Schedule();
+      frc2::CommandScheduler::GetInstance().Schedule(command);
     }
 
     previous = current;
@@ -63,7 +63,7 @@ Trigger Trigger::OnTrue(CommandPtr&& command) {
     bool current = condition();
 
     if (!previous && current) {
-      command.Schedule();
+      frc2::CommandScheduler::GetInstance().Schedule(command);
     }
 
     previous = current;
@@ -91,7 +91,7 @@ Trigger Trigger::OnFalse(CommandPtr&& command) {
     bool current = condition();
 
     if (previous && !current) {
-      command.Schedule();
+      frc2::CommandScheduler::GetInstance().Schedule(command);
     }
 
     previous = current;
@@ -121,7 +121,7 @@ Trigger Trigger::WhileTrue(CommandPtr&& command) {
     bool current = condition();
 
     if (!previous && current) {
-      command.Schedule();
+      frc2::CommandScheduler::GetInstance().Schedule(command);
     } else if (previous && !current) {
       command.Cancel();
     }
@@ -153,7 +153,7 @@ Trigger Trigger::WhileFalse(CommandPtr&& command) {
     bool current = condition();
 
     if (!previous && current) {
-      command.Schedule();
+      frc2::CommandScheduler::GetInstance().Schedule(command);
     } else if (previous && !current) {
       command.Cancel();
     }
@@ -190,7 +190,7 @@ Trigger Trigger::ToggleOnTrue(CommandPtr&& command) {
       if (command.IsScheduled()) {
         command.Cancel();
       } else {
-        command.Schedule();
+        frc2::CommandScheduler::GetInstance().Schedule(command);
       }
     }
 
@@ -226,7 +226,7 @@ Trigger Trigger::ToggleOnFalse(CommandPtr&& command) {
       if (command.IsScheduled()) {
         command.Cancel();
       } else {
-        command.Schedule();
+        frc2::CommandScheduler::GetInstance().Schedule(command);
       }
     }
 

diff --git a/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h b/wpilibNewCommands/src/main/native/include/frc2/command/CommandPtr.h
@@ -286,7 +286,10 @@ class CommandPtr final {
 
   /**
    * Schedules this command.
+   *
+   * @deprecated Use CommandScheduler::GetInstance().Schedule() instead
    */
+  [[deprecated("Use CommandScheduler::GetInstance().Schedule() instead.")]]
   void Schedule() const&;
 
   // Prevent calls on a temporary, as the returned pointer would be invalid

diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandSendableButtonTest.cpp
@@ -82,7 +82,7 @@ TEST_F(CommandSendableButtonTest, falseAndNotScheduledNoOp) {
 
 TEST_F(CommandSendableButtonTest, falseAndScheduledCancel) {
   // Scheduled and false -> cancel
-  frc2::CommandScheduler::GetInstance().Schedule(m_command);
+  frc2::CommandScheduler::GetInstance().Schedule(m_command.value());
   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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }
 

diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }
 

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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }
 

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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }
 

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

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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }
 

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) {
-    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand);
+    frc2::CommandScheduler::GetInstance().Schedule(m_autonomousCommand.value());
   }
 }