Allow programs that don't require a controller to run without a controller.

Mysticial · Mysticial · commit 90ad6679d4d8 · 2026-05-31T11:38:51.000-07:00
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp
@@ -147,7 +147,7 @@ TestDudunsparceFormDetector_Descriptor::TestDudunsparceFormDetector_Descriptor()
 TestDudunsparceFormDetector::TestDudunsparceFormDetector(){}
 
 
-void TestDudunsparceFormDetector::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void TestDudunsparceFormDetector::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
 
     DudunsparceFormDetector detector(env.console.overlay());
 
@@ -162,15 +162,16 @@ void TestDudunsparceFormDetector::program(SingleSwitchProgramEnvironment& env, P
     // context.wait_until_cancel();
 
     std::string last_label = "";
-    run_until<ProControllerContext>(
-        env.console, context, [&](ProControllerContext& context){
+    run_until(
+        env.console, scope,
+        [&](CancellableScope& scope){
             while (true){
                 std::string cur_label = detector.get_label();
                 if (cur_label != last_label){
                     last_label = cur_label;
                     env.console.overlay().add_log("Detected " + last_label);
                 }
-                context.wait_for(std::chrono::milliseconds(100));
+                scope.wait_for(std::chrono::milliseconds(100));
             }
         },
         {detector},
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.h
@@ -4,33 +4,34 @@
  *
  */
 
- #ifndef PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
- #define PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
- 
- #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
- 
- namespace PokemonAutomation{
- namespace NintendoSwitch{
- 
- 
- class TestDudunsparceFormDetector_Descriptor : public SingleSwitchProgramDescriptor{
- public:
-     TestDudunsparceFormDetector_Descriptor();
- };
- 
- 
- class TestDudunsparceFormDetector : public SingleSwitchProgramInstance{
- public:
-     TestDudunsparceFormDetector();
- 
-     virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
- 
- private:
- };
- 
+#ifndef PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
+#define PokemonAutomation_NintendoSwitch_TestDudunsparceFormDetector_H
+
+#include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
+
+namespace PokemonAutomation{
+namespace NintendoSwitch{
+
+
+class TestDudunsparceFormDetector_Descriptor : public SingleSwitchProgramDescriptor{
+public:
+    TestDudunsparceFormDetector_Descriptor();
+};
+
+
+class TestDudunsparceFormDetector : public SingleSwitchProgramInstance{
+public:
+    TestDudunsparceFormDetector();
+
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
+private:
+};
+
  
  
  }
  }
  #endif // TESTPATHMAKER_H
- 
+ 
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.h
@@ -53,6 +53,9 @@ class TestProgram : public MultiSwitchProgramInstance, public ButtonListener{
 //    std::unique_ptr<StatsTracker> make_stats() const override{
 //        return std::unique_ptr<StatsTracker>(new StatsTracker());
 //    }
+    virtual void start_program_controller_check(
+        ControllerSession& session, size_t console_index
+    ) override{}
     virtual void program(MultiSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
     virtual void on_press() override;
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.cpp
@@ -137,22 +137,22 @@ void SnapshotKeyTrigger::on_key_release(QKeyEvent* event){
 }
 
 
-void SnapshotDumper::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void SnapshotDumper::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     std::string folder_path = USER_FILE_PATH() + "ScreenshotDumper/";
     QDir().mkpath(folder_path.c_str());
 
     if (SNAPSHOT_MODE == SnapshotMode::KEYPRESS){
         SnapshotKeyTrigger key_trigger(env.console, env.console.overlay(), FORMAT);
-        context.wait_until_cancel();
+        scope.wait_until_cancel();
     }else if (SNAPSHOT_MODE == SnapshotMode::MOUSE_CLICK){
         SnapshotClickTrigger click_trigger(env.console, env.console.overlay(), FORMAT);
-        context.wait_until_cancel();
+        scope.wait_until_cancel();
     }else if (SNAPSHOT_MODE == SnapshotMode::PERIODIC){
         while (true){
             VideoSnapshot last = env.console.video().snapshot();
             std::string filename = folder_path + now_to_filestring();
             last->save(filename + to_format_string(FORMAT));
-            context.wait_until(last.timestamp + std::chrono::milliseconds(PERIOD_MILLISECONDS));
+            scope.wait_until(last.timestamp + std::chrono::milliseconds(PERIOD_MILLISECONDS));
         }
     }else{
         throw InternalProgramError(nullptr, PA_CURRENT_FUNCTION, "Unexpected SNAPSHOT_MODE enum.");
diff --git a/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h b/SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_SnapshotDumper.h
@@ -34,7 +34,8 @@ class SnapshotDumper : public SingleSwitchProgramInstance, public ConfigOption::
     ~SnapshotDumper();
     SnapshotDumper();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     virtual void on_config_value_changed(void* object) override;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.cpp
@@ -55,11 +55,11 @@ ShinyEncounterTester::ShinyEncounterTester()
 }
 
 
-void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void ShinyEncounterTester::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     DoublesShinyDetection result_wild;
     ShinyDetectionResult result_own;
     detect_shiny_battle(
-        env, env.console, context,
+        env, env.console, scope,
         result_wild, result_own,
         NOTIFICATION_ERROR_RECOVERABLE,
         ENCOUNTER_TYPE == BattleType::STARTER ? YOUR_POKEMON : WILD_POKEMON,
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_ShinyEncounterTester.h
@@ -27,7 +27,8 @@ class ShinyEncounterTester : public SingleSwitchProgramInstance{
 public:
     ShinyEncounterTester();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     EnumDropdownOption<BattleType> ENCOUNTER_TYPE;
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.cpp
@@ -63,7 +63,7 @@ SoundListener::SoundListener()
 
 // void search_alpha_roar_from_audio_dump();
 
-void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     // search_alpha_roar_from_audio_dump();
     // return;
 
@@ -90,10 +90,10 @@ void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerCo
     }
 
     InferenceSession session(
-        context, env.console,
+        scope, env.console,
         {{*detector, std::chrono::milliseconds(20)}}
     );
-    context.wait_until_cancel();
+    scope.wait_until_cancel();
 
     std::cout << "Audio test program Sound listener finished." << std::endl;
 }
diff --git a/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h b/SerialPrograms/Source/PokemonBDSP/Programs/TestPrograms/PokemonBDSP_SoundListener.h
@@ -28,7 +28,8 @@ class SoundListener : public SingleSwitchProgramInstance{
 public:
     SoundListener();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     enum class SoundType{
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.cpp
@@ -47,7 +47,7 @@ ReadBattleLevelUp::ReadBattleLevelUp()
 
 void ReadBattleLevelUp::program(
     SingleSwitchProgramEnvironment &env,
-    ProControllerContext &context
+    CancellableScope& scope
 ){
     env.log(
         "Starting Read Battle Level Up program..."
@@ -94,8 +94,7 @@ void ReadBattleLevelUp::program(
 
     env.log("Finished Reading Stats. Verification boxes are on overlay.",
                     COLOR_BLUE);
-    pbf_wait(context, 10s);
-    context.wait_for_all_requests();
+    scope.wait_for(10s);
 }
 
 } // namespace PokemonFRLG
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadBattleLevelUp.h
@@ -25,14 +25,12 @@ class ReadBattleLevelUp_Descriptor : public SingleSwitchProgramDescriptor{
 class ReadBattleLevelUp : public SingleSwitchProgramInstance{
 public:
     ReadBattleLevelUp();
-    virtual void program(
-        SingleSwitchProgramEnvironment &env,
-        ProControllerContext &context
-    ) override;
-
-    virtual void start_program_border_check(
-        VideoStream &stream, FeedbackType feedback_type
-    ) override{}
+
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
 
     OCR::LanguageOCROption LANGUAGE;
 };
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.cpp
@@ -59,7 +59,7 @@ ReadEncounter::ReadEncounter()
 
 void ReadEncounter::program(
     SingleSwitchProgramEnvironment& env,
-    ProControllerContext& context
+    CancellableScope& scope
 ){
     env.log(
         "Starting Read Encounter program..."
@@ -97,8 +97,7 @@ void ReadEncounter::program(
     env.log("Name: " + encounter.name);
 
     env.log("Finished reading encounter.", COLOR_BLUE);
-    pbf_wait(context, 10s);
-    context.wait_for_all_requests();
+    scope.wait_for(10s);
 }
 
 } // namespace PokemonFRLG
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadEncounter.h
@@ -25,14 +25,11 @@ class ReadEncounter_Descriptor : public SingleSwitchProgramDescriptor{
 class ReadEncounter : public SingleSwitchProgramInstance{
 public:
     ReadEncounter();
-    virtual void program(
-        SingleSwitchProgramEnvironment &env,
-        ProControllerContext &context
-    ) override;
-
-    virtual void start_program_border_check(
-        VideoStream &stream, FeedbackType feedback_type
-    ) override{}
+
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
+
 
 private:
     enum class Subset{
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.cpp
@@ -56,7 +56,7 @@ ReadTrainerId::ReadTrainerId()
 
 void ReadTrainerId::program(
     SingleSwitchProgramEnvironment &env,
-    ProControllerContext &context
+    CancellableScope& scope
 ){
     env.log(
         "Starting Read Trainer ID program... Please ensure you are on the Trainer Card."
@@ -77,7 +77,6 @@ void ReadTrainerId::program(
     }else{
         env.log("Trainer Card not detected!");
     }
-    context.wait_for_all_requests();
 }
 
 } // namespace PokemonFRLG
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_ReadTrainerId.h
@@ -24,14 +24,10 @@ class ReadTrainerId_Descriptor : public SingleSwitchProgramDescriptor{
 class ReadTrainerId : public SingleSwitchProgramInstance{
 public:
     ReadTrainerId();
-    virtual void program(
-        SingleSwitchProgramEnvironment &env,
-        ProControllerContext &context
-    ) override;
-
-    virtual void start_program_border_check(
-        VideoStream &stream, FeedbackType feedback_type
-    ) override{}
+
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     OCR::LanguageOCROption LANGUAGE;    
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.cpp
@@ -59,7 +59,7 @@ SoundListener::SoundListener()
     PA_ADD_OPTION(STOP_ON_DETECTED_SOUND);
 }
 
-void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void SoundListener::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     // search_alpha_roar_from_audio_dump();
     // return;
 
@@ -86,10 +86,10 @@ void SoundListener::program(SingleSwitchProgramEnvironment& env, ProControllerCo
     }
 
     InferenceSession session(
-        context, env.console,
+        scope, env.console,
         {{*detector, std::chrono::milliseconds(20)}}
     );
-    context.wait_until_cancel();
+    scope.wait_until_cancel();
 
     std::cout << "Audio test program Sound listener finished." << std::endl;
 }
diff --git a/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h b/SerialPrograms/Source/PokemonFRLG/Programs/TestPrograms/PokemonFRLG_SoundListener.h
@@ -28,12 +28,9 @@ class SoundListener : public SingleSwitchProgramInstance{
 public:
     SoundListener();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
-
-    virtual void start_program_border_check(
-        VideoStream& stream,
-        FeedbackType feedback_type
-    ) override{}
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void start_program_border_check(VideoStream &stream, FeedbackType feedback_type) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     enum class SoundType{
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.cpp
@@ -34,13 +34,13 @@ MountDetectionTest::MountDetectionTest(){
 }
 
 
-void MountDetectionTest::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void MountDetectionTest::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     MountTracker tracker(env.console, FAILED_ACTION);
     InferenceSession session(
-        context, env.console,
+        scope, env.console,
         {{tracker, std::chrono::seconds(1)}}
     );
-    context.wait_until_cancel();
+    scope.wait_until_cancel();
 }
 
 
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_MountDetectionTest.h
@@ -26,7 +26,8 @@ class MountDetectionTest : public SingleSwitchProgramInstance{
 public:
     MountDetectionTest();
 
-    virtual void program(SingleSwitchProgramEnvironment& env, ProControllerContext& context) override;
+    virtual void start_program_controller_check(ControllerSession& session) override{}
+    virtual void program(SingleSwitchProgramEnvironment& env, CancellableScope& scope) override;
 
 private:
     MountDetectorLoggingOption FAILED_ACTION;
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.cpp
@@ -37,7 +37,7 @@ OverworldWatcher_Descriptor::OverworldWatcher_Descriptor()
 OverworldWatcher::OverworldWatcher(){}
 
 
-void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
+void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, CancellableScope& scope){
     BubbleDetector bubbles;
     ArcDetector arcs;
     QuestMarkDetector quest_marks;
@@ -55,10 +55,10 @@ void OverworldWatcher::program(SingleSwitchProgramEnvironment& env, ProControlle
     );
 
     InferenceSession session(
-        context, env.console,
+        scope, env.console,
         {watcher}
     );
-    context.wait_until_cancel();
+    scope.wait_until_cancel();
 }
 
 
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_OverworldWatcher.h
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.cpp
diff --git a/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h b/SerialPrograms/Source/PokemonLA/Programs/TestPrograms/PokemonLA_SoundListener.h
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp b/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.cpp
diff --git a/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h b/SerialPrograms/Source/PokemonSV/Programs/TestPrograms/PokemonSV_SoundListener.h
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.cpp
diff --git a/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h b/SerialPrograms/Source/PokemonSwSh/Programs/TestPrograms/PokemonSwSh_ShinyEncounterTester.h
