Fix Qt 6.5.3 build. Cleanup some error reports. Turn on error reports…

… by default for beta.
PokemonAutomation · Sep 28, 2023 · 1868ce2 · 1868ce2
1 parent 1657f72
commit 1868ce2
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp b/SerialPrograms/Source/CommonFramework/GlobalSettingsPanel.cpp
@@ -103,7 +103,7 @@ GlobalSettings::GlobalSettings()
         "<b>Send Error Reports:</b><br>"
         "Send error reports to the " + PROGRAM_NAME + " server to help them resolve issues and improve the program.",
         LockWhileRunning::LOCKED,
-        false
+        IS_BETA_VERSION
     )
     , STATS_FILE(
         false,

diff --git a/SerialPrograms/Source/CommonFramework/Globals.cpp b/SerialPrograms/Source/CommonFramework/Globals.cpp
@@ -23,7 +23,7 @@ namespace PokemonAutomation{
 const bool IS_BETA_VERSION = true;
 const int PROGRAM_VERSION_MAJOR = 0;
 const int PROGRAM_VERSION_MINOR = 41;
-const int PROGRAM_VERSION_PATCH = 2;
+const int PROGRAM_VERSION_PATCH = 3;
 
 const std::string PROGRAM_VERSION_BASE =
     "v" + std::to_string(PROGRAM_VERSION_MAJOR) +

diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_FlagNavigationAir.cpp
@@ -302,14 +302,14 @@ bool FlagNavigationAir::run_state(AsyncCommandSession& commands, WallClock times
     }
     if (m_dialog_detector.detected()){
         throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
+            ErrorReport::NO_ERROR_REPORT, m_console,
             "Potential ambush by Miss Fortune sister.",
             true
         );
     }
     if (m_find_flag_failed.load(std::memory_order_acquire)){
         throw OperationFailedException(
-            ErrorReport::SEND_ERROR_REPORT, m_console,
+            ErrorReport::NO_ERROR_REPORT, m_console,
             "Unable to find flag.",
             true
         );

diff --git a/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp b/SerialPrograms/Source/PokemonLA/Programs/PokemonLA_RegionNavigation.cpp
@@ -364,7 +364,7 @@ void goto_camp_from_overworld(
         if (current_time() - start > std::chrono::seconds(60)){
 //            dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot());
             throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+                ErrorReport::NO_ERROR_REPORT, console,
                 "Unable to escape from being attacked.",
                 true
             );
@@ -454,7 +454,7 @@ void goto_any_camp_from_overworld(
         if (current_time() - start > std::chrono::seconds(60)){
 //            dump_image(console.logger(), env.program_info(), "EscapeFromAttack", console.video().snapshot());
             throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+                ErrorReport::NO_ERROR_REPORT, console,
                 "Unable to escape from being attacked.",
                 true
             );

diff --git a/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp b/SerialPrograms/Source/PokemonSV/Inference/Overworld/PokemonSV_AreaZeroSkyDetector.cpp
@@ -117,7 +117,7 @@ void find_and_center_on_sky(
     while (true){
         if (current_time() - start > std::chrono::minutes(1)){
             throw OperationFailedException(
-                ErrorReport::SEND_ERROR_REPORT, console,
+                ErrorReport::NO_ERROR_REPORT, console,
                 "Failed to find the sky after 1 minute. (state = " + std::to_string((int)state) + ")",
                 true
             );

diff --git a/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp b/SerialPrograms/Source/PokemonSV/Programs/PokemonSV_BasicCatcher.cpp
@@ -225,8 +225,8 @@ CatchResults basic_catcher(
             }
 
             last_move_attack = false;
-#if 0
             pbf_press_button(context, BUTTON_X, 20, 105);
+#if 0
             context.wait_for_all_requests();
             BattleBallReader reader(console, language, COLOR_RED);
             int16_t qty = move_to_ball(reader, console, context, ball_slug);

diff --git a/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp b/SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_IngredientSession.cpp
@@ -4,6 +4,7 @@
  *
  */
 
+#include <algorithm>
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
 #include "Common/Cpp/Concurrency/AsyncDispatcher.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"