Refactor the Burmy and LeapGrinder notifications.

Author: Mysticial

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp

@@ -285,7 +285,7 @@ void send_program_notification_with_file(
         filepath
     );
 }
-void send_program_notification(
+bool send_program_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     Color color,
     const std::string& title,
@@ -294,7 +294,7 @@ void send_program_notification(
     const ImageViewRGB32& image, bool keep_file
 ){
     if (!settings.ok_to_send_now(env.logger())){
-        return;
+        return false;
     }
 #if 1
     messages.emplace_back(
@@ -331,6 +331,8 @@ void send_program_notification(
         messages,
         ImageAttachment(image, settings.screenshot(), keep_file)
     );
+
+    return true;
 }
 
 

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.h

@@ -50,7 +50,7 @@ void send_program_notification_with_file(
     const std::string& current_stats_addendum,
     const std::string& filepath
 );
-void send_program_notification(
+bool send_program_notification(
     ProgramEnvironment& env, EventNotificationOption& settings,
     Color color,
     const std::string& title,

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramComputer.cpp

@@ -282,6 +282,40 @@ struct RequestManagerConfig{
 
 
 
+struct Command{
+    uint64_t seqnum;
+    uint64_t milliseconds;
+    uint64_t buttons;
+    uint16_t left_joystick_x;
+    uint16_t left_joystick_y;
+    uint16_t right_joystick_x;
+    uint16_t right_joystick_y;
+
+    void write_to_hex(char str[64]) const{
+        const char HEX_DIGITS[] = "0123456789abcdef";
+        const char* ptr = (const char*)this;
+        for (size_t c = 0; c < 64; c += 2){
+            uint8_t hi = (uint8_t)ptr[0] >> 4;
+            uint8_t lo = (uint8_t)ptr[0] & 0x0f;
+            str[c + 0] = HEX_DIGITS[hi];
+            str[c + 1] = HEX_DIGITS[lo];
+            ptr++;
+        }
+    }
+    void parse_from_hex(const char str[64]){
+        char* ptr = (char*)this;
+        for (size_t c = 0; c < 64; c += 2){
+            char hi = str[c + 0];
+            char lo = str[c + 1];
+            hi = hi < 'a' ? hi - '0' : hi - 'a' + 10;
+            lo = lo < 'a' ? lo - '0' : lo - 'a' + 10;
+            ptr[0] = hi << 4 | lo;
+            ptr++;
+        }
+    }
+};
+
+
 
 
 
@@ -296,13 +330,35 @@ void TestProgramComputer::program(ProgramEnvironment& env, CancellableScope& sco
 
     using namespace std::chrono_literals;
 
+    Command command{
+        123,
+        100,
+        512,
+        2000, 3000,
+        4000, 5000
+    };
+
+    char str[65] = {};
+    command.write_to_hex(str);
+    cout << str << endl;
+    memset(&command, 0, sizeof(Command));
+
+    command.parse_from_hex(str);
+
+    cout << command.milliseconds << endl;
+    cout << command.buttons << endl;
+    cout << command.left_joystick_x << endl;
+    cout << command.left_joystick_y << endl;
+    cout << command.right_joystick_x << endl;
+    cout << command.right_joystick_y << endl;
 
 
+#if 0
     ImageRGB32 image("20250503-121259857603.png");
 
     image = filter_rgb32_euclidean(image, (uint32_t)COLOR_PURPLE, 100, COLOR_RED, true);
     image.save("temp.png");
-
+#endif
 
 
 

SerialPrograms/Source/PokemonLA/Options/PokemonLA_MiscOptions.h

@@ -29,7 +29,7 @@ class ResetMethodOption : public EnumDropdownOption<ResetMethod>{
                 {ResetMethod::SoftReset,        "reset",                "Soft Reset"},
                 {ResetMethod::GoBackToVillage,  "return-to-village",    "Go back to village"},
             },
-            LockMode::LOCK_WHILE_RUNNING,
+            LockMode::UNLOCK_WHILE_RUNNING,
             ResetMethod::SoftReset
         )
     {}
@@ -57,7 +57,7 @@ class StopOnOption : public EnumDropdownOption<StopOn>{
                 {StopOn::ShinyOrAlpha,  "shiny-or-alpha",   "Shiny or Alpha"},
                 {StopOn::ShinyAndAlpha, "shiny-and-alpha",  "Shiny and Alpha"},
             },
-            LockMode::LOCK_WHILE_RUNNING,
+            LockMode::UNLOCK_WHILE_RUNNING,
             StopOn::ShinyOrAlpha
         )
     {}
@@ -79,7 +79,7 @@ class ExitBattleMethodOption : public EnumDropdownOption<ExitBattleMethod>{
                 {ExitBattleMethod::RunAway, "run", "Run Away"},
                 {ExitBattleMethod::MashAToKill, "mash-a-to-kill", "Mash A to Kill"},
             },
-            LockMode::LOCK_WHILE_RUNNING,
+            LockMode::UNLOCK_WHILE_RUNNING,
             ExitBattleMethod::RunAway
         )
     {}
@@ -98,7 +98,7 @@ class TimeOfDayOption : public EnumDropdownOption<TimeOfDay>{
                 {TimeOfDay::EVENING,  TIME_OF_DAY_NAMES[int(TimeOfDay::EVENING)], "Evening"},
                 {TimeOfDay::MIDNIGHT, TIME_OF_DAY_NAMES[int(TimeOfDay::MIDNIGHT)], "Midnight"},
             },
-            LockMode::LOCK_WHILE_RUNNING,
+            LockMode::UNLOCK_WHILE_RUNNING,
             TimeOfDay::NONE
         )
     {}

SerialPrograms/Source/PokemonLA/Options/PokemonLA_ShinyDetectedAction.cpp

@@ -33,35 +33,21 @@ ShinyRequiresAudioText::ShinyRequiresAudioText()
 
 
 
-ShinyDetectedActionOption::ShinyDetectedActionOption(
+OverworldShinyDetectedActionOption::OverworldShinyDetectedActionOption(
     std::string label, std::string description,
     std::string default_delay,
-    ShinyDetectedAction default_action
+    OverworldShinyDetectedAction default_action
 )
-    : ShinyDetectedActionOption(
-        label,
-        std::move(description),
-        label,
-        std::move(default_delay),
-        std::move(default_action)
-    )
-{}
-ShinyDetectedActionOption::ShinyDetectedActionOption(
-    std::string label, std::string description,
-    std::string notification_label,
-    std::string default_delay,
-    ShinyDetectedAction default_action
-)
-    : GroupOption(std::move(label), LockMode::LOCK_WHILE_RUNNING)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
     , DESCRIPTION(std::move(description))
     , ACTION(
         "<b>Shiny Detected Action:</b>",
         {
-            {ShinyDetectedAction::IGNORE,                   "ignore",       "Ignore the shiny. Do not stop the program."},
-            {ShinyDetectedAction::STOP_PROGRAM,             "stop",         "Stop program. Align camera for a screenshot. Then go Home."},
-            {ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM,  "video+stop",   "Stop program. Align camera for a screenshot + video. Then go Home."},
+            {OverworldShinyDetectedAction::IGNORE,                  "ignore",       "Ignore the shiny. Do not stop the program."},
+            {OverworldShinyDetectedAction::STOP_PROGRAM,            "stop",         "Stop program. Align camera for a screenshot. Then go Home."},
+            {OverworldShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM, "video+stop",   "Stop program. Align camera for a screenshot + video. Then go Home."},
         },
-        LockMode::LOCK_WHILE_RUNNING,
+        LockMode::UNLOCK_WHILE_RUNNING,
         default_action
     )
 //    , STOP_PROGRAM("<b>Stop Program:</b><br>Stop program and go Home if it hears a shiny.", true)
@@ -70,11 +56,11 @@ ShinyDetectedActionOption::ShinyDetectedActionOption(
         "<b>Screenshot Delay:</b><br>"
         "Align the camera, then wait this long before taking a screenshot + video of the shiny.<br>"
         "Set to zero to skip this. Don't set this too large or the shiny may run away!",
-        LockMode::LOCK_WHILE_RUNNING,
+        LockMode::UNLOCK_WHILE_RUNNING,
         std::move(default_delay)
     )
     , NOTIFICATIONS(
-        std::move(notification_label),
+        this->label(),
         true, true,
         ImageAttachmentMode::JPG,
         {"Notifs", "Showcase"}
@@ -88,8 +74,30 @@ ShinyDetectedActionOption::ShinyDetectedActionOption(
 //    PA_ADD_OPTION(TAKE_VIDEO);
     PA_ADD_OPTION(SCREENSHOT_DELAY0);
 }
-bool ShinyDetectedActionOption::stop_on_shiny() const{
-    return ACTION != ShinyDetectedAction::IGNORE;
+bool OverworldShinyDetectedActionOption::stop_on_shiny() const{
+    return ACTION != OverworldShinyDetectedAction::IGNORE;
+}
+
+
+
+BattleMatchActionOption::BattleMatchActionOption(
+    std::string label, std::string description,
+    std::string default_delay
+)
+    : GroupOption(std::move(label), LockMode::UNLOCK_WHILE_RUNNING)
+    , DESCRIPTION(std::move(description))
+    , TAKE_VIDEO("<b>Take Video:</b>", LockMode::UNLOCK_WHILE_RUNNING, true)
+    , NOTIFICATIONS(
+        this->label(),
+        true, true,
+        ImageAttachmentMode::JPG,
+        {"Notifs", "Showcase"}
+    )
+{
+    if (!DESCRIPTION.text().empty()){
+        PA_ADD_OPTION(DESCRIPTION);
+    }
+    PA_ADD_OPTION(TAKE_VIDEO);
 }
 
 
@@ -99,7 +107,7 @@ bool ShinyDetectedActionOption::stop_on_shiny() const{
 
 bool on_shiny_callback(
     ProgramEnvironment& env, VideoStream& stream,
-    ShinyDetectedActionOption& options,
+    OverworldShinyDetectedActionOption& options,
     float error_coefficient
 ){
     {
@@ -109,8 +117,8 @@ bool on_shiny_callback(
 
         //  If we're not ignoring the shiny, return now. Actions will be deferred
         //  until after the session ends.
-        ShinyDetectedAction action = options.ACTION;
-        if (action != ShinyDetectedAction::IGNORE){
+        OverworldShinyDetectedAction action = options.ACTION;
+        if (action != OverworldShinyDetectedAction::IGNORE){
             return true;
         }
     }
@@ -134,7 +142,7 @@ bool on_shiny_callback(
 }
 void on_shiny_sound(
     ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
-    ShinyDetectedActionOption& options,
+    OverworldShinyDetectedActionOption& options,
     float error_coefficient
 ){
     std::vector<std::pair<std::string, std::string>> embeds;
@@ -157,46 +165,45 @@ void on_shiny_sound(
         stream.video().snapshot(), true
     );
 
-    ShinyDetectedAction action = options.ACTION;
-    if (action == ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM){
+    switch (options.ACTION){
+    case OverworldShinyDetectedAction::IGNORE:
+        break;
+    case OverworldShinyDetectedAction::STOP_PROGRAM:
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+        context.wait_for_all_requests();
+        throw ProgramFinishedException();
+    case OverworldShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM:
         pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
+        pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
+        context.wait_for_all_requests();
+        throw ProgramFinishedException();
     }
-
-    pbf_press_button(context, BUTTON_HOME, 160ms, GameSettings::instance().GAME_TO_HOME_DELAY0);
-    context.wait_for_all_requests();
-    throw ProgramFinishedException();
 }
 
-void on_match_found(
+void on_battle_match_found(
     ProgramEnvironment& env, VideoStream& stream, ProControllerContext& context,
-    ShinyDetectedActionOption& options, bool stop_program
+    BattleMatchActionOption& options,
+    bool allow_notification
 ){
-    std::vector<std::pair<std::string, std::string>> embeds;
-
-    pbf_mash_button(context, BUTTON_ZL, options.SCREENSHOT_DELAY0);
     context.wait_for_all_requests();
 
-    send_program_notification(
-        env, options.NOTIFICATIONS,
-        Pokemon::COLOR_STAR_SHINY,
-        "Match Found",
-        embeds, "",
-        stream.video().snapshot(), true
-    );
-
-    ShinyDetectedAction action = options.ACTION;
-    if (action == ShinyDetectedAction::TAKE_VIDEO_STOP_PROGRAM){
-        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
+    if (allow_notification){
+        send_program_notification(
+            env, options.NOTIFICATIONS,
+            Pokemon::COLOR_STAR_SHINY,
+            "Match Found",
+            {}, "",
+            stream.video().snapshot(), true
+        );
     }
 
-    if (stop_program){
-        stream.log("Stopping...");
-//        pbf_press_button(context, BUTTON_HOME, 20, GameSettings::instance().GAME_TO_HOME_DELAY);
-        context.wait_for_all_requests();
-        throw ProgramFinishedException();
+    if (options.TAKE_VIDEO){
+        pbf_press_button(context, BUTTON_CAPTURE, 2 * TICKS_PER_SECOND, 0);
     }
 
-    stream.log("Continuing...");
+    stream.log("Stopping...");
+    context.wait_for_all_requests();
+    throw ProgramFinishedException();
 }