Fix build. Rename.

Author: Mysticial

SerialPrograms/Source/Controllers/SuperscalarScheduler.cpp

@@ -40,9 +40,9 @@ void SuperscalarScheduler::clear() noexcept{
     m_pending_clear.store(false, std::memory_order_release);
 }
 
-std::vector<std::shared_ptr<const SchedulerCommand>> SuperscalarScheduler::current_live_commands(){
+std::vector<std::shared_ptr<const SchedulerResource>> SuperscalarScheduler::current_live_commands(){
     WallClock device_sent_time = m_device_sent_time;
-    std::vector<std::shared_ptr<const SchedulerCommand>> ret;
+    std::vector<std::shared_ptr<const SchedulerResource>> ret;
     for (auto& item : m_live_commands){
         if (item.second.busy_time <= device_sent_time && device_sent_time < item.second.done_time){
             ret.emplace_back(item.second.command);
@@ -105,7 +105,7 @@ bool SuperscalarScheduler::iterate_schedule(const Cancellable* cancellable){
     }
 
     //  Compute the resource state at this timestamp.
-    std::vector<std::shared_ptr<const SchedulerCommand>> state = current_live_commands();
+    std::vector<std::shared_ptr<const SchedulerResource>> state = current_live_commands();
     clear_finished_commands();
 
     m_device_sent_time = next_state_change;
@@ -231,7 +231,7 @@ void SuperscalarScheduler::issue_wait_for_resource(
 }
 void SuperscalarScheduler::issue_to_resource(
     const Cancellable* cancellable,
-    std::shared_ptr<const SchedulerCommand> resource,
+    std::shared_ptr<const SchedulerResource> resource,
     WallDuration delay, WallDuration hold, WallDuration cooldown
 ){
     if (m_pending_clear.load(std::memory_order_acquire)){

SerialPrograms/Source/Controllers/SuperscalarScheduler.h

@@ -7,6 +7,7 @@
 #ifndef PokemonAutomation_Controllers_SuperscalarScheduler_H
 #define PokemonAutomation_Controllers_SuperscalarScheduler_H
 
+#include <memory>
 #include <set>
 #include <map>
 #include <atomic>
@@ -20,15 +21,15 @@ class SuperscalarScheduler;
 
 
 
-class SchedulerCommand{
+class SchedulerResource{
 public:
     const size_t id;
 
-    SchedulerCommand(size_t id)
+    SchedulerResource(size_t id)
         : id(id)
     {}
 
-    virtual ~SchedulerCommand() = default;
+    virtual ~SchedulerResource() = default;
 };
 
 
@@ -82,7 +83,7 @@ class SuperscalarScheduler{
     //  The resource must be ready to be used.
     void issue_to_resource(
         const Cancellable* cancellable,
-        std::shared_ptr<const SchedulerCommand> resource,
+        std::shared_ptr<const SchedulerResource> resource,
         WallDuration delay, WallDuration hold, WallDuration cooldown
     );
 
@@ -102,13 +103,13 @@ class SuperscalarScheduler{
     virtual void push_state(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     ) = 0;
 
 
 private:
     void clear() noexcept;
-    std::vector<std::shared_ptr<const SchedulerCommand>> current_live_commands();
+    std::vector<std::shared_ptr<const SchedulerResource>> current_live_commands();
     void clear_finished_commands();
     bool iterate_schedule(const Cancellable* cancellable);
     void process_schedule(const Cancellable* cancellable);
@@ -145,7 +146,7 @@ class SuperscalarScheduler{
     std::set<WallClock> m_state_changes;
 
     struct Command{
-        std::shared_ptr<const SchedulerCommand> command;
+        std::shared_ptr<const SchedulerResource> command;
         WallClock busy_time;    //  Timestamp of when resource will be become busy.
         WallClock done_time;    //  Timestamp of when resource will be done being busy.
         WallClock free_time;    //  Timestamp of when resource can be used again.

SerialPrograms/Source/NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h

@@ -71,9 +71,9 @@ struct SwitchControllerState{
     uint16_t gyro[6];
 };
 
-class SwitchCommand : public SchedulerCommand{
+class SwitchCommand : public SchedulerResource{
 public:
-    using SchedulerCommand::SchedulerCommand;
+    using SchedulerResource::SchedulerResource;
     virtual void apply(SwitchControllerState& state) const = 0;
 };
 class SwitchCommand_Button : public SwitchCommand{
@@ -171,8 +171,7 @@ inline SplitDpad convert_unified_to_split_dpad(DpadPosition dpad){
 
 
 
-class ControllerWithScheduler : protected SuperscalarScheduler
-{
+class ControllerWithScheduler : protected SuperscalarScheduler{
 public:
     ControllerWithScheduler(Logger& logger);
 

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.cpp

@@ -95,7 +95,7 @@ void SerialPABotBase_WiredController::stop(){
 void SerialPABotBase_WiredController::push_state(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     //  Must be called inside "m_state_lock".
 

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WiredController.h

@@ -223,7 +223,7 @@ class SerialPABotBase_WiredController final :
     virtual void push_state(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     ) override;
 
     void status_thread();

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.cpp

@@ -155,7 +155,7 @@ template <typename JoyconType>
 void SerialPABotBase_WirelessJoycon<JoyconType>::push_state_left_joycon(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     SwitchControllerState controller_state;
     for (auto& item : state){
@@ -200,7 +200,7 @@ template <typename JoyconType>
 void SerialPABotBase_WirelessJoycon<JoyconType>::push_state_right_joycon(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     SwitchControllerState controller_state;
     for (auto& item : state){
@@ -239,7 +239,7 @@ template <typename JoyconType>
 void SerialPABotBase_WirelessJoycon<JoyconType>::push_state(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     switch (m_controller_type){
     case ControllerType::NintendoSwitch_LeftJoycon:

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.h

@@ -164,17 +164,17 @@ class SerialPABotBase_WirelessJoycon :
     void push_state_left_joycon(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     );
     void push_state_right_joycon(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     );
     virtual void push_state(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     ) override;
 
     ControllerType m_controller_type;

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp

@@ -39,7 +39,7 @@ SerialPABotBase_WirelessProController::~SerialPABotBase_WirelessProController(){
 void SerialPABotBase_WirelessProController::push_state(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     SwitchControllerState controller_state;
     for (auto& item : state){

SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.h

@@ -213,7 +213,7 @@ class SerialPABotBase_WirelessProController final :
     virtual void push_state(
         const Cancellable* cancellable,
         WallDuration duration,
-        std::vector<std::shared_ptr<const SchedulerCommand>> state
+        std::vector<std::shared_ptr<const SchedulerResource>> state
     ) override;
 };
 

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase3_ProController.cpp

@@ -174,7 +174,7 @@ void ProController_SysbotBase3::on_message(const std::string& message){
 void ProController_SysbotBase3::push_state(
     const Cancellable* cancellable,
     WallDuration duration,
-    std::vector<std::shared_ptr<const SchedulerCommand>> state
+    std::vector<std::shared_ptr<const SchedulerResource>> state
 ){
     //  Must be called inside "m_state_lock".