Merge branch 'main' into v0.60

Author: Mysticial

.gitignore

@@ -64,3 +64,7 @@ __pycache__
 vcpkg/
 
 CLAUDE.md
+
+build_*/
+.cache/*
+Packages/*

Common/Qt/Options/KeyBindingWidget.cpp

@@ -39,9 +39,9 @@ TimeDurationCellWidget<Type>::TimeDurationCellWidget(QWidget& parent, TimeDurati
     ));
 
     connect(
-        this, &QLineEdit::textChanged,
-        this, [this](const QString& text){
-            std::string error = m_value.set(text.toStdString());
+        this, &QLineEdit::editingFinished,
+        this, [this](){
+            m_value.set(this->text().toStdString());
         }
     );
 
@@ -105,43 +105,47 @@ TimeDurationOptionWidget<Type>::TimeDurationOptionWidget(QWidget& parent, TimeDu
         "Wireless controllers have larger tick sizes and are imprecise due to wireless communication latency."
     ));
 
-    QLabel* description = nullptr;
+    m_description = nullptr;
     if (value.show_summary()){
-        description = new QLabel(QString::fromStdString(m_value.time_string()), this);
-        description->setAlignment(Qt::AlignHCenter);
-        row1->addWidget(description);
+        m_description = new QLabel(QString::fromStdString(m_value.time_string()), this);
+        m_description->setAlignment(Qt::AlignHCenter);
+        row1->addWidget(m_description);
     }
 
     connect(
         m_box, &QLineEdit::editingFinished,
-        this, [this, description](){
+        this, [this](){
             std::string error = m_value.set(m_box->text().toStdString());
-            if (description == nullptr){
+            if (m_description == nullptr){
                 return;
             }
             if (error.empty()){
-                description->setText(QString::fromStdString(m_value.time_string()));
+                m_description->setText(QString::fromStdString(m_value.time_string()));
             }else{
-                description->setText(QString::fromStdString("<font color=\"red\">" + error + "</font>"));
+                m_description->setText(QString::fromStdString("<font color=\"red\">" + error + "</font>"));
             }
         }
     );
+#if 0
     connect(
         m_box, &QLineEdit::textChanged,
-        this, [this, description](){
-            if (description == nullptr){
+        this, [this, m_description](){
+            if (m_description == nullptr){
                 return;
             }
             std::string text = m_value.time_string(m_box->text().toStdString());
-            description->setText(QString::fromStdString(text));
+            m_description->setText(QString::fromStdString(text));
         }
     );
+#endif
 
     value.add_listener(*this);
 }
 template <typename Type>
 void TimeDurationOptionWidget<Type>::update_value(){
-    m_box->setText(QString::fromStdString(m_value.current_text()));
+    std::string text = m_value.current_text();
+    m_box->setText(QString::fromStdString(text));
+    m_description->setText(QString::fromStdString(m_value.time_string()));
 }
 template <typename Type>
 void TimeDurationOptionWidget<Type>::on_config_value_changed(void* object){

Common/Qt/Options/TimeDurationWidget.cpp

@@ -11,6 +11,8 @@
 #include "Common/Cpp/Options/TimeDurationOption.h"
 #include "ConfigWidget.h"
 
+class QLabel;
+
 namespace PokemonAutomation{
 
 
@@ -42,6 +44,7 @@ class TimeDurationOptionWidget : public QWidget, public ConfigWidget{
 private:
     TimeDurationOption<Type>& m_value;
     QLineEdit* m_box;
+    QLabel* m_description;
 };
 
 

Common/Qt/Options/TimeDurationWidget.h

@@ -0,0 +1,137 @@
+#!/usr/bin/env python3
+"""
+Convert a Pokemon name txt file to a JSON slug list.
+Each line of the txt file is converted to a lowercase slug and validated against
+the National Pokedex database.
+
+The pokemon name txt file format is one line per pokemon name.
+Its content can be downloaded from a site like Serebii.
+"""
+
+import argparse
+import json
+import re
+import unicodedata
+from pathlib import Path
+
+
+def normalize_pokemon_name(name: str) -> str:
+    """
+    Convert a Pokemon name to a slug format.
+    - Converts to lowercase
+    - Removes accents/diacritics
+    - Handles special characters
+    """
+    # Remove accents and normalize unicode characters
+    # NFD = Canonical Decomposition
+    nfd = unicodedata.normalize('NFD', name)
+    # Filter out combining characters (accents)
+    name_no_accents = ''.join(char for char in nfd if unicodedata.category(char) != 'Mn')
+
+    # Convert to lowercase
+    slug = name_no_accents.lower()
+
+    # Handle special cases
+    # Replace apostrophes with '-d' for Farfetch'd and Sirfetch'd
+    slug = slug.replace("'d", "-d")
+
+    # Replace periods and spaces with hyphens for Mr. Mime, Mime Jr., Mr. Rime
+    slug = slug.replace(". ", "-")  # Handle "Mr. " -> "mr-"
+    slug = slug.replace(" ", "-")   # Handle remaining spaces
+    slug = slug.rstrip(".")         # Remove trailing periods (e.g., "mime-jr." -> "mime-jr")
+
+    return slug
+
+
+def main(input_txt: Path, database_json: Path, output_json: Path):
+    """
+    Convert Pokemon names from txt file to JSON slugs.
+
+    Args:
+        input_txt: Path to input text file with Pokemon names (one per line)
+        database_json: Path to National Pokedex JSON database for validation
+        output_json: Path to output JSON file
+    """
+
+    # Load the National Pokedex database
+    with open(database_json, 'r', encoding='utf-8') as f:
+        national_pokedex = json.load(f)
+
+    # Convert to set for faster lookup
+    national_pokedex_set = set(national_pokedex)
+
+    # Read the input txt file and convert names
+    pokemon_slugs = []
+    not_found = []
+
+    with open(input_txt, 'r', encoding='utf-8') as f:
+        for line_num, line in enumerate(f, 1):
+            line = line.strip()
+            if not line:
+                continue
+
+            # Pokemon name is the entire line
+            pokemon_name = line
+
+            # Convert to slug
+            slug = normalize_pokemon_name(pokemon_name)
+
+            # Validate against database
+            if slug in national_pokedex_set:
+                pokemon_slugs.append(slug)
+                print(f"✓ {pokemon_name} -> {slug}")
+            else:
+                not_found.append((pokemon_name, slug))
+                print(f"✗ {pokemon_name} -> {slug} (NOT FOUND in database)")
+
+    # Report results
+    print(f"\n{'='*60}")
+    print(f"Total Pokemon processed: {len(pokemon_slugs) + len(not_found)}")
+    print(f"Successfully validated: {len(pokemon_slugs)}")
+    print(f"Not found in database: {len(not_found)}")
+
+    if not_found:
+        print(f"\nPokemon not found in database:")
+        for name, slug in not_found:
+            print(f"  - {name} ({slug})")
+
+    # Write output JSON
+    with open(output_json, 'w', encoding='utf-8') as f:
+        json.dump(pokemon_slugs, f, indent=4, ensure_ascii=False)
+
+    print(f"\n✓ Output written to: {output_json}")
+    print(f"  Total entries: {len(pokemon_slugs)}")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Convert Pokemon name txt file to JSON slug list.",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        epilog="""
+Example usage:
+  %(prog)s input.txt Pokedex-National.json output.json
+  %(prog)s Pokedex-Lumiose.txt Pokedex-National.json Pokedex-Lumiose.json
+        """
+    )
+
+    parser.add_argument(
+        'input_txt',
+        type=Path,
+        help='Input text file with Pokemon names (one per line)'
+    )
+
+    parser.add_argument(
+        'database_json',
+        type=Path,
+        help='National Pokedex JSON database file for slug validation'
+    )
+
+    parser.add_argument(
+        'output_json',
+        type=Path,
+        help='Output JSON file to save the slug list'
+    )
+
+    args = parser.parse_args()
+
+    main(args.input_txt, args.database_json, args.output_json)

SerialPrograms/Scripts/TextProcessing/convert_pokemon_txt_to_json.py

@@ -32,12 +32,26 @@
 
 raw_image = image.copy()
 
+# ==================================================================
+# Home summary screen finish loading detector
+add_infer_box_to_image(raw_image, 0.388, 0.238, 0.109, 0.062, image)
+
+# ==================================================================
+# LZA Hyperspace Timer detection
+# add_infer_box_to_image(raw_image, 0.044, 0.111, 0.060, 0.067, image)
+
+
+# ==================================================================
+# LZA Map detector
+# add_infer_box_to_image(raw_image, 0.760730, 0.937023, 0.241416, 0.064885, image)
+# add_infer_box_to_image(raw_image, 0.005000, 0.150000, 0.025000, 0.110000, image)
+# add_infer_box_to_image(raw_image, 0.005000, 0.210000, 0.025000, 0.110000, image)
 
 
 # ==================================================================
 # LZA alert eye detector
-add_infer_box_to_image(raw_image, 0.485, 0.088, 0.029, 0.034, image)
-add_infer_box_to_image(raw_image, 0.464, 0.142, 0.071, 0.074, image)
+# add_infer_box_to_image(raw_image, 0.485, 0.088, 0.029, 0.034, image)
+# add_infer_box_to_image(raw_image, 0.464, 0.142, 0.071, 0.074, image)
 
 
 # ==================================================================

SerialPrograms/Scripts/check_detector_regions.py

@@ -28,6 +28,7 @@
 #include "Startup/NewVersionCheck.h"
 #include "CommonFramework/VideoPipeline/Backends/CameraImplementations.h"
 #include "CommonTools/OCR/OCR_RawOCR.h"
+#include "ControllerInput/ControllerInput.h"
 #include "Windows/MainWindow.h"
 
 #include <iostream>
@@ -164,7 +165,7 @@ int main(int argc, char *argv[]){
     int ret = run_program(argc, argv);
 
 
-    // Write program settings back to the json file.
+    //  Write program settings back to the json file.
     PERSISTENT_SETTINGS().write();
 
 
@@ -176,7 +177,10 @@ int main(int argc, char *argv[]){
     Integration::DppClient::Client::instance().disconnect();
 #endif
 
-    // Force stop the thread pool
+    //  Stop the controllers.
+    global_input_stop();
+
+    //  Force stop the thread pool
     PokemonAutomation::GlobalThreadPools::realtime_inference().stop();
     PokemonAutomation::GlobalThreadPools::normal_inference().stop();
 

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -2,7 +2,7 @@
  *
  *  From: https://github.com/PokemonAutomation/
  *
- *  Detect if the entire screen is frozen.
+ *  Detect if the entire screen or a part of it is frozen.
  */
 
 #ifndef PokemonAutomation_CommonTools_FrozenImageDetector_H