Fix crash when editing item printer table. Fix date-spam missing date.

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/Programs/NintendoSwitch_Navigation.cpp

@@ -95,7 +95,7 @@ void home_to_date_time(ProControllerContext& context, bool to_date_change, bool
             return;
         }
 
-        ssf_press_button(context, BUTTON_A);
+        ssf_press_button(context, BUTTON_A, 1000ms, timing_variation, timing_variation);
         ssf_issue_scroll(context, SSF_SCROLL_DOWN);
         ssf_issue_scroll(context, SSF_SCROLL_DOWN);
     }

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNG.cpp

@@ -317,7 +317,16 @@ ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
     ItemPrinterPrizeResult prize_result;
     bool printed = false;
     bool overworld_seen = false;
+    size_t failures = 0;
+    std::chrono::seconds next_wait_time = std::chrono::seconds(120);
     while (true){
+        if (failures >= 5){
+            OperationFailedException::fire(
+                ErrorReport::SEND_ERROR_REPORT,
+                "Unable to print after 5 attempts.",
+                env.console
+            );
+        }
         context.wait_for_all_requests();
 
         OverworldWatcher overworld(env.console, COLOR_BLUE);
@@ -326,7 +335,7 @@ ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
         DateChangeWatcher date_reader;
         WhiteButtonWatcher material(COLOR_GREEN, WhiteButton::ButtonX, {0.63, 0.93, 0.17, 0.06});
         int ret = wait_until(
-            env.console, context, std::chrono::seconds(120),
+            env.console, context, next_wait_time,
             {
                 overworld,
                 dialog,
@@ -335,6 +344,7 @@ ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
                 material,
             }
         );
+        next_wait_time = std::chrono::seconds(120);
         switch (ret){
         case 0:
             overworld_seen = true;
@@ -357,6 +367,7 @@ ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
             home_to_date_time(context, true, false);
             pbf_press_button(context, BUTTON_A, 10, 30);
             context.wait_for_all_requests();
+            next_wait_time = std::chrono::seconds(5);
             continue;
         }
         case 3:{
@@ -431,13 +442,17 @@ ItemPrinterPrizeResult ItemPrinterRNG::run_print_at_date(
             continue;
         }
         default:
+            failures++;
             stats.errors++;
             env.update_stats();
+            env.console.log("No state detected after 2 minutes.", COLOR_RED);
+#if 0
             OperationFailedException::fire(
                 ErrorReport::SEND_ERROR_REPORT,
                 "No state detected after 2 minutes.",
                 env.console
             );
+#endif
         }
     }
 }

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.cpp

@@ -7,6 +7,10 @@
 #include "Common/Qt/TimeQt.h"
 #include "PokemonSV_ItemPrinterRNGTable.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 namespace NintendoSwitch{
 namespace PokemonSV{
@@ -79,29 +83,52 @@ std::unique_ptr<EditableTableRow> ItemPrinterRngRow::clone() const{
 //  - also, hide the date if chain enabled.
 // - trigger the listener for the parent table.
 void ItemPrinterRngRow::value_changed(void* object){
+    {
+        WriteSpinLock lg1(m_pending_lock);
+        m_pending.emplace_back(object);
+    }
 
-    ItemPrinterRngTable& table = static_cast<ItemPrinterRngTable&>(parent());
+    bool keep_going;
+    do{
+        std::unique_lock<std::mutex> lg(m_update_lock, std::try_to_lock_t());
+        if (!lg.owns_lock()){
+            return;
+        }
 
-    if (object == &desired_item){
-        ItemPrinter::PrebuiltOptions option = desired_item;
-        if (option != ItemPrinter::PrebuiltOptions::NONE){
-            const ItemPrinter::ItemPrinterEnumOption& option_data = option_lookup_by_enum(option);
-            chain = false;
-            date.set(from_seconds_since_epoch(option_data.seed));
-            jobs.set(option_data.jobs);
+        {
+            WriteSpinLock lg1(m_pending_lock);
+            object = m_pending.front();
+            m_pending.pop_front();
         }
-    }else if (object == &date || object == &jobs || object == &chain){
-        date.set_visibility(chain ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED);
-        const ItemPrinter::ItemPrinterEnumOption* option_data = ItemPrinter::option_lookup_by_seed(to_seconds_since_epoch(date));
-        // seed found in the PrebuiltOptions table, and jobs number matches and chain disabled
-        if (option_data != nullptr && option_data->jobs == jobs && !chain){ 
-            desired_item.set(option_data->enum_value);
-        }else{
-            desired_item.set(ItemPrinter::PrebuiltOptions::NONE);
+
+        ItemPrinterRngTable& table = static_cast<ItemPrinterRngTable&>(parent());
+
+        if (object == &desired_item){
+            ItemPrinter::PrebuiltOptions option = desired_item;
+            if (option != ItemPrinter::PrebuiltOptions::NONE){
+                const ItemPrinter::ItemPrinterEnumOption& option_data = option_lookup_by_enum(option);
+                chain = false;
+                jobs.set(option_data.jobs);
+                date.set(from_seconds_since_epoch(option_data.seed));
+            }
+        }else if (object == &date || object == &jobs || object == &chain){
+            date.set_visibility(chain ? ConfigOptionState::HIDDEN : ConfigOptionState::ENABLED);
+            const ItemPrinter::ItemPrinterEnumOption* option_data = ItemPrinter::option_lookup_by_seed(to_seconds_since_epoch(date));
+//            cout << "option_data = " << option_data << endl;
+            // seed found in the PrebuiltOptions table, and jobs number matches and chain disabled
+            if (option_data != nullptr && option_data->jobs == jobs && !chain){
+                desired_item.set(option_data->enum_value);
+            }else{
+//                cout << "option_data->jobs = " << (size_t)option_data->jobs << ", jobs = " << jobs.current_value() << ", chain = " << chain << endl;
+                desired_item.set(ItemPrinter::PrebuiltOptions::NONE);
+            }
         }
-    }
 
-    table.report_value_changed(object);
+        table.report_value_changed(object);
+
+        WriteSpinLock lg1(m_pending_lock);
+        keep_going = !m_pending.empty();
+    }while (keep_going);
 }
 
 ItemPrinterRngTable::ItemPrinterRngTable(std::string label)

SerialPrograms/Source/PokemonSV/Programs/ItemPrinter/PokemonSV_ItemPrinterRNGTable.h

@@ -7,6 +7,8 @@
 #ifndef PokemonAutomation_PokemonSV_ItemPrinterRNGTable_H
 #define PokemonAutomation_PokemonSV_ItemPrinterRNGTable_H
 
+#include <deque>
+#include <mutex>
 #include "Common/Cpp/Options/BooleanCheckBoxOption.h"
 #include "Common/Cpp/Options/EnumDropdownOption.h"
 #include "Common/Cpp/Options/DateOption.h"
@@ -49,6 +51,11 @@ class ItemPrinterRngRow : public EditableTableRow, public ConfigOption::Listener
     DateTimeCell date;
     EnumDropdownCell<ItemPrinterJobs> jobs;
     EnumDropdownCell<ItemPrinter::PrebuiltOptions> desired_item;
+
+private:
+    SpinLock m_pending_lock;
+    std::deque<void*> m_pending;
+    std::mutex m_update_lock;
 };