ardupilot-methodic-configurator 1.4.0__tar.gz → 1.4.2__tar.gz

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 1.4.0
+Version: 1.4.2
 Summary: A clear configuration sequence for ArduPilot vehicles
 Author-email: Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 Maintainer-email: Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
@@ -49,9 +49,9 @@ Requires-Dist: platformdirs==4.3.7
 Requires-Dist: pymavlink==2.4.43
 Requires-Dist: pyserial==3.5
 Requires-Dist: requests==2.32.3
-Requires-Dist: setuptools==76.0.0
+Requires-Dist: setuptools==78.1.0
 Provides-Extra: dev
-Requires-Dist: coverage==7.7.1; extra == "dev"
+Requires-Dist: coverage==7.8.0; extra == "dev"
 Requires-Dist: mock==5.2.0; extra == "dev"
 Requires-Dist: mypy==1.15.0; extra == "dev"
 Requires-Dist: pre-commit==4.1.0; extra == "dev"
@@ -64,7 +64,7 @@ Requires-Dist: pytest-md==0.2.0; extra == "dev"
 Requires-Dist: pytest-mock==3.14.0; extra == "dev"
 Requires-Dist: python-gettext==5.0; extra == "dev"
 Requires-Dist: ruff==0.11.2; extra == "dev"
-Requires-Dist: types-requests==2.32.0.20250306; extra == "dev"
+Requires-Dist: types-requests==2.32.0.20250328; extra == "dev"
 Dynamic: license-file
 
 # Correctly configure ArduPilot for your vehicles on your first attempt

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/__init__.py

@@ -12,4 +12,4 @@ from ardupilot_methodic_configurator.internationalization import load_translatio
 
 _ = load_translation()
 
-__version__ = "1.4.0"
+__version__ = "1.4.2"

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/__main__.py

@@ -228,6 +228,15 @@ def main() -> None:
             overwrite_existing_file=False,
             even_if_last_uploaded_filename_exists=False,
         )
+        # Create incremental backup file
+        backup_num = local_filesystem.find_lowest_available_backup_number()
+        local_filesystem.backup_fc_parameters_to_file(
+            flight_controller.fc_parameters,
+            f"autobackup_{backup_num:02d}.param",
+            overwrite_existing_file=True,
+            even_if_last_uploaded_filename_exists=True,
+        )
+        logging_info(_("Created backup file autobackup_%02d.param"), backup_num)
 
     # Call the GUI function with the starting intermediate parameter file
     ParameterEditorWindow(start_file, flight_controller, local_filesystem)

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/backend_filesystem.py

@@ -762,6 +762,22 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
                 logging_debug(msg)
         return ""
 
