Merge branch 'main' of https://github.com/PokemonAutomation/Arduino-Source

Author: Mysticial

SerialPrograms/Source/NintendoSwitch/DevPrograms/TestProgramSwitch.cpp

@@ -120,6 +120,7 @@
 #include "PokemonSV/Programs/Farming/PokemonSV_TournamentFarmer.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_NumberCodeEntry.h"
 #include "PokemonSV/Inference/ItemPrinter/PokemonSV_ItemPrinterMenuDetector.h"
+#include "PokemonSV/Inference/Picnics/PokemonSV_SandwichHandDetector.h"
 
 
 #include <QPixmap>
@@ -317,6 +318,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
 //    std::terminate();
 
 
+#if 0
     ImageRGB32 image("20250404-154507236508.png");
 
     ArcPhoneDetector phone(logger, overlay, std::chrono::milliseconds(250), true);
@@ -333,10 +335,23 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
         {phone}
     );
 #endif
+#endif
 
 #if 0
     // ImageRGB32 image(IMAGE_PATH);
     auto image = feed.snapshot();
+#if 1
+    ImageRGB32 image(IMAGE_PATH);
+    // auto image = feed.snapshot();
+
+    SandwichHandLocator hand(SandwichHandType::FREE, {0, 0, 1, 1});
+    std::pair<double, double> location = hand.locate_sandwich_hand(image, {0,0,1,1});
+    cout << location.first << ", " << location.second << endl;
+#endif
+
+#if 0
+    ImageRGB32 image(IMAGE_PATH);
+    // auto image = feed.snapshot();
 
     ItemPrinterMaterialDetector detector(COLOR_RED, Language::English);
 
@@ -349,6 +364,7 @@ void TestProgram::program(MultiSwitchProgramEnvironment& env, CancellableScope&
     }
 
 #endif
+#endif
 
 #if 0
 

SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.cpp

@@ -5,6 +5,7 @@
  */
 
 #include "CommonFramework/Notifications/ProgramNotifications.h"
+#include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "CommonTools/StartupChecks/VideoResolutionCheck.h"
 #include "Pokemon/Pokemon_Strings.h"
 #include "PokemonSV/Programs/Sandwiches/PokemonSV_SandwichRoutines.h"
@@ -32,6 +33,22 @@ SandwichMaker_Descriptor::SandwichMaker_Descriptor()
     )
 {}
 
+struct SandwichMaker_Descriptor::Stats : public StatsTracker{
+    Stats()
+        : sandwiches(m_stats["Sandwiches"])
+        , errors(m_stats["Errors"])
+    {
+        m_display_order.emplace_back("Sandwiches");
+        m_display_order.emplace_back("Errors", HIDDEN_IF_ZERO);
+    }
+    std::atomic<uint64_t>& sandwiches;
+    std::atomic<uint64_t>& errors;
+};
+
+std::unique_ptr<StatsTracker> SandwichMaker_Descriptor::make_stats() const{
+    return std::unique_ptr<StatsTracker>(new Stats());
+}
+
 SandwichMaker::SandwichMaker()
     : SANDWICH_OPTIONS(
         "Sandwich Options",
@@ -40,29 +57,34 @@ SandwichMaker::SandwichMaker()
         false,
         GroupOption::EnableMode::ALWAYS_ENABLED
     )
+    , NUM_SANDWICHES(
+        "<b>Number of sandwiches to make:</b><br>Repeatedly make the same sandwich.",
+        LockMode::UNLOCK_WHILE_RUNNING,
+        1, 1, 1000
+    )
     , GO_HOME_WHEN_DONE(false)
     , NOTIFICATIONS({
         &NOTIFICATION_PROGRAM_FINISH,
         &NOTIFICATION_ERROR_FATAL,
         })
 {
     PA_ADD_OPTION(SANDWICH_OPTIONS);
+    PA_ADD_OPTION(NUM_SANDWICHES);
     PA_ADD_OPTION(GO_HOME_WHEN_DONE);
     PA_ADD_OPTION(NOTIFICATIONS);
 }
 
 void SandwichMaker::program(SingleSwitchProgramEnvironment& env, ProControllerContext& context){
     assert_16_9_720p_min(env.logger(), env.console);
+    SandwichMaker_Descriptor::Stats& stats = env.current_stats<SandwichMaker_Descriptor::Stats>();
 
-    #if 0
-        // make unlimited sandwiches. until it errors out.
-        while (true){
-            make_sandwich_option(env, env.console, context, SANDWICH_OPTIONS);
-            enter_sandwich_recipe_list(env.program_info(), env.console, context);
-        }
-    #endif
-
-    make_sandwich_option(env, env.console, context, SANDWICH_OPTIONS);
+    for (int i = 0; i < NUM_SANDWICHES; i++){
+        env.console.log("Making sandwich number: " + std::to_string(i+1), COLOR_ORANGE);
+        stats.sandwiches++;
+        env.update_stats();
+        make_sandwich_option(env, env.console, context, SANDWICH_OPTIONS);
+        enter_sandwich_recipe_list(env.program_info(), env.console, context);
+    }
 
     GO_HOME_WHEN_DONE.run_end_of_program(context);
     send_program_finished_notification(env, NOTIFICATION_PROGRAM_FINISH);

SerialPrograms/Source/PokemonSV/Programs/Sandwiches/PokemonSV_SandwichMaker.h

@@ -9,6 +9,7 @@
 
 #include "NintendoSwitch/NintendoSwitch_SingleSwitchProgram.h"
 #include "NintendoSwitch/Options/NintendoSwitch_GoHomeWhenDoneOption.h"
+#include "Common/Cpp/Options/SimpleIntegerOption.h"
 #include "CommonFramework/Notifications/EventNotificationsTable.h"
 #include "PokemonSV/Options/PokemonSV_SandwichMakerOption.h"
 
@@ -20,6 +21,8 @@ namespace PokemonSV{
 class SandwichMaker_Descriptor : public SingleSwitchProgramDescriptor{
 public:
     SandwichMaker_Descriptor();
+    struct Stats;
+    virtual std::unique_ptr<StatsTracker> make_stats() const override;
 };
 
 class SandwichMaker : public SingleSwitchProgramInstance{
@@ -30,6 +33,7 @@ class SandwichMaker : public SingleSwitchProgramInstance{
 
 private:
     SandwichMakerOption SANDWICH_OPTIONS;
+    SimpleIntegerOption<uint16_t> NUM_SANDWICHES;
     GoHomeWhenDoneOption GO_HOME_WHEN_DONE;
     EventNotificationsOption NOTIFICATIONS;
 };