ardupilot-methodic-configurator 2.0.3__tar.gz → 2.0.5__tar.gz

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 2.0.3
+Version: 2.0.5
 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>
@@ -50,7 +50,7 @@ License-File: LICENSES/PSF-2.0.txt
 License-File: credits/CREDITS.md
 Requires-Dist: argcomplete==3.6.2
 Requires-Dist: defusedxml==0.7.1
-Requires-Dist: jsonschema==4.25.0
+Requires-Dist: jsonschema==4.25.1
 Requires-Dist: matplotlib==3.9.4; python_version < "3.10"
 Requires-Dist: matplotlib==3.10.3; python_version >= "3.10"
 Requires-Dist: numpy==2.0.2; python_version < "3.13"
@@ -60,24 +60,28 @@ Requires-Dist: pip_system_certs==4.0
 Requires-Dist: platformdirs==4.3.8
 Requires-Dist: pymavlink==2.4.49
 Requires-Dist: pyserial==3.5
-Requires-Dist: requests==2.32.4
-Requires-Dist: setuptools==80.9.0
+Requires-Dist: requests==2.32.5
 Provides-Extra: dev
-Requires-Dist: coverage==7.10.2; extra == "dev"
+Requires-Dist: coverage==7.10.5; extra == "dev"
 Requires-Dist: mock==5.2.0; extra == "dev"
 Requires-Dist: mypy==1.17.1; extra == "dev"
 Requires-Dist: pre-commit==4.3.0; extra == "dev"
 Requires-Dist: pylint==3.3.8; extra == "dev"
-Requires-Dist: pyright==1.1.403; extra == "dev"
+Requires-Dist: pyright==1.1.404; extra == "dev"
 Requires-Dist: pytest==8.4.1; extra == "dev"
 Requires-Dist: pytest-cov==6.2.1; extra == "dev"
 Requires-Dist: pytest-md==0.2.0; extra == "dev"
 Requires-Dist: pytest-mock==3.14.1; extra == "dev"
 Requires-Dist: python-gettext==5.0; extra == "dev"
-Requires-Dist: ruff==0.12.7; extra == "dev"
-Requires-Dist: types-requests==2.32.4.20250611; extra == "dev"
+Requires-Dist: ruff==0.12.10; extra == "dev"
+Requires-Dist: types-requests==2.32.4.20250809; extra == "dev"
 Provides-Extra: scripts
 Requires-Dist: bs4; extra == "scripts"
+Provides-Extra: pypi-dist
+Requires-Dist: build==1.3.0; extra == "pypi-dist"
+Requires-Dist: packaging==25.0; extra == "pypi-dist"
+Requires-Dist: setuptools==80.9.0; extra == "pypi-dist"
+Requires-Dist: wheel==0.45.1; extra == "pypi-dist"
 Provides-Extra: win-dist
 Requires-Dist: wheel==0.45.1; extra == "win-dist"
 Requires-Dist: pip==25.2; extra == "win-dist"

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/__init__.py

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

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/backend_filesystem.py

@@ -12,16 +12,21 @@ SPDX-License-Identifier: GPL-3.0-or-later
 from argparse import ArgumentParser
 from logging import debug as logging_debug
 from logging import error as logging_error
+from logging import exception as logging_exception
 from logging import info as logging_info
 from logging import warning as logging_warning
 from os import getcwd as os_getcwd
 from os import listdir as os_listdir
 from os import path as os_path
+from os import remove as os_remove
 from os import rename as os_rename
+from os import rmdir as os_rmdir
 from platform import system as platform_system
 from re import compile as re_compile
+from shutil import Error as shutil_Error
 from shutil import copy2 as shutil_copy2
 from shutil import copytree as shutil_copytree
+from shutil import rmtree as shutil_rmtree
 from subprocess import SubprocessError, run
 from typing import Any, Optional, Union
 from zipfile import ZipFile
@@ -47,7 +52,7 @@ from ardupilot_methodic_configurator.backend_filesystem_vehicle_components impor
 TOOLTIP_MAX_LENGTH = 105
 
 