+    def find_lowest_available_backup_number(self) -> int:
+        """
+        Find the lowest non-existing backup number.
+
+        Returns:
+            The lowest available backup number
+
+        """
+        backup_num = 1  # Start from 01
+        while self.vehicle_configuration_file_exists(f"autobackup_{backup_num:02d}.param"):
+            backup_num += 1
+            if backup_num > 99:  # Prevent endless loop, cap at 99
+                # Overwrite the highest number if we reach the cap
+                return 99
+        return backup_num
+
     @staticmethod
     def add_argparse_arguments(parser: ArgumentParser) -> ArgumentParser:
         parser.add_argument(

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/backend_internet.py

@@ -11,10 +11,12 @@ SPDX-License-Identifier: GPL-3.0-or-later
 import os
 import subprocess
 import tempfile
+import time
 from datetime import datetime, timezone
 from logging import debug as logging_debug
 from logging import error as logging_error
 from logging import info as logging_info
+from logging import shutdown as logging_shutdown
 from typing import Any, Callable, Optional
 from urllib.parse import urljoin
 from webbrowser import open as webbrowser_open
@@ -148,6 +150,26 @@ def download_and_install_on_windows(
     file_name: str,
     progress_callback: Optional[Callable[[float, str], None]] = None,
 ) -> bool:
+    """
+    Download and install a new version of the application on Windows.
+
+    This function handles the complete update process:
+    1. Downloads the installer from the provided URL
+    2. Creates a batch script to run the installer after the current process exits
+    3. Exits the current application to allow the installer to run without conflicts
+       (prevents "program is already running" errors during installation)
+
+    Args:
+        download_url: The URL from which to download the installer
+        file_name: The name to save the downloaded file as
+        progress_callback: Optional callback function to report progress
+                          Takes two arguments: progress (0.0-1.0) and status message
+
+    Returns:
+        bool: True if the process started successfully (note: if successful,
+              the application will exit and never return from this function)
+
+    """
     logging_info(_("Downloading and installing new version for Windows..."))
     try:
         with tempfile.TemporaryDirectory() as temp_dir:
@@ -160,29 +182,54 @@ def download_and_install_on_windows(
                 timeout=60,  # Increased timeout for large files
                 progress_callback=progress_callback,
             ):
+                logging_error(_("Failed to download installer from %s"), download_url)
                 return False
 
             if progress_callback:
                 progress_callback(0.0, _("Starting installation..."))
 
-            # Run installer
-            result = subprocess.run(  # noqa: S603
-                [temp_path],
-                shell=False,
-                check=True,
-                capture_output=True,
-                text=True,
-                creationflags=subprocess.CREATE_NO_WINDOW,  # type: ignore[attr-defined]
-            )
+            # Create a batch file to run the installer after this process exits
+            batch_file_path = os.path.join(temp_dir, "run_installer.bat")
+            with open(batch_file_path, "w", encoding="utf-8") as batch_file:
+                # Wait a moment for the main process to exit
+                batch_file.write("@echo off\n")
+                batch_file.write("ping 127.0.0.1 -n 2 > nul\n")  # Wait ~1 second
+                batch_file.write(f'if exist "{temp_path}" (\n')  # Check if installer still exists
+                batch_file.write(f'  start "" "{temp_path}"\n')  # Run the installer
+                batch_file.write(") else (\n")
+                batch_file.write("  echo Installer not found\n")
+                batch_file.write(")\n")
+                batch_file.write("del %0\n")  # Delete the batch file itself
+
+            # Make the batch file executable and start it
+            # Use 'with' pattern for the Popen operation to fix R1732
+            with subprocess.Popen(  # noqa: S602
+                [batch_file_path],
+                shell=True,
+                creationflags=subprocess.CREATE_NO_WINDOW | subprocess.DETACHED_PROCESS,  # type: ignore[attr-defined]
+            ) as _result:
+                pass  # We don't need to do anything with the process object
+
+            # Signal to the main application that it should exit
+            if progress_callback:
+                progress_callback(1.0, _("Installation ready. Application will restart now."))
+
+            # Ensure logs are flushed before exit
+            logging_shutdown()
+
+            # Give a moment for the callback to complete
+            time.sleep(0.5)
 
-            return result.returncode == 0
+            # Exit this process to allow the installer to run
+            # This means the function will never actually return at this point,
+            # but we need to maintain consistent return type for the function signature
+            os._exit(0)  # Force exit without cleanup
 
     except subprocess.SubprocessError as e:
         logging_error(_("Installation failed: {}").format(e))
-        return False
     except OSError as e:
         logging_error(_("File operation failed: {}").format(e))
-        return False
+    return False
 
 
 def download_and_install_pip_release(progress_callback: Optional[Callable[[float, str], None]] = None) -> int:

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/configuration_steps_ArduPlane.json

@@ -13,7 +13,7 @@
             "auto_changed_by": "",
             "forced_parameters": {
                 "INS_TCAL1_ENABLE": { "New Value": 2, "Change Reason": "Activates the temperature calibration for IMU 1 at the next start" },
-                "LOG_BITMASK": { "New Value": 524416, "Change Reason": "Only for IMU and Raw-IMU" },
+                "LOG_BITMASK": { "New Value": 65535, "Change Reason": "Only for IMU and Raw-IMU" },
                 "LOG_DISARMED": { "New Value": 1, "Change Reason": "Gather data for the offline IMU temperature calibration while the FC is disarmed" }
             },
             "derived_parameters": {
@@ -49,7 +49,7 @@
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "",
             "forced_parameters": {
-                "LOG_BITMASK": { "New Value": 145118, "Change Reason": "Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now" },
+                "LOG_BITMASK": { "New Value": 65535, "Change Reason": "Log all but fast att, Nav, Mission, OF, camera, fast IMU, raw, IMU, video stabilization. These are not needed now" },
                 "LOG_DISARMED": { "New Value": 0, "Change Reason": "Log disarmed was only required for offline IMU temperature calibration" }
             },
             "derived_parameters": {

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/configuration_steps_strings.py

@@ -296,6 +296,21 @@ Jump to '47_position_controller.param' file?""")
     _config_steps_strings = _("test the stabilization loops independent of the input shaping")
     _config_steps_strings = _("was only needed for wind speed estimation")
 
+    # phase_names
+    _config_steps_strings = _("Analytical PID optimization")
+    _config_steps_strings = _("Assemble all components except the propellers")
+    _config_steps_strings = _("Assemble the propellers and perform the first flight")
+    _config_steps_strings = _("Basic mandatory configuration")
+    _config_steps_strings = _("Everyday use")
+    _config_steps_strings = _("Guided operation")
+    _config_steps_strings = _("IMU temperature calibration")
+    _config_steps_strings = _("Improve altitude control")
+    _config_steps_strings = _("Minimalistic mandatory tuning")
+    _config_steps_strings = _("Optical flow calibration")
+    _config_steps_strings = _("Position controller tuning")
+    _config_steps_strings = _("Precision landing")
+    _config_steps_strings = _("Standard tuning")
+
     # phase_descriptions
     _config_steps_strings = _("Assemble all components except the propellers")
     _config_steps_strings = _("Assemble the propellers and perform the first flight")

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -11,6 +11,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 """
 
 import sys
+import time
 import tkinter as tk
 from argparse import ArgumentParser, Namespace
 
@@ -148,6 +149,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         self.param_download_progress_window: ProgressWindow
         self.tempcal_imu_progress_window: ProgressWindow
         self.file_upload_progress_window: ProgressWindow
+        self.last_time_asked_to_save: float = 0
 
         self.root.title(
             _("Amilcar Lucas's - ArduPilot methodic configurator ") + __version__ + _(" - Parameter file editor and uploader")
@@ -819,7 +821,14 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
             self.close_connection_and_quit()
 
     def write_changes_to_intermediate_parameter_file(self) -> None:
-        if self.parameter_editor_table.get_at_least_one_param_edited() or self.annotate_params_into_files.get():
+        elapsed_since_last_ask = time.time() - self.last_time_asked_to_save
+        # if annotate parameters into files is true, we always need to write to file, because
+        # the parameter metadata might have changed, or not be present in the file.
+        # In that situation, avoid asking multiple times to write the file, by checking the time last asked
+        # But only if self.annotate_params_into_files.get()
+        if self.parameter_editor_table.get_at_least_one_param_edited() or (
+            self.annotate_params_into_files.get() and elapsed_since_last_ask > 1.0
+        ):
             msg = _("Do you want to write the changes to the {self.current_file} file?")
             if messagebox.askyesno(_("One or more parameters have been edited"), msg.format(**locals())):
                 self.local_filesystem.export_to_param(
@@ -828,6 +837,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
                     annotate_doc=self.annotate_params_into_files.get(),
                 )
         self.parameter_editor_table.set_at_least_one_param_edited(False)
+        self.last_time_asked_to_save = time.time()
 
     def write_summary_files(self) -> None:  # pylint: disable=too-many-locals
         if not hasattr(self.flight_controller, "fc_parameters") or self.flight_controller.fc_parameters is None:

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/frontend_tkinter_progress_window.py

@@ -1,5 +1,5 @@
 """
-TKinter base classes reused in multiple parts of the code.
+TKinter progress window class.
 
 This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
 

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/frontend_tkinter_software_update.py

@@ -13,24 +13,22 @@ from tkinter import ttk
 from typing import Callable, Optional
 
 from ardupilot_methodic_configurator import _, __version__
+from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_scroll_frame import ScrollFrame
 
 
-class UpdateDialog:  # pylint: disable=too-many-instance-attributes
+class UpdateDialog(BaseWindow):  # pylint: disable=too-many-instance-attributes
     """Dialog for displaying software update information and handling user interaction."""
 
     def __init__(self, version_info: str, download_callback: Optional[Callable[[], bool]] = None) -> None:
-        self.root = tk.Tk()
+        super().__init__()
         self.root.title(_("Amilcar Lucas's - ArduPilot methodic configurator ") + __version__ + _(" - New version available"))
-        self.root.geometry("700x700")
+        self.root.geometry("700x600")
         self.download_callback = download_callback
         self.root.protocol("WM_DELETE_WINDOW", self.on_cancel)
 
-        self.root.grid_rowconfigure(0, weight=1)
-        self.root.grid_columnconfigure(0, weight=1)
-
-        self.frame = ttk.Frame(self.root, padding="20")
-        self.frame.grid(sticky="nsew")
+        self.frame = ttk.Frame(self.main_frame, padding="10")
+        self.frame.pack(fill=tk.BOTH, expand=True)
 
         # Configure main frame to expand
         self.frame.grid_rowconfigure(0, weight=1)

{ardupilot_methodic_configurator-1.4.0 → ardupilot_methodic_configurator-1.4.2}/ardupilot_methodic_configurator/frontend_tkinter_stage_progress.py

@@ -110,7 +110,7 @@ class StageProgressBar(ttk.LabelFrame):  # pylint: disable=too-many-ancestors
         progress.grid(row=0, column=0, sticky="ew", pady=2)
         self.phase_bars.append({"bar": progress, "start": limits[0], "end": limits[1]})
 
-        label_text = phase_name
+        label_text = _(phase_name) if phase_name else ""
         first_space = label_text.find(" ")
         if "\n" not in label_text:
             if 6 <= first_space < 20: