PyPI - ardupilot-methodic-configurator - Versions diffs - 1.2.3__tar.gz → 1.3.0__tar.gz - Mend

ardupilot-methodic-configurator 1.2.3tar.gz → 1.3.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of ardupilot-methodic-configurator might be problematic. Click here for more details.

Files changed (1058) hide show

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 1.2.3
+Version: 1.3.0
 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>
@@ -44,14 +44,15 @@ Requires-Dist: jsonschema==4.23.0
 Requires-Dist: matplotlib==3.9.4
 Requires-Dist: numpy==2.0.2
 Requires-Dist: pillow==11.1.0
+Requires-Dist: pip_system_certs==4.0
 Requires-Dist: platformdirs==4.3.6
 Requires-Dist: pymavlink==2.4.43
 Requires-Dist: pyserial==3.5
 Requires-Dist: requests==2.32.3
 Requires-Dist: setuptools==76.0.0
 Provides-Extra: dev
-Requires-Dist: coverage==7.7.0; extra == "dev"
-Requires-Dist: mock==5.1.0; extra == "dev"
+Requires-Dist: coverage==7.7.1; 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"
 Requires-Dist: pyinstaller==6.12.0; extra == "dev"
@@ -62,7 +63,7 @@ Requires-Dist: pytest-cov==6.0.0; extra == "dev"
 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.0; extra == "dev"
+Requires-Dist: ruff==0.11.2; extra == "dev"
 Requires-Dist: types-requests==2.32.0.20250306; extra == "dev"
 Dynamic: license-file
@@ -73,7 +74,7 @@ Dynamic: license-file
 | [![Pylint](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pylint.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pylint.yml) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/720794ed54014c58b9eaf7a097a4e98e)](https://app.codacy.com/gh/amilcarlucas/MethodicConfigurator/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) | [![pytest status](https://gist.githubusercontent.com/amilcarlucas/81b511dc0ff92b8072613d1cd100832e/raw/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml) | [![Known Vulnerabilities](https://snyk.io/test/github/amilcarlucas/MethodicConfigurator/badge.svg)](https://app.snyk.io/org/amilcarlucas/project/c8fd6e29-715b-4949-b828-64eff84f5fe1) |[![pages-build-deployment](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pages/pages-build-deployment) | [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ArduPilot/MethodicConfigurator.svg)](http://isitmaintained.com/project/ArduPilot/MethodicConfigurator) |
 | [![test Python cleanliness](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/ruff.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/ruff.yml) | [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9101/badge)](https://www.bestpractices.dev/projects/9101) | [![Pytest tests](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml) | [![CodeQL](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/github-code-scanning/codeql) | [![Upload MethodicConfigurator Package](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/python-publish.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/python-publish.yml) | [![Percentage of issues still open](http://isitmaintained.com/badge/open/ArduPilot/MethodicConfigurator.svg)](http://isitmaintained.com/project/ArduPilot/MethodicConfigurator) |
 | [![mypy](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/mypy.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/mypy.yml) | [![REUSE status](https://api.reuse.software/badge/github.com/ArduPilot/MethodicConfigurator)](https://api.reuse.software/info/github.com/ArduPilot/MethodicConfigurator) | [![Coverage Status](https://coveralls.io/repos/github/ArduPilot/MethodicConfigurator/badge.svg?branch=master)](https://coveralls.io/github/ArduPilot/MethodicConfigurator?branch=master) | [![gitavscan](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/gitavscan.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/gitavscan.yml) | [![pypi](https://img.shields.io/pypi/v/ardupilot-methodic-configurator.svg)](https://pypi.org/project/ardupilot-methodic-configurator/) | [![python versions](https://img.shields.io/pypi/pyversions/ardupilot-methodic-configurator.svg)](https://pypi.python.org/pypi/ardupilot-methodic-configurator) |
-| [![Pyright](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml) | [![md-link-check](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/30346/badge.svg)](https://scan.coverity.com/projects/ardupilot-methodic-configurator) | [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ArduPilot/MethodicConfigurator/badge)](https://scorecard.dev/viewer/?uri=github.com/ArduPilot/MethodicConfigurator) | ![PyPI - Downloads](https://img.shields.io/pypi/dm/ardupilot-methodic-configurator?link=https%3A%2F%2Fpypi.org%2Fproject%2Fardupilot-methodic-configurator%2F) | [![Code Climate](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator.png)](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator) |
+| [![Pyright](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml) | [![md-link-check](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/30346/badge.svg)](https://scan.coverity.com/projects/ardupilot-methodic-configurator) | [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ArduPilot/MethodicConfigurator/badge)](https://scorecard.dev/viewer/?uri=github.com/ArduPilot/MethodicConfigurator) | [![PyPI - Downloads](https://img.shields.io/pypi/dm/ardupilot-methodic-configurator?link=https%3A%2F%2Fpypi.org%2Fproject%2Fardupilot-methodic-configurator%2F)](https://pypistats.org/packages/ardupilot-methodic-configurator) | [![Code Climate](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator.png)](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator) |
 | [![markdown-lint](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-lint.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-lint.yml) | | [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.com/channels/674039678562861068/1308233496535371856) | | [![Windows Build](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/windows_build.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/windows_build.yml) | [![Update Flight Controller IDs](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/update_flightcontroller_ids.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/update_flightcontroller_ids.yml) |
 *ArduPilot Methodic Configurator* is a software, developed by ArduPilot developers, that semi-automates a
@@ -98,13 +99,13 @@ Let's compare it with the traditional tool used to configure ArduPilot: a genera
 | full automatic configuration | No | No |
 | configuration type | manual [^1]  | semi-automated [^2] |
 | explains what to do | No | Yes  |
-| explains when to do something | No, leaves you lost | Yes, explains the path |
+| explains when to do something | No | Yes, explains the path |
 | explains why do something | No | Yes |
 | configuration method | a different menu for each task, some tasks have no menu, so you need to dig into the 1200 parameters | each task only presents you a relevant subset of parameters |
 | parameter documentation | Yes, only on the full-parameter tree view | Yes |
 | displays relevant documentation | No | Yes |
 | makes sure you do not forget a step | No | Yes |
-| checks that parameters get correctly uploaded | No | Yes |
+| checks that parameters get correctly uploaded | No (MP), unsure (QGCS), yes (MAVProxy) | Yes |
 | reuse params in other vehicles | No, unless you hand edit files | Yes, out-of-the-box |
 | documents why you changed each parameter | No | Yes |
 | tutorials and learning resources | No, scattered and not integrated | Yes, context-aware help integrated |

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/README.md RENAMED Viewed

@@ -5,7 +5,7 @@
 | [![Pylint](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pylint.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pylint.yml) | [![Codacy Badge](https://app.codacy.com/project/badge/Grade/720794ed54014c58b9eaf7a097a4e98e)](https://app.codacy.com/gh/amilcarlucas/MethodicConfigurator/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) | [![pytest status](https://gist.githubusercontent.com/amilcarlucas/81b511dc0ff92b8072613d1cd100832e/raw/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml) | [![Known Vulnerabilities](https://snyk.io/test/github/amilcarlucas/MethodicConfigurator/badge.svg)](https://app.snyk.io/org/amilcarlucas/project/c8fd6e29-715b-4949-b828-64eff84f5fe1) |[![pages-build-deployment](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pages/pages-build-deployment) | [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ArduPilot/MethodicConfigurator.svg)](http://isitmaintained.com/project/ArduPilot/MethodicConfigurator) |
 | [![test Python cleanliness](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/ruff.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/ruff.yml) | [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9101/badge)](https://www.bestpractices.dev/projects/9101) | [![Pytest tests](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pytest.yml) | [![CodeQL](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/github-code-scanning/codeql/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/github-code-scanning/codeql) | [![Upload MethodicConfigurator Package](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/python-publish.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/python-publish.yml) | [![Percentage of issues still open](http://isitmaintained.com/badge/open/ArduPilot/MethodicConfigurator.svg)](http://isitmaintained.com/project/ArduPilot/MethodicConfigurator) |
 | [![mypy](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/mypy.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/mypy.yml) | [![REUSE status](https://api.reuse.software/badge/github.com/ArduPilot/MethodicConfigurator)](https://api.reuse.software/info/github.com/ArduPilot/MethodicConfigurator) | [![Coverage Status](https://coveralls.io/repos/github/ArduPilot/MethodicConfigurator/badge.svg?branch=master)](https://coveralls.io/github/ArduPilot/MethodicConfigurator?branch=master) | [![gitavscan](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/gitavscan.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/gitavscan.yml) | [![pypi](https://img.shields.io/pypi/v/ardupilot-methodic-configurator.svg)](https://pypi.org/project/ardupilot-methodic-configurator/) | [![python versions](https://img.shields.io/pypi/pyversions/ardupilot-methodic-configurator.svg)](https://pypi.python.org/pypi/ardupilot-methodic-configurator) |
-| [![Pyright](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml) | [![md-link-check](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/30346/badge.svg)](https://scan.coverity.com/projects/ardupilot-methodic-configurator) | [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ArduPilot/MethodicConfigurator/badge)](https://scorecard.dev/viewer/?uri=github.com/ArduPilot/MethodicConfigurator) | ![PyPI - Downloads](https://img.shields.io/pypi/dm/ardupilot-methodic-configurator?link=https%3A%2F%2Fpypi.org%2Fproject%2Fardupilot-methodic-configurator%2F) | [![Code Climate](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator.png)](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator) |
+| [![Pyright](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/pyright.yml) | [![md-link-check](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-link-check.yml) | [![Coverity Scan Build Status](https://scan.coverity.com/projects/30346/badge.svg)](https://scan.coverity.com/projects/ardupilot-methodic-configurator) | [![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/ArduPilot/MethodicConfigurator/badge)](https://scorecard.dev/viewer/?uri=github.com/ArduPilot/MethodicConfigurator) | [![PyPI - Downloads](https://img.shields.io/pypi/dm/ardupilot-methodic-configurator?link=https%3A%2F%2Fpypi.org%2Fproject%2Fardupilot-methodic-configurator%2F)](https://pypistats.org/packages/ardupilot-methodic-configurator) | [![Code Climate](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator.png)](https://codeclimate.com/github/amilcarlucas/MethodicConfigurator) |
 | [![markdown-lint](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-lint.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/markdown-lint.yml) | | [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?logo=discord&logoColor=white)](https://discord.com/channels/674039678562861068/1308233496535371856) | | [![Windows Build](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/windows_build.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/windows_build.yml) | [![Update Flight Controller IDs](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/update_flightcontroller_ids.yml/badge.svg)](https://github.com/ArduPilot/MethodicConfigurator/actions/workflows/update_flightcontroller_ids.yml) |
 *ArduPilot Methodic Configurator* is a software, developed by ArduPilot developers, that semi-automates a
@@ -30,13 +30,13 @@ Let's compare it with the traditional tool used to configure ArduPilot: a genera
 | full automatic configuration | No | No |
 | configuration type | manual [^1]  | semi-automated [^2] |
 | explains what to do | No | Yes  |
-| explains when to do something | No, leaves you lost | Yes, explains the path |
+| explains when to do something | No | Yes, explains the path |
 | explains why do something | No | Yes |
 | configuration method | a different menu for each task, some tasks have no menu, so you need to dig into the 1200 parameters | each task only presents you a relevant subset of parameters |
 | parameter documentation | Yes, only on the full-parameter tree view | Yes |
 | displays relevant documentation | No | Yes |
 | makes sure you do not forget a step | No | Yes |
-| checks that parameters get correctly uploaded | No | Yes |
+| checks that parameters get correctly uploaded | No (MP), unsure (QGCS), yes (MAVProxy) | Yes |
 | reuse params in other vehicles | No, unless you hand edit files | Yes, out-of-the-box |
 | documents why you changed each parameter | No | Yes |
 | tutorials and learning resources | No, scattered and not integrated | Yes, context-aware help integrated |

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/__init__.py RENAMED Viewed

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

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/__main__.py RENAMED Viewed

@@ -34,6 +34,7 @@ from ardupilot_methodic_configurator import _, __version__
 from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
 from ardupilot_methodic_configurator.backend_flightcontroller import FlightController
+from ardupilot_methodic_configurator.backend_internet import verify_and_open_url
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
 from ardupilot_methodic_configurator.frontend_tkinter_component_editor import ComponentEditorWindow
 from ardupilot_methodic_configurator.frontend_tkinter_connection_selection import ConnectionSelectionWindow
@@ -128,11 +129,16 @@ def component_editor(
         and flight_controller.info.firmware_type != _("Unknown")
         and flight_controller.info.firmware_type != ""
     ):
-        url = (
-            "https://github.com/ArduPilot/ardupilot/blob/master/libraries/AP_HAL_ChibiOS/hwdef/"
-            f"{flight_controller.info.firmware_type}/README.md"
-        )
-        webbrowser_open(url=url, new=0, autoraise=True)
+        firmware_type = flight_controller.info.firmware_type
+        url = f"https://github.com/ArduPilot/ardupilot/blob/master/libraries/AP_HAL_ChibiOS/hwdef/{firmware_type}/README.md"
+        url_found = verify_and_open_url(url)
+        if not url_found and firmware_type.endswith("-bdshot"):
+            firmware_type = firmware_type[:-7]
+            url = (
+                f"https://github.com/ArduPilot/ardupilot/blob/master/libraries/AP_HAL_ChibiOS/hwdef/{firmware_type}/README.md"
+            )
+            url_found = verify_and_open_url(url)
     component_editor_window.root.mainloop()
     source_param_values: Union[dict[str, float], None] = (
@@ -184,7 +190,11 @@ def main() -> None:
     try:
         local_filesystem = LocalFilesystem(
-            args.vehicle_dir, vehicle_type, flight_controller.info.flight_sw_version, args.allow_editing_template_files
+            args.vehicle_dir,
+            vehicle_type,
+            flight_controller.info.flight_sw_version,
+            args.allow_editing_template_files,
+            args.save_component_to_system_templates,
         )
     except SystemExit as exp:
         show_error_message(_("Fatal error reading parameter files"), f"{exp}")

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/annotate_params.py RENAMED Viewed

@@ -727,8 +727,6 @@ def update_parameter_documentation_file(  # pylint: disable=too-many-locals, too
     delete_documentation_annotations: bool,
 ) -> None:
     new_lines = []
-    if os_path.basename(param_file).endswith("16_pid_adjustment.param"):
-        new_lines.extend(lines[0:5])  # copy the first 6 lines verbatim
     total_params = 0
     documented_params = 0

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/backend_filesystem.py RENAMED Viewed

@@ -85,9 +85,16 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
     """
-    def __init__(self, vehicle_dir: str, vehicle_type: str, fw_version: str, allow_editing_template_files: bool) -> None:
+    def __init__(  # pylint: disable=too-many-arguments, too-many-positional-arguments
+        self,
+        vehicle_dir: str,
+        vehicle_type: str,
+        fw_version: str,
+        allow_editing_template_files: bool,
+        save_component_to_system_templates: bool,
+    ) -> None:
         self.file_parameters: dict[str, dict[str, Par]] = {}
-        VehicleComponents.__init__(self)
+        VehicleComponents.__init__(self, save_component_to_system_templates)
         ConfigurationSteps.__init__(self, vehicle_dir, vehicle_type)
         ProgramSettings.__init__(self)
         self.vehicle_type = vehicle_type
@@ -208,7 +215,15 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
                 try:
                     param_info["Values"] = {int(k): v for k, v in param_info["values"].items()}
                 except ValueError:
-                    param_info["Values"] = {float(k): v for k, v in param_info["values"].items()}
+                    try:
+                        param_info["Values"] = {float(k): v for k, v in param_info["values"].items()}
+                    except ValueError:
+                        logging_warning(_("Could not convert values to int or float for %s"), param_name)
+                        logging_warning(
+                            _("Parameter %s has invalid metadata. Please file a bug at %s"),
+                            param_name,
+                            "https://github.com/ArduPilot/ardupilot/issues",
+                        )
                 # print(param_info['Values'])
             prefix_parts = [
@@ -651,7 +666,9 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
                 if error_msg:
                     return error_msg
                 self.merge_forced_or_derived_parameters(param_filename, self.derived_parameters, existing_fc_params)
-            Par.export_to_param(Par.format_params(param_dict), os_path.join(self.vehicle_dir, param_filename))
+            self.export_to_param(
+                param_dict, param_filename, annotate_doc=bool(ProgramSettings.get_setting("annotate_docs_into_param_files"))
+            )
         return ""
     def merge_forced_or_derived_parameters(
@@ -781,4 +798,13 @@ class LocalFilesystem(VehicleComponents, ConfigurationSteps, ProgramSettings):
                 "Default is %(default)s"
             ),
         )
+        parser.add_argument(
+            "--save-component-to-system-templates",
+            action="store_true",
+            help=_(
+                "Save the vehicle component to the system templates. "
+                "Only for software developers that know what they are doing. "
+                "Default is %(default)s"
+            ),
+        )
         return parser

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/backend_filesystem_vehicle_components.py RENAMED Viewed

@@ -17,6 +17,7 @@ from json import load as json_load
 from logging import debug as logging_debug
 from logging import error as logging_error
 from logging import info as logging_info
+from os import makedirs as os_makedirs
 from os import path as os_path
 from os import walk as os_walk
 from re import match as re_match
@@ -35,11 +36,12 @@ class VehicleComponents:
     vehicle components configurations from a JSON file.
     """
-    def __init__(self) -> None:
+    def __init__(self, save_component_to_system_templates: bool = False) -> None:
         self.vehicle_components_json_filename = "vehicle_components.json"
         self.vehicle_components_schema_filename = "vehicle_components_schema.json"
         self.vehicle_components: Union[None, dict[Any, Any]] = None
         self.schema: Union[None, dict[Any, Any]] = None
+        self.save_component_to_system_templates = save_component_to_system_templates
     def load_schema(self) -> dict:
         """
@@ -77,6 +79,205 @@ class VehicleComponents:
             logging_error(_("Error decoding JSON schema from file '%s'."), schema_path)
         return {}
+    def load_component_templates(self) -> dict[str, list[dict]]:
+        """
+        Load component templates from both system and user templates directories.
+        User templates take precedence over system templates.
+        :return: The merged templates as a dictionary
+        """
+        # Load system templates (read-only, comes with software)
+        system_templates = self._load_system_templates()
+        # Load user templates (user-editable)
+        user_templates = self._load_user_templates()
+        # Merge templates, with user templates taking precedence
+        merged_templates = system_templates.copy()
+        for component_name, templates in user_templates.items():
+            if component_name not in merged_templates:
+                merged_templates[component_name] = []
+            # Add each user template, replacing system templates with the same name
+            for user_template in templates:
+                template_name = user_template.get("name")
+                if template_name:
+                    # Add a flag to mark this as a user template
+                    user_template["is_user_modified"] = True
+                    # Find index of system template with same name, if any
+                    replaced = False
+                    for i, template in enumerate(merged_templates.get(component_name, [])):
+                        if template.get("name") == template_name:
+                            merged_templates[component_name][i] = user_template
+                            replaced = True
+                            break
+                    if not replaced:
+                        merged_templates.setdefault(component_name, []).append(user_template)
+        return merged_templates
+    def _load_system_templates(self) -> dict[str, list[dict]]:
+        """
+        Load system component templates.
+        :return: The system component templates as a dictionary
+        """
+        templates_filename = "system_vehicle_components_template.json"
+        templates_dir = ProgramSettings.get_templates_base_dir()
+        filepath = os_path.join(templates_dir, templates_filename)
+        templates = {}
+        try:
+            with open(filepath, encoding="utf-8") as file:
+                templates = json_load(file)
+        except FileNotFoundError:
+            logging_debug(_("System component templates file '%s' not found."), filepath)
+        except JSONDecodeError:
+            logging_error(_("Error decoding JSON system component templates from file '%s'."), filepath)
+        return templates
+    def _load_user_templates(self) -> dict[str, list[dict]]:
+        """
+        Load user component templates.
+        :return: The user component templates as a dictionary
+        """
+        templates_filename = "user_vehicle_components_template.json"
+        templates_dir = ProgramSettings.get_templates_base_dir()
+        filepath = os_path.join(templates_dir, templates_filename)
+        templates = {}
+        try:
+            with open(filepath, encoding="utf-8") as file:
+                templates = json_load(file)
+        except FileNotFoundError:
+            logging_debug(_("User component templates file '%s' not found."), filepath)
+        except JSONDecodeError:
+            logging_error(_("Error decoding JSON user component templates from file '%s'."), filepath)
+        return templates
+    def save_component_templates(self, templates: dict) -> tuple[bool, str]:  # pylint: disable=too-many-branches
+        """
+        Save component templates.
+        For user templates: Only save templates that are user-modified or not present in system templates.
+        For system templates: Merge with existing system templates, adding new ones.
+        :param templates: The templates to save
+        :return: A tuple of (error_occurred, error_message)
+        """
+        # Load system templates to compare against
+        system_templates = self._load_system_templates()
+        # Determine which templates need to be saved to user file
+        templates_to_save: dict[str, list[dict[str, Any]]] = {}
+        if self.save_component_to_system_templates:
+            # For system templates, start with existing system templates
+            templates_to_save = system_templates.copy()
+            # Then add new templates that don't exist yet
+            for component_name, component_templates in templates.items():
+                if component_name not in templates_to_save:
+                    templates_to_save[component_name] = []
+                # Create a mapping of existing template names for this component
+                existing_template_names = {t.get("name"): True for t in templates_to_save[component_name]}
+                for template in component_templates:
+                    template_name = template.get("name")
+                    if not template_name:
+                        continue
+                    # Only add if it doesn't exist in system templates yet
+                    if template_name not in existing_template_names:
+                        template_copy = template.copy()
+                        if "is_user_modified" in template_copy:
+                            del template_copy["is_user_modified"]
+                        templates_to_save[component_name].append(template_copy)
+                        existing_template_names[template_name] = True
+        else:
+            for component_name, component_templates in templates.items():
+                templates_to_save[component_name] = []
+                # Create a mapping of system template names for this component
+                if component_name in system_templates:
+                    system_template_names = {t.get("name"): t for t in system_templates.get(component_name, [])}
+                else:
+                    system_template_names = {}
+                for template in component_templates:
+                    template_name = template.get("name")
+                    if not template_name:
+                        continue
+                    # If the template is marked as user-modified, save it
+                    if template.get("is_user_modified", False):
+                        # Remove the flag before saving
+                        template_copy = template.copy()
+                        if "is_user_modified" in template_copy:
+                            del template_copy["is_user_modified"]
+                        templates_to_save[component_name].append(template_copy)
+                        continue
+                    # If the template exists in system templates, check if it's different
+                    if template_name in system_template_names:
+                        system_template = system_template_names[template_name]
+                        # Deep comparison of data section
+                        if template.get("data") != system_template.get("data"):
+                            # Template is modified from system version
+                            template_copy = template.copy()
+                            templates_to_save[component_name].append(template_copy)
+                    else:
+                        # Template doesn't exist in system templates, so it's user-added
+                        templates_to_save[component_name].append(template.copy())
+                # Remove empty component entries
+                if not templates_to_save[component_name]:
+                    del templates_to_save[component_name]
+        return self.save_component_templates_to_file(templates_to_save)
+    def save_component_templates_to_file(self, templates_to_save: dict[str, list[dict[str, Any]]]) -> tuple[bool, str]:
+        if self.save_component_to_system_templates:
+            # Save to system templates file
+            templates_filename = "system_vehicle_components_template.json"
+        else:
+            # Save to user templates file
+            templates_filename = "user_vehicle_components_template.json"
+        templates_dir = ProgramSettings.get_templates_base_dir()
+        # Create the directory if it doesn't exist
+        try:
+            os_makedirs(templates_dir, exist_ok=True)
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            msg = _("Failed to create templates directory '{}': {}").format(templates_dir, str(e))
+            logging_error(msg)
+            return True, msg
+        # Now create the file path and write to it
+        filepath = os_path.join(templates_dir, templates_filename)
+        try:
+            with open(filepath, "w", encoding="utf-8") as file:
+                json_dump(templates_to_save, file, indent=4)
+            return False, ""  # Success
+        except FileNotFoundError:
+            msg = _("File not found when writing to '{}': {}").format(filepath, _("Path not found"))
+            logging_error(msg)
+        except PermissionError:
+            msg = _("Permission denied when writing to file '{}'").format(filepath)
+            logging_error(msg)
+        except OSError as e:
+            msg = _("OS error when writing to file '{}': {}").format(filepath, str(e))
+            logging_error(msg)
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            msg = _("Unexpected error saving templates to file '{}': {}").format(filepath, str(e))
+            logging_error(msg)
+        return True, msg
     def validate_vehicle_components(self, data: dict) -> tuple[bool, str]:
         """
         Validate vehicle components data against the schema.
@@ -294,21 +495,23 @@ class VehicleComponents:
             logging_error(msg)
             return ("", False)
+    def _get_component_schema_property_description(self, component_info: dict[str, Any]) -> tuple[str, bool]:
+        """Get description and optional status from a component schema property."""
+        description = component_info.get("description", "")
+        is_optional = component_info.get("x-is-optional", False)
+        return (description, is_optional)
     def _get_top_level_component_description(self, current_schema: dict[str, Any], component_type: str) -> tuple[str, bool]:
         """Get description for top-level components like 'Flight Controller'."""
         if component_type in current_schema.get("properties", {}):
-            description = current_schema["properties"][component_type].get("description", "")
-            is_optional = current_schema["properties"][component_type].get("x-is-optional", False)
-            return (description, is_optional)
+            return self._get_component_schema_property_description(current_schema["properties"][component_type])
         return ("", False)
     def _get_product_field_description(self, field_name: str) -> tuple[str, bool]:
         """Get description for product fields (Manufacturer, Model, etc.)."""
         product_def = self.schema.get("definitions", {}).get("product", {})  # type: ignore[union-attr]
         if "properties" in product_def and field_name in product_def["properties"]:
-            description = product_def["properties"][field_name].get("description", "")
-            is_optional = product_def["properties"][field_name].get("x-is-optional", False)
-            return (description, is_optional)
+            return self._get_component_schema_property_description(product_def["properties"][field_name])
         return ("", False)
     def _get_nested_property_description(self, current_schema: dict[str, Any], path: tuple[str, ...]) -> tuple[str, bool]:
@@ -346,9 +549,7 @@ class VehicleComponents:
         """Get description for section fields like Product, Firmware, etc."""
         # First check in direct properties
         if "properties" in current and section in current["properties"]:
-            description = current["properties"][section].get("description", "")
-            is_optional = current["properties"][section].get("x-is-optional", False)
-            return (description, is_optional)
+            return self._get_component_schema_property_description(current["properties"][section])
         # Then check in allOf constructs
         if "allOf" in current:
@@ -358,15 +559,11 @@ class VehicleComponents:
                     ref_obj = self._resolve_schema_reference(allof_item)
                     if "properties" in ref_obj and section in ref_obj["properties"]:
-                        description = ref_obj["properties"][section].get("description", "")
-                        is_optional = ref_obj["properties"][section].get("x-is-optional", False)
-                        return (description, is_optional)
+                        return self._get_component_schema_property_description(ref_obj["properties"][section])
                 # Direct properties check in this allOf item
                 elif "properties" in allof_item and section in allof_item["properties"]:
-                    description = allof_item["properties"][section].get("description", "")
-                    is_optional = allof_item["properties"][section].get("x-is-optional", False)
-                    return (description, is_optional)
+                    return self._get_component_schema_property_description(allof_item["properties"][section])
         # If not found, return empty with default optional status
         return ("", False)
@@ -391,9 +588,7 @@ class VehicleComponents:
             current = self._resolve_schema_reference(current)
         # Return the description and optional status of the final object
-        description = current.get("description", "")
-        is_optional = current.get("x-is-optional", False)
-        return (description, is_optional)
+        return self._get_component_schema_property_description(current)
     def _check_direct_properties(self, schema_obj: dict[str, Any], property_name: str) -> tuple[bool, dict]:
         """Check if property exists directly in schema's properties."""

{ardupilot_methodic_configurator-1.2.3 → ardupilot_methodic_configurator-1.3.0}/ardupilot_methodic_configurator/backend_internet.py RENAMED Viewed

@@ -12,10 +12,12 @@ import os
 import subprocess
 import tempfile
 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 typing import Any, Callable, Optional
 from urllib.parse import urljoin
+from webbrowser import open as webbrowser_open
 from requests import HTTPError as requests_HTTPError
 from requests import RequestException as requests_RequestException
@@ -195,3 +197,49 @@ def download_and_install_pip_release(progress_callback: Optional[Callable[[float
         progress_callback(100.0, _("Download complete"))
     return ret
+def verify_and_open_url(url: str) -> bool:
+    """
+    Verify if a URL is accessible and open it in the default web browser if successful.
+    Args:
+        url: The URL to verify and open
+    Returns:
+        bool: True if the URL was found and opened, False otherwise
+    """
+    if not url:
+        logging_error(_("URL not provided."))
+        return False
+    logging_debug(_("Verifying URL: %s"), url)
+    url_found: bool = False
+    try:
+        # Get proxy settings from environment variables
+        proxies_dict = {
+            "http": os.environ.get("HTTP_PROXY") or os.environ.get("http_proxy"),
+            "https": os.environ.get("HTTPS_PROXY") or os.environ.get("https_proxy"),
+            "no_proxy": os.environ.get("NO_PROXY") or os.environ.get("no_proxy"),
+        }
+        # Remove None values
+        proxies = {k: v for k, v in proxies_dict.items() if v is not None}
+        # Use requests.get with allow_redirects to handle HTTP redirects properly
+        response = requests_get(url, timeout=5, stream=True, allow_redirects=True, proxies=proxies, verify=True)
+        url_found = response.status_code == 200
+    except (requests_RequestException, requests_Timeout) as e:
+        logging_error(_("Failed to access URL: %s. Error: %s"), url, str(e))
+        url_found = False
+    if url_found:
+        try:
+            logging_info(_("Opening URL in browser: %s"), url)
+            webbrowser_open(url=url, new=0, autoraise=True)
+        except Exception as e:  # pylint: disable=broad-exception-caught
+            logging_error(_("Failed to open URL in browser: %s"), str(e))
+            url_found = False
+    return url_found

ardupilot_methodic_configurator-1.2.3/ardupilot_methodic_configurator/frontend_tkinter_base.py → ardupilot_methodic_configurator-1.3.0/ardupilot_methodic_configurator/frontend_tkinter_base_window.py RENAMED Viewed

@@ -16,7 +16,7 @@ import tkinter as tk
 # from logging import info as logging_info
 from logging import error as logging_error
 from tkinter import ttk
-from typing import Optional
+from typing import Optional, Union
 from PIL import Image, ImageTk
@@ -33,11 +33,12 @@ class BaseWindow:
     creating a progress window and centering a window on its parent.
     """
-    def __init__(self, root_tk: Optional[tk.Toplevel] = None) -> None:
+    def __init__(self, root_tk: Optional[tk.Tk] = None) -> None:
+        self.root: Union[tk.Toplevel, tk.Tk]
         if root_tk:
             self.root = tk.Toplevel(root_tk)
         else:
-            self.root = tk.Tk()  # type: ignore[assignment]
+            self.root = tk.Tk()
             # Set the application icon for the window and all child windows
             # https://pythonassets.com/posts/window-icon-in-tk-tkinter/
             self.root.iconphoto(True, tk.PhotoImage(file=LocalFilesystem.application_icon_filepath()))  # noqa: FBT003
@@ -51,13 +52,13 @@ class BaseWindow:
         self.main_frame.pack(expand=True, fill=tk.BOTH)
     @staticmethod
-    def center_window(window: tk.Toplevel, parent: tk.Toplevel) -> None:
+    def center_window(window: Union[tk.Toplevel, tk.Tk], parent: Union[tk.Toplevel, tk.Tk]) -> None:
         """
         Center a window on its parent window.
         Args:
-            window (tk.Toplevel): The window to center.
-            parent (tk.Toplevel): The parent window.
+            window (tk.Toplevel|tk.Tk): The window to center.
+            parent (tk.Toplevel|tk.Tk): The parent window.
         """
         window.update_idletasks()

ardupilot-methodic-configurator 1.2.3__tar.gz → 1.3.0__tar.gz

Potentially problematic release.

ardupilot-methodic-configurator 1.2.3tar.gz → 1.3.0tar.gz