ardupilot-methodic-configurator 2.6.1__py3-none-any.whl → 2.7.1__py3-none-any.whl

ardupilot_methodic_configurator/backend_filesystem_program_settings.py

@@ -1,7 +1,7 @@
 """
 Manages program settings at the filesystem level.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 
@@ -9,7 +9,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 """
 
 # from sys import exit as sys_exit
-import glob
+from contextlib import suppress as contextlib_suppress
+from glob import glob as glob_glob
 from importlib.resources import files as importlib_files
 from json import dump as json_dump
 from json import load as json_load
@@ -108,8 +109,18 @@ class ProgramSettings:
 
     @staticmethod
     def application_icon_filepath() -> str:
-        package_path = importlib_files("ardupilot_methodic_configurator")
-        return str(package_path / "images" / "ArduPilot_icon.png")
+        """Get the application icon path, with fallback options."""
+        try:
+            package_path = importlib_files("ardupilot_methodic_configurator")
+        except (ImportError, FileNotFoundError):
+            # Fallback: try to find icon relative to the script
+            package_path = Path(os_path.dirname(os_path.abspath(__file__)))
+
+        icon_path = str(package_path / "images" / "ArduPilot_icon.png")
+        if os_path.exists(icon_path):
+            return icon_path
+        # If no icon found, return empty string (GUI will handle the error)
+        return ""
 
     @staticmethod
     def application_logo_filepath() -> str:
@@ -152,9 +163,12 @@ class ProgramSettings:
     @staticmethod
     def _user_config_dir() -> str:
         user_config_directory = user_config_dir(
-            ".ardupilot_methodic_configurator", appauthor=False, roaming=True, ensure_exists=True
+            ".ardupilot_methodic_configurator", appauthor=False, roaming=True, ensure_exists=False
         )
 
+        if not os_path.exists(user_config_directory):
+            os_makedirs(user_config_directory, exist_ok=True)
+
         if not os_path.exists(user_config_directory):
             error_msg = _("The user configuration directory '{user_config_directory}' does not exist.")
             raise FileNotFoundError(error_msg.format(**locals()))
@@ -167,9 +181,13 @@ class ProgramSettings:
     @staticmethod
     def _site_config_dir() -> str:
         site_config_directory = site_config_dir(
-            ".ardupilot_methodic_configurator", appauthor=False, version=None, multipath=False, ensure_exists=True
+            ".ardupilot_methodic_configurator", appauthor=False, version=None, multipath=False, ensure_exists=False
         )
 
+        if not os_path.exists(site_config_directory):
+            with contextlib_suppress(OSError):
+                os_makedirs(site_config_directory, exist_ok=True)
+
         if not os_path.exists(site_config_directory):
             error_msg = _("The site configuration directory '{site_config_directory}' does not exist.")
             raise FileNotFoundError(error_msg.format(**locals()))
@@ -189,7 +207,7 @@ class ProgramSettings:
 
         """
         try:
-            with open(settings_path, encoding="utf-8") as settings_file:
+            with open(settings_path, encoding="utf-8-sig") as settings_file:
                 loaded_settings: dict[str, Any] = json_load(settings_file)
                 return loaded_settings
         except FileNotFoundError:
@@ -365,7 +383,7 @@ class ProgramSettings:
         filename = f"m_{frame_class:02d}_{frame_type:02d}_*.png"
 
         # Search for matching PNG file (since exact naming varies)
-        matching_files = glob.glob(str(images_dir / filename))
+        matching_files = glob_glob(str(images_dir / filename))
 
         err_msg = (
             ""

ardupilot_methodic_configurator/backend_filesystem_vehicle_components.py

@@ -1,7 +1,7 @@
 """
 Manages vehicle components at the filesystem level.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 
@@ -99,7 +99,7 @@ class VehicleComponents:
 
         templates = {}
         try:
-            with open(filepath, encoding="utf-8") as file:
+            with open(filepath, encoding="utf-8-sig") as file:
                 templates = json_load(file)
         except FileNotFoundError:
             logging_debug(_("System component templates file '%s' not found."), filepath)
@@ -119,7 +119,7 @@ class VehicleComponents:
 
         templates = {}
         try:
-            with open(filepath, encoding="utf-8") as file:
+            with open(filepath, encoding="utf-8-sig") as file:
                 templates = json_load(file)
         except FileNotFoundError:
             logging_debug(_("User component templates file '%s' not found."), filepath)

ardupilot_methodic_configurator/backend_flightcontroller.py

@@ -1,7 +1,7 @@
 """
 Flight controller interface.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 
@@ -234,7 +234,7 @@ class FlightController:  # pylint: disable=too-many-public-methods,too-many-inst
                 except OSError:
                     pass  # Not a soft link, proceed with the original device path
             err = self._register_and_try_connect(
-                comport=autodetect_serial[0],
+                comport=autodetect_serial[-1],
                 progress_callback=progress_callback,
                 baudrate=connection_baudrate,
                 log_errors=False,
@@ -408,7 +408,7 @@ class FlightController:  # pylint: disable=too-many-public-methods,too-many-inst
             logging_error(error_msg)
             return False, error_msg
 
-    def __create_connection_with_retry(  # pylint: disable=too-many-arguments, too-many-positional-arguments
+    def __create_connection_with_retry(  # pylint: disable=too-many-arguments, too-many-positional-arguments, too-many-locals, too-many-branches
         self,
         progress_callback: Union[None, Callable[[int, int], None]],
         retries: int = 3,
@@ -452,29 +452,45 @@ class FlightController:  # pylint: disable=too-many-public-methods,too-many-inst
                 retries=retries,
                 progress_callback=progress_callback,
             )
-            logging_debug(_("Waiting for MAVLink heartbeat"))
+            logging_debug(_("Waiting for MAVLink heartbeats..."))
             if not self.master:
                 msg = f"Failed to create mavlink connect to {self.comport.device}"
                 raise ConnectionError(msg)
-            m = self.master.wait_heartbeat(timeout=timeout)
-            if m is None:
+            # --- NEW: collect all vehicles detected within timeout ---
+            start_time = time_time()
+            detected_vehicles = {}  # (sysid, compid) -> last HEARTBEAT
+
+            while time_time() - start_time < timeout:
+                m = self.master.recv_match(type="HEARTBEAT", blocking=False)
+                if m is None:
+                    time_sleep(0.1)
+                    continue
+                sysid = m.get_srcSystem()
+                compid = m.get_srcComponent()
+                detected_vehicles[(sysid, compid)] = m
+                logging_debug(_("Detected vehicle %u:%u (autopilot=%u, type=%u)"), sysid, compid, m.autopilot, m.type)
+
+            if not detected_vehicles:
                 return _("No MAVLink heartbeat received, connection failed.")
-            self.info.set_system_id_and_component_id(m.get_srcSystem(), m.get_srcComponent())
-            logging_debug(
-                _("Connection established with systemID %d, componentID %d."), self.info.system_id, self.info.component_id
-            )
 
-            self.info.set_autopilot(m.autopilot)
-            if self.info.is_supported:
-                msg = _("Autopilot type {self.info.autopilot}")
-                logging_info(msg.format(**locals()))
-            else:
+            for (sysid, compid), m in detected_vehicles.items():
+                self.info.set_system_id_and_component_id(sysid, compid)
+                logging_debug(
+                    _("Connection established with systemID %d, componentID %d."), self.info.system_id, self.info.component_id
+                )
+                self.info.set_autopilot(m.autopilot)
+                if self.info.is_supported:
+                    msg = _("Autopilot type {self.info.autopilot}")
+                    logging_info(msg.format(**locals()))
+                    self.info.set_type(m.type)
+                    msg = _("Vehicle type: {self.info.mav_type} running {self.info.vehicle_type} firmware")
+                    logging_info(msg.format(**locals()))
+                    break
                 msg = _("Unsupported autopilot type {self.info.autopilot}")
-                return msg.format(**locals())
+                logging_info(msg.format(**locals()))
 
-            self.info.set_type(m.type)
-            msg = _("Vehicle type: {self.info.mav_type} running {self.info.vehicle_type} firmware")
-            logging_info(msg.format(**locals()))
+            if not self.info.is_supported:
+                return _("No supported autopilots found")
 
             self.__request_banner()
             banner_msgs = self.__receive_banner_text()
@@ -482,6 +498,7 @@ class FlightController:  # pylint: disable=too-many-public-methods,too-many-inst
             self.__request_message(mavutil.mavlink.MAVLINK_MSG_ID_AUTOPILOT_VERSION)
             m = self.master.recv_match(type="AUTOPILOT_VERSION", blocking=True, timeout=timeout)
             return self.__process_autopilot_version(m, banner_msgs)
+
         except (ConnectionError, SerialException, PermissionError, ConnectionRefusedError) as e:
             if log_errors:
                 logging_warning(_("Connection failed: %s"), e)
@@ -1157,12 +1174,12 @@ class FlightController:  # pylint: disable=too-many-public-methods,too-many-inst
     def __auto_detect_serial(self) -> list[mavutil.SerialPort]:
         preferred_ports = [
             "*FTDI*",
-            "*Arduino_Mega_2560*",
             "*3D*",
             "*USB_to_UART*",
             "*Ardu*",
             "*PX4*",
             "*Hex_*",
+            "*ProfiCNC*",
             "*Holybro_*",
             "*mRo*",
             "*FMU*",

ardupilot_methodic_configurator/backend_flightcontroller_info.py

@@ -1,7 +1,7 @@
 """
 Manages FC information using FC interface.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 

ardupilot_methodic_configurator/backend_internet.py

@@ -1,7 +1,7 @@
 """
 Check for software updates and install them if available.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar Lucas
 

ardupilot_methodic_configurator/backend_mavftp.py

@@ -6,7 +6,7 @@ MAVLink File Transfer Protocol support - https://mavlink.io/en/services/ftp.html
 
 Original from MAVProxy/MAVProxy/modules/mavproxy_ftp.py
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2011-2024 Andrew Tridgell, 2024-2025 Amilcar Lucas
 

ardupilot_methodic_configurator/battery_cell_voltages.py

@@ -1,7 +1,7 @@
 """
 Battery cell voltages management.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
 

ardupilot_methodic_configurator/common_arguments.py

@@ -1,7 +1,7 @@
 """
 Common arguments used by all sub applications.
 
-This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
+This file is part of ArduPilot Methodic Configurator. https://github.com/ArduPilot/MethodicConfigurator
 
 SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>