-def is_within_tolerance(x: float, y: float, atol: float = 1e-08, rtol: float = 1e-03) -> bool:
+def is_within_tolerance(x: float, y: float, atol: float = 1e-08, rtol: float = 1e-04) -> bool:
     """
     Determines if the absolute difference between two numbers is within a specified tolerance.
 
@@ -59,7 +64,7 @@ def is_within_tolerance(x: float, y: float, atol: float = 1e-08, rtol: float = 1
       x (float): The first number to compare.
       y (float): The second number to compare.
       atol (float, optional): The absolute tolerance. Default is 1e-08.
-      rtol (float, optional): The relative tolerance. Default is 1e-03.
+      rtol (float, optional): The relative tolerance. Default is 1e-04.
 
     Returns:
       bool: True if the difference is within the tolerance, False otherwise.
@@ -594,11 +599,54 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
                     shutil_copytree(source, dest)
                 else:
                     shutil_copy2(source, dest)
-        except Exception as _e:  # pylint: disable=broad-except
+        except (OSError, shutil_Error) as _e:
             error_msg = _("Error copying template files to new vehicle directory: {_e}")
             return error_msg.format(**locals())
         return ""
 
+    def remove_created_files_and_vehicle_dir(self) -> str:
+        # Remove the created files in the new vehicle directory
+        try:
+            if not os_path.exists(self.vehicle_dir):
+                # Use the actual vehicle_dir value to avoid KeyError from missing format keys
+                error_msg = _("New vehicle directory does not exist: {vehicle_dir}")
+                error_msg = error_msg.format(vehicle_dir=self.vehicle_dir)
+                logging_error(error_msg)
+                return error_msg
+
+            # delete all files in the vehicle directory and delete the vehicle directory
+            errors: list[str] = []
+            for item in os_listdir(self.vehicle_dir):
+                item_path = os_path.join(self.vehicle_dir, item)
+                try:
+                    # If the entry is a symlink, remove the link instead of recursing into the target
+                    if os_path.islink(item_path):
+                        os_remove(item_path)
+                    elif os_path.isdir(item_path):
+                        shutil_rmtree(item_path)
+                    else:
+                        os_remove(item_path)
+                except OSError as e:
+                    logging_exception(_("Error removing %s"), item_path, e)
+                    errors.append(str(e))
+
+            # Try to remove the now-empty vehicle directory
+            try:
+                os_rmdir(self.vehicle_dir)
+            except OSError as e:
+                logging_exception(_("Error removing directory %s"), self.vehicle_dir, e)
+                errors.append(str(e))
+
+            if errors:
+                # Return a combined, localized error message
+                error_msg = _("Error removing created files: {error_list}")
+                return error_msg.format(error_list="; ".join(errors))
+        except OSError as _e:  # filesystem-related errors
+            error_msg = _("Error removing created files: {_e}")
+            logging_exception(_("Error removing created files:"), exc_info=_e)
+            return error_msg.format(**locals())
+        return ""
+
     @staticmethod
     def getcwd() -> str:
         return os_getcwd()

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/backend_flightcontroller.py

@@ -122,6 +122,30 @@ class FlightController:
             logging_debug(_("Did not add empty connection"))
         return False
 
+    def _register_and_try_connect(
+        self,
+        comport: mavutil.SerialPort,
+        progress_callback: Union[None, Callable[[int, int], None]],
+        baudrate: int,
+        log_errors: bool,
+    ) -> str:
+        """
+        Register a device in the connection list (if missing) and attempt connection.
+
+        Returns:
+            str: empty string on success, or error message.
+
+        """
+        # set comport for subsequent calls
+        self.comport = comport
+        # Add the detected port to the list of available connections if it is not there
+        if self.comport and self.comport.device not in [t[0] for t in self.__connection_tuples]:
+            self.__connection_tuples.insert(-1, (self.comport.device, getattr(self.comport, "description", "")))
+        # Try to connect
+        return self.__create_connection_with_retry(
+            progress_callback=progress_callback, baudrate=baudrate, log_errors=log_errors
+        )
+
     def connect(
         self, device: str, progress_callback: Union[None, Callable[[int, int], None]] = None, log_errors: bool = True
     ) -> str:
@@ -130,7 +154,8 @@ class FlightController:
 
         This method attempts to connect to the FlightController using the provided device
         connection string. If no device is specified, it attempts to auto-detect a serial
-        port that matches the preferred ports list. If a device is specified as 'test',
+        port that matches the preferred ports list. If no serial device is found it tries
+        the "standard" ArduPilot UDP and TCP connections. If a device is specified as 'test',
         it sets some test parameters for debugging purposes.
 
         Args:
@@ -150,31 +175,50 @@ class FlightController:
                 return ""
             self.add_connection(device)
             self.comport = mavutil.SerialPort(device=device, description=device)
-        else:
-            autodetect_serial = self.__auto_detect_serial()
-            if autodetect_serial:
-                # Resolve the soft link if it's a Linux system
-                if os_name == "posix":
-                    try:
-                        dev = autodetect_serial[0].device
-                        logging_debug(_("Auto-detected device %s"), dev)
-                        # Get the directory part of the soft link
-                        softlink_dir = os_path.dirname(dev)
-                        # Resolve the soft link and join it with the directory part
-                        resolved_path = os_path.abspath(os_path.join(softlink_dir, os_readlink(dev)))
-                        autodetect_serial[0].device = resolved_path
-                        logging_debug(_("Resolved soft link %s to %s"), dev, resolved_path)
-                    except OSError:
-                        pass  # Not a soft link, proceed with the original device path
-                self.comport = autodetect_serial[0]
-                # Add the detected serial port to the list of available connections if it is not there
-                if self.comport and self.comport.device not in [t[0] for t in self.__connection_tuples]:
-                    self.__connection_tuples.insert(-1, (self.comport.device, getattr(self.comport, "description", "")))
-            else:
-                return _("No serial ports found. Please connect a flight controller and try again.")
-        return self.__create_connection_with_retry(
-            progress_callback=progress_callback, baudrate=self.__baudrate, log_errors=log_errors
-        )
+            return self.__create_connection_with_retry(
+                progress_callback=progress_callback, baudrate=self.__baudrate, log_errors=log_errors
+            )
+
+        # Try to autodetect serial ports
+        autodetect_serial = self.__auto_detect_serial()
+        if autodetect_serial:
+            # Resolve the soft link if it's a Linux system
+            if os_name == "posix":
+                try:
+                    dev = autodetect_serial[0].device
+                    logging_debug(_("Auto-detected device %s"), dev)
+                    # Get the directory part of the soft link
+                    softlink_dir = os_path.dirname(dev)
+                    # Resolve the soft link and join it with the directory part
+                    resolved_path = os_path.abspath(os_path.join(softlink_dir, os_readlink(dev)))
+                    autodetect_serial[0].device = resolved_path
+                    logging_debug(_("Resolved soft link %s to %s"), dev, resolved_path)
+                except OSError:
+                    pass  # Not a soft link, proceed with the original device path
+            err = self._register_and_try_connect(
+                comport=autodetect_serial[0],
+                progress_callback=progress_callback,
+                baudrate=self.__baudrate,
+                log_errors=False,
+            )
+            if err == "":
+                return ""
+
+        # Try to autodetect network ports
+        netports = FlightController.__list_network_ports()
+        for port in netports:
+            # try to connect to each "standard" ArduPilot UDP and TCP ports
+            logging_debug(_("Trying network port %s"), port)
+            err = self._register_and_try_connect(
+                comport=mavutil.SerialPort(device=port, description=port),
+                progress_callback=progress_callback,
+                baudrate=self.__baudrate,
+                log_errors=False,
+            )
+            if err == "":
+                return ""
+
+        return _("No auto-detected ports responded. Please connect a flight controller and try again.")
 
     def __request_banner(self) -> None:
         """Request banner information from the flight controller."""
@@ -840,7 +884,7 @@ class FlightController:
     @staticmethod
     def __list_network_ports() -> list[str]:
         """List all available network ports."""
-        return ["tcp:127.0.0.1:5760", "udp:127.0.0.1:14550"]
+        return ["tcp:127.0.0.1:5760", "udp:0.0.0.0:14550"]
 
     # pylint: disable=duplicate-code
     def __auto_detect_serial(self) -> list[mavutil.SerialPort]:

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/configuration_steps_ArduCopter.json

@@ -668,7 +668,7 @@
             "blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#11-system-identification-for-analytical-pid-optimization-optional",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -686,7 +686,7 @@
             "blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1112-pitch-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -702,7 +702,7 @@
             "blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1113-yaw-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -718,7 +718,7 @@
             "blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduCopter#1114-thrust-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/configuration_steps_ArduPlane.json

@@ -662,7 +662,7 @@
             "blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#11-system-identification-for-analytical-pid-optimization-optional",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -680,7 +680,7 @@
             "blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1112-pitch-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -696,7 +696,7 @@
             "blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1113-yaw-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -712,7 +712,7 @@
             "blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_ArduPlane#1114-thrust-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",

{ardupilot_methodic_configurator-2.0.3/ardupilot_methodic_configurator/vehicle_templates/Heli/OMP_M4 → ardupilot_methodic_configurator-2.0.5/ardupilot_methodic_configurator}/configuration_steps_Heli.json

@@ -661,7 +661,7 @@
             "blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#11-system-identification-for-analytical-pid-optimization-optional",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -679,7 +679,7 @@
             "blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1112-pitch-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -695,7 +695,7 @@
             "blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1113-yaw-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -711,7 +711,7 @@
             "blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Heli#1114-thrust-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/configuration_steps_Rover.json

@@ -662,7 +662,7 @@
             "blog_text": "Configure parameters for the roll axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#11-system-identification-for-analytical-pid-optimization-optional",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -680,7 +680,7 @@
             "blog_text": "Configure parameters for the pitch axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1112-pitch-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -696,7 +696,7 @@
             "blog_text": "Configure parameters for the yaw axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1113-yaw-rate-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",
@@ -712,7 +712,7 @@
             "blog_text": "Configure parameters for the thrust axis system identification to create a mathematical model of the vehicle",
             "blog_url": "https://ardupilot.github.io/MethodicConfigurator/TUNING_GUIDE_Rover#1114-thrust-mathematical-model",
             "wiki_text": "Matlab and Simulink IAV scripts for system identification",
-            "wiki_url": "https://ardupilot.org/copter/docs/systemid-mode-operation.html#identification-of-a-multicopter",
+            "wiki_url": "https://ardupilot.org/copter/docs/systemid-model-development.html#identification-of-a-multicopter",
             "external_tool_text": "ArduCopter Simulink Model",
             "external_tool_url": "https://github.com/ArduPilot/ardupilot/blob/master/Tools/simulink/arducopter/README.md",
             "mandatory_text": "20% mandatory (80% optional)",

{ardupilot_methodic_configurator-2.0.3 → ardupilot_methodic_configurator-2.0.5}/ardupilot_methodic_configurator/data_model_ardupilot_parameter.py

@@ -290,14 +290,30 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
             )
         return ""
 
+    def has_unknown_bits_set(self, value: Optional[int] = None) -> str:
+        """Check if the given value has unknown bits set."""
+        if self.is_bitmask:
+            allowed_mask = 0
+            for k in self.bitmask_dict:
+                allowed_mask |= 1 << int(k)
+
+            new_value = int(self._new_value) if value is None else value
+            if new_value & ~allowed_mask:
+                return _("The value for {param_name} contains unknown bit(s).").format(param_name=self._name)
+        return ""
+
     def fc_value_is_above_limit(self) -> str:
         """Return an error message if the FC value is above the limit for this parameter."""
         return self.is_above_limit(self._fc_value) if self._fc_value is not None else ""
 
     def fc_value_is_below_limit(self) -> str:
-        """Return an error message if the RC value is below the limit for this parameter."""
+        """Return an error message if the FC value is below the limit for this parameter."""
         return self.is_below_limit(self._fc_value) if self._fc_value is not None else ""
 
+    def fc_value_has_unknown_bits_set(self) -> str:
+        """Return an error message if the FC value has unknown bits set."""
+        return self.has_unknown_bits_set(int(self._fc_value)) if self._fc_value is not None else ""
+
     def set_new_value(self, value: str, ignore_out_of_range: bool = False) -> float:  # pylint: disable=too-many-branches
         """
         Set the new parameter value from a UI string input.
@@ -354,14 +370,6 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
                     _("The value for {param_name} must be an integer for bitmask parameters.").format(param_name=self._name)
                 ) from exc
 
-            # ensure no unknown bits are set
-            allowed_mask = 0
-            for k in self.bitmask_dict:
-                allowed_mask |= 1 << int(k)
-
-            if int_value & ~allowed_mask:
-                raise ValueError(_("The value for {param_name} contains unknown bit(s).").format(param_name=self._name))
-
             if int_value == int(self._new_value):
                 raise ParameterUnchangedError(
                     _("The provided bitmask value for {param_name} would not change the parameter.").format(
@@ -369,6 +377,10 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
                     )
                 )
 
+            msg = self.has_unknown_bits_set(int_value)
+            if msg and not ignore_out_of_range:
+                raise ParameterOutOfRangeError(msg)
+
             self._new_value = float(int_value)
             return self._new_value
 
@@ -381,6 +393,13 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         if not isfinite(f) or isnan(f):
             raise ValueError(self.is_invalid_number(f))
 
+        if is_within_tolerance(self._new_value, f):
+            raise ParameterUnchangedError(
+                _(
+                    "The provided numeric value for {param_name} is within tolerance and would not change the parameter."
+                ).format(param_name=self._name)
+            )
+
         msg = self.is_above_limit(f)
         if msg and not ignore_out_of_range:
             raise ParameterOutOfRangeError(msg)
@@ -389,13 +408,6 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         if msg and not ignore_out_of_range:
             raise ParameterOutOfRangeError(msg)
 
-        if is_within_tolerance(self._new_value, f):
-            raise ParameterUnchangedError(
-                _(
-                    "The provided numeric value for {param_name} is within tolerance and would not change the parameter."
-                ).format(param_name=self._name)
-            )
-
         self._new_value = f
         return self._new_value
 
@@ -452,90 +464,3 @@ class BitmaskHelper:
 
         """
         return str(sum(1 << key for key in checked_keys))
-
-
-class ConnectionRenamer:
-    """
-    Utility class to handle renaming parameters based on connection prefixes.
-
-    This captures the logic for renaming parameters when connection types change,
-    particularly handling special cases like CAN bus connections.
-    """
-
-    @staticmethod
-    def generate_renames(parameters: list[str], new_connection_prefix: str) -> dict[str, str]:
-        """
-        Generate a dictionary of parameter renames based on a new connection prefix.
-
-        Args:
-            parameters: List of parameter names to potentially rename
-            new_connection_prefix: The new prefix to apply (like "CAN2")
-
-        Returns:
-            Dictionary mapping old parameter names to new parameter names
-
-        """
-        renames: dict[str, str] = {}
-
-        # Extract the type and number from the new connection prefix
-        if len(new_connection_prefix) < 2:
-            return renames
-
-        new_type = new_connection_prefix[:-1]  # e.g., "CAN" from "CAN2"
-        new_number = new_connection_prefix[-1]  # e.g., "2" from "CAN2"
-
-        for param_name in parameters:
-            new_prefix = new_connection_prefix
-            old_prefix = param_name.split("_")[0]
-            if new_type == "CAN" and "CAN_P" in param_name:
-                old_prefix = param_name.split("_")[0] + "_" + param_name.split("_")[1]
-                new_prefix = "CAN_P" + new_number
-            if new_type == "CAN" and "CAN_D" in param_name:
-                old_prefix = param_name.split("_")[0] + "_" + param_name.split("_")[1]
-                new_prefix = "CAN_D" + new_number
-
-            if new_type in old_prefix:
-                renames[param_name] = param_name.replace(old_prefix, new_prefix)
-
-        return renames
-
-    @staticmethod
-    def apply_renames(
-        parameters: dict[str, Any], new_connection_prefix: str, variables: Optional[dict[str, Any]] = None
-    ) -> tuple[set[str], list[tuple[str, str]]]:
-        """
-        Apply connection prefix renames to a parameter dictionary.
-
-        Args:
-            parameters: Dictionary of parameter objects to rename, it will modify it
-            new_connection_prefix: The new prefix to apply
-            variables: Optional dictionary of variables for evaluation
-
-        Returns:
-            Tuple containing:
-            - Set of duplicated parameter names that got removed
-            - List of (old_name, new_name) pairs that were renamed
-
-        """
-        if variables:
-            # If variables provided, evaluate the new_connection_prefix
-            new_connection_prefix = eval(str(new_connection_prefix), {}, variables)  # noqa: S307 pylint: disable=eval-used
-
-        # Generate the rename mapping
-        renames = ConnectionRenamer.generate_renames(list(parameters.keys()), new_connection_prefix)
-
-        # Track unique new names and actual renames performed
-        new_names = set()
-        duplicates = set()
-        renamed_pairs = []
-        for old_name, new_name in renames.items():
-            if new_name in new_names:
-                parameters.pop(old_name)
-                duplicates.add(old_name)
-            else:
-                new_names.add(new_name)
-                if new_name != old_name:
-                    parameters[new_name] = parameters.pop(old_name)
-                    renamed_pairs.append((old_name, new_name))
-
-        return duplicates, renamed_pairs