Fix another issue with async-cancel in SBB. Fix flag pin bot for SBB.

Author: Mysticial

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

@@ -82,12 +82,16 @@ ProController_SysbotBase::~ProController_SysbotBase(){
 
 
 void ProController_SysbotBase::wait_for_all(const Cancellable* cancellable){
-//    cout << "ProController_SysbotBase::wait_for_all()" << endl;
+//    cout << "ProController_SysbotBase::wait_for_all - Enter()" << endl;
     issue_barrier(cancellable);
     std::unique_lock<std::mutex> lg(m_lock);
     m_cv.wait(lg, [this]{
-        return m_command_queue.empty() || m_replace_on_next.load(std::memory_order_relaxed);
+        return m_command_queue.empty() || m_replace_on_next;
     });
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+//    cout << "ProController_SysbotBase::wait_for_all - Exit()" << endl;
 }
 void ProController_SysbotBase::cancel_all_commands(){
 //    cout << "ProController_SysbotBase::cancel_all_commands()" << endl;
@@ -102,11 +106,11 @@ void ProController_SysbotBase::cancel_all_commands(){
     this->clear_on_next();
 }
 void ProController_SysbotBase::replace_on_next_command(){
-//    cout << "ProController_SysbotBase::replace_on_next_command()" << endl;
+//    cout << "ProController_SysbotBase::replace_on_next_command - Enter()" << endl;
     {
         std::lock_guard<std::mutex> lg(m_lock);
         m_cv.notify_all();
-        m_replace_on_next.store(true, std::memory_order_relaxed);
+        m_replace_on_next = true;
     }
     this->clear_on_next();
 }
@@ -120,22 +124,38 @@ void ProController_SysbotBase::issue_controller_state(
     uint8_t right_x, uint8_t right_y,
     Milliseconds duration
 ){
+#if 0
+//    cout << "issue_controller_state(): Entering" << endl;
+    m_logger.log(
+        "issue_controller_state(): (" + button_to_string(button) +
+        "), dpad(" + dpad_to_string(position) +
+        "), LJ(" + std::to_string(left_x) + "," + std::to_string(left_y) +
+        "), RJ(" + std::to_string(right_x) + "," + std::to_string(right_y) +
+        ")",
+        COLOR_DARKGREEN
+    );
+#endif
+
     if (cancellable){
         cancellable->throw_if_cancelled();
     }
 
     std::unique_lock<std::mutex> lg(m_lock);
 
-    if (m_replace_on_next.load(std::memory_order_acquire)){
+    m_cv.wait(lg, [this]{
+        return m_command_queue.size() < QUEUE_SIZE || m_replace_on_next;
+    });
+
+    if (cancellable){
+        cancellable->throw_if_cancelled();
+    }
+
+    if (m_replace_on_next){
         m_command_queue.clear();
         m_is_active = false;
-        m_replace_on_next.store(false, std::memory_order_relaxed);
+        m_replace_on_next = false;
     }
 
-    m_cv.wait(lg, [this]{
-        return m_command_queue.size() < QUEUE_SIZE;
-    });
-
     if (m_command_queue.empty()){
         m_cv.notify_all();
     }

SerialPrograms/Source/NintendoSwitch/Controllers/SysbotBase/SysbotBase_ProController.h

@@ -86,7 +86,7 @@ class ProController_SysbotBase : public ProControllerWithScheduler{
     std::string m_error_string;
 
     std::atomic<bool> m_stopping;
-    std::atomic<bool> m_replace_on_next;
+    bool m_replace_on_next;
 
     struct Command{
         SwitchControllerState state;

SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp

@@ -182,7 +182,9 @@ FlagNavigationAir::FlagNavigationAir(
         m_stream.log("Dashing Turn...");
         m_active_command->dispatch([this](ProControllerContext& context){
             //  Move forward to straighten out direction.
+//            cout << "Straight ahead = " << m_looking_straight_ahead.load(std::memory_order_acquire) << endl;
             if (!m_looking_straight_ahead.load(std::memory_order_acquire)){
+//                pbf_wait(context, 1000ms);
                 pbf_move_left_joystick(context, 128, 0, 160, 0);
                 context.wait_for_all_requests();
                 m_looking_straight_ahead_timestamp.store(current_time());

SerialPrograms/Source/PokemonLA/Programs/ShinyHunting/PokemonLA_ShinyHunt-FlagPin.cpp

@@ -33,7 +33,8 @@ ShinyHuntFlagPin_Descriptor::ShinyHuntFlagPin_Descriptor()
         "Repeatedly travel to a flag pin to shiny hunt " + STRING_POKEMON + " around it.",
         FeedbackType::VIDEO_AUDIO,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}
 class ShinyHuntFlagPin_Descriptor::Stats : public StatsTracker, public ShinyStatIncrementer{

SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_FlagNavigationTest.cpp

@@ -23,7 +23,8 @@ FlagNavigationTest_Descriptor::FlagNavigationTest_Descriptor()
         "Navigate to the flag pin.",
         FeedbackType::REQUIRED,
         AllowCommandsWhenRunning::DISABLE_COMMANDS,
-        {SerialPABotBase::OLD_NINTENDO_SWITCH_DEFAULT_REQUIREMENTS}
+        {ControllerFeature::NintendoSwitch_ProController},
+        FasterIfTickPrecise::NOT_FASTER
     )
 {}