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

ardupilot_methodic_configurator/data_model_par_dict.py

@@ -104,7 +104,7 @@ class ParDict(dict[str, Par]):
         """
         parameter_dict = ParDict()
         try:
-            with open(param_file, encoding="utf-8") as f_handle:
+            with open(param_file, encoding="utf-8-sig") as f_handle:
                 for i, f_line in enumerate(f_handle, start=1):
                     original_line = f_line
                     line = f_line.strip()
@@ -125,14 +125,18 @@ class ParDict(dict[str, Par]):
                     elif "\t" in line:
                         parameter, value = line.split("\t", 1)
                     else:
-                        msg = f"Missing parameter-value separator: {line} in {param_file} line {i}"
+                        msg = _("Missing parameter-value separator: {line} in {param_file} line {i}").format(
+                            line=line, param_file=param_file, i=i
+                        )
                         raise SystemExit(msg)
                     # Strip whitespace from both parameter name and value immediately after splitting
                     parameter = parameter.strip()
                     value = value.strip()
                     ParDict._validate_parameter(param_file, parameter_dict, i, original_line, comment, parameter, value)
         except UnicodeDecodeError as exp:
-            msg = f"Fatal error reading {param_file}: {exp}"
+            msg = _("Fatal error reading {param_file}, file must be UTF-8 encoded: {exp}").format(
+                param_file=param_file, exp=exp
+            )
             raise SystemExit(msg) from exp
         return parameter_dict
 
@@ -147,26 +151,34 @@ class ParDict(dict[str, Par]):
         value: str,
     ) -> None:
         if len(parameter_name) > PARAM_NAME_MAX_LEN:
-            msg = f"Too long parameter name: {parameter_name} in {param_file} line {i}"
+            msg = _("Too long parameter name: {parameter_name} in {param_file} line {i}").format(
+                parameter_name=parameter_name, param_file=param_file, i=i
+            )
             raise SystemExit(msg)
         if not re.match(PARAM_NAME_REGEX, parameter_name):
-            msg = f"Invalid characters in parameter name {parameter_name} in {param_file} line {i}"
+            msg = _("Invalid characters in parameter name {parameter_name} in {param_file} line {i}").format(
+                parameter_name=parameter_name, param_file=param_file, i=i
+            )
             raise SystemExit(msg)
         if parameter_name in parameter_dict:
-            msg = f"Duplicated parameter {parameter_name} in {param_file} line {i}"
+            msg = _("Duplicated parameter {parameter_name} in {param_file} line {i}").format(
+                parameter_name=parameter_name, param_file=param_file, i=i
+            )
             raise SystemExit(msg)
         try:
             fvalue = float(value)
             parameter_dict[parameter_name] = Par(fvalue, comment)
         except ValueError as exc:
-            msg = f"Invalid parameter value {value} in {param_file} line {i}"
+            msg = _("Invalid parameter value {value} in {param_file} line {i}").format(value=value, param_file=param_file, i=i)
             raise SystemExit(msg) from exc
         except OSError as exc:
             _exc_type, exc_value, exc_traceback = sys_exc_info()
             if isinstance(exc_traceback, TracebackType):
                 fname = os_path.split(exc_traceback.tb_frame.f_code.co_filename)[1]
                 logging.critical("in line %s of file %s: %s", exc_traceback.tb_lineno, fname, exc_value)
-                msg = f"Caused by line {i} of file {param_file}: {original_line}"
+                msg = _("Caused by line {i} of file {param_file}: {original_line}").format(
+                    i=i, param_file=param_file, original_line=original_line
+                )
                 raise SystemExit(msg) from exc
 
     @staticmethod
@@ -205,7 +217,7 @@ class ParDict(dict[str, Par]):
         elif file_format == "mavproxy":
             sorted_dict = ParDict(dict(sorted(self.items())))
         else:
-            msg = f"ERROR: Unsupported file format {file_format}"
+            msg = _("ERROR: Unsupported file format {file_format}").format(file_format=file_format)
             raise SystemExit(msg)
 
         if file_format == "missionplanner":
@@ -277,10 +289,12 @@ class ParDict(dict[str, Par]):
         rows = int(rows_str) - 2  # -2 for the next print and the input line
 
         # Convert rows
-        print(f"\n{name} has {len(formatted_params)} parameters:")  # noqa: T201
+        print(  # noqa: T201
+            _("\n{name} has {len_formatted_params} parameters:").format(name=name, len_formatted_params=len(formatted_params))
+        )
         for i, line in enumerate(formatted_params):
             if i % rows == 0 and __name__ == "__main__":
-                input(f"\n{name} list is long hit enter to continue")
+                input(_("\n{name} list is long hit enter to continue").format(name=name))
                 rows_str, _columns = os_popen("stty size", "r").read().split()  # noqa: S605, S607
                 rows = int(rows_str) - 2  # -2 for the next print and the input line
             print(line)  # noqa: T201

ardupilot_methodic_configurator/data_model_software_updates.py

@@ -3,7 +3,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/data_model_template_overview.py

@@ -1,7 +1,7 @@
 """
 Vehicle template configuration overview information data model.
 
-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/data_model_vehicle_components.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle components.
 
-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/data_model_vehicle_components_base.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle components.
 
-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,6 +9,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 """
 
 # from logging import debug as logging_debug
+from copy import deepcopy
 from logging import error as logging_error
 from logging import warning as logging_warning
 from typing import Any, Optional, Union
@@ -34,7 +35,7 @@ class ComponentDataModelBase:
     def __init__(
         self, initial_data: ComponentData, component_datatypes: dict[str, Any], schema: VehicleComponentsJsonSchema
     ) -> None:
-        self._data: ComponentData = initial_data if initial_data else {"Components": {}, "Format version": 1}
+        self._data: ComponentData = deepcopy(initial_data) if initial_data else {"Components": {}, "Format version": 1}
         self._battery_chemistry: str = ""
         self._possible_choices: dict[ComponentPath, tuple[str, ...]] = {}
         self._mot_pwm_types: tuple[str, ...] = ()

ardupilot_methodic_configurator/data_model_vehicle_components_display.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle component display logic.
 
-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/data_model_vehicle_components_import.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle components import from FC parameters.
 
-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>
 
@@ -199,6 +199,7 @@ class ComponentDataModelImport(ComponentDataModelBase):
 
             if component == "RC Receiver" and rc == 1:
                 self.set_component_value(("RC Receiver", "FC Connection", "Type"), serial)
+                # Note: Protocol is set by RC_PROTOCOLS processing, not SERIAL_PROTOCOLS
                 rc += 1
             elif component == "Telemetry" and telem == 1:
                 self.set_component_value(("Telemetry", "FC Connection", "Type"), serial)

ardupilot_methodic_configurator/data_model_vehicle_components_json_schema.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle components JSON schema.
 
-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/data_model_vehicle_components_templates.py

@@ -1,7 +1,7 @@
 """
 Data model interface for vehicle components templates.
 
-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/data_model_vehicle_components_validation.py

@@ -1,7 +1,7 @@
 """
 Data model for vehicle components.
 
-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>
 
@@ -36,6 +36,46 @@ RC_PORTS = ["RCin/SBUS"]
 SPI_PORTS = ["SPI"]
 OTHER_PORTS = ["other"]
 
+# Bus labels for SERIAL ports - maps SERIAL port names to their common bus labels
+# These labels help users identify ports by their typical usage on flight controllers:
+# - Telem1/Telem2: Commonly used for telemetry connections
+# - GPS1/GPS2: Commonly used for GNSS receiver connections
+# - SERIAL5-8: No standard labels, use port name as label
+SERIAL_BUS_LABELS: dict[str, str] = {
+    "SERIAL1": "Telem1 (SERIAL1)",
+    "SERIAL2": "Telem2 (SERIAL2)",
+    "SERIAL3": "GPS1 (SERIAL3)",
+    "SERIAL4": "GPS2 (SERIAL4)",
+    "SERIAL5": "SERIAL5",
+    "SERIAL6": "SERIAL6",
+    "SERIAL7": "SERIAL7",
+    "SERIAL8": "SERIAL8",
+}
+
+
+def get_connection_type_tuples_with_labels(connection_types: tuple[str, ...]) -> list[tuple[str, str]]:
+    """
+    Convert connection type values to tuples with bus labels for display.
+
+    Args:
+        connection_types: Tuple of connection type values (e.g., ("SERIAL1", "SERIAL2", ...))
+
+    Returns:
+        List of tuples where first element is the value and second is the display string.
+        For SERIAL ports, returns (value, "Label (value)"), e.g., ("SERIAL3", "GPS1 (SERIAL3)")
+        For other ports, returns (value, value), e.g., ("CAN1", "CAN1")
+
+    """
+    result = []
+    for conn_type in connection_types:
+        if conn_type in SERIAL_BUS_LABELS:
+            label = SERIAL_BUS_LABELS[conn_type]
+            result.append((conn_type, label))
+        else:
+            result.append((conn_type, conn_type))
+    return result
+
+
 # Map paths to component names for unified protocol update
 FC_CONNECTION_TYPE_PATHS: list[ComponentPath] = [
     ("RC Receiver", "FC Connection", "Type"),

ardupilot_methodic_configurator/data_model_vehicle_project.py

@@ -5,7 +5,7 @@ This file contains the unified interface for all vehicle project operations,
 acting as a facade that coordinates between different data models and provides
 a single point of contact for the frontend layer.
 
-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/data_model_vehicle_project_creator.py

@@ -4,7 +4,7 @@ Data model for vehicle project creation.
 This file contains the business logic for creating new vehicle configurations
 from templates, separated from the GUI layer.
 
-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/data_model_vehicle_project_opener.py

@@ -4,7 +4,7 @@ Data model for vehicle project opening.
 This file contains the business logic for opening existing vehicle configurations,
 separated from the GUI layer.
 
-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/extract_param_defaults.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3
 # PYTHON_ARGCOMPLETE_OK
 
 """

ardupilot_methodic_configurator/frontend_tkinter_autoresize_combobox.py

@@ -1,7 +1,7 @@
 """
 TKinter base classes reused in multiple parts of the code.
 
-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/frontend_tkinter_base_window.py

@@ -11,7 +11,7 @@ Key Features:
 - Graceful icon loading with fallback for test environments
 - Utility methods for window positioning and image handling
 
-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>
 
@@ -101,7 +101,7 @@ class BaseWindow:
         if root_tk:
             self.root = tk.Toplevel(root_tk)
         else:
-            self.root = tk.Tk()
+            self.root = tk.Tk(className="ArduPilotMethodicConfigurator")
             # Only set icon for main windows, and only outside test environments
             self._setup_application_icon()
 
@@ -421,3 +421,7 @@ def show_error_popup(title: str, message: str) -> None:
 
 def ask_yesno_popup(title: str, message: str) -> bool:
     return messagebox.askyesno(title, message)
+
+
+def ask_retry_cancel_popup(title: str, message: str) -> bool:
+    return messagebox.askretrycancel(title, message)

ardupilot_methodic_configurator/frontend_tkinter_component_editor.py

@@ -3,7 +3,7 @@
 """
 Data-dependent part of the component editor GUI.
 
-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>
 
@@ -27,9 +27,10 @@ from ardupilot_methodic_configurator.data_model_vehicle_components_base import C
 from ardupilot_methodic_configurator.data_model_vehicle_components_validation import (
     BATTERY_CELL_VOLTAGE_PATHS,
     FC_CONNECTION_TYPE_PATHS,
+    get_connection_type_tuples_with_labels,
 )
 from ardupilot_methodic_configurator.frontend_tkinter_component_editor_base import ComponentEditorWindowBase
-from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import setup_combobox_mousewheel_handling
+from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import PairTupleCombobox
 
 # from ardupilot_methodic_configurator.frontend_tkinter_show import show_tooltip
 from ardupilot_methodic_configurator.frontend_tkinter_show import show_error_message, show_warning_message
@@ -109,20 +110,30 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
         err_msg = ""
         if protocol_path in self.entry_widgets:
             protocol_combobox = self.entry_widgets[protocol_path]
-            protocol_combobox["values"] = protocols  # Update the combobox entries
-            selected_protocol = protocol_combobox.get()
-            if selected_protocol not in protocols and isinstance(protocol_combobox, ttk.Combobox):
-                protocol_combobox.set("")
-                _component: str = " > ".join(protocol_path)
-                err_msg = _(
-                    "On {_component} the selected\nprotocol '{selected_protocol}' "
-                    "is not available for the selected connection Type."
-                )
-                err_msg = err_msg.format(**locals())
-            if err_msg:
-                show_error_message(_("Error"), err_msg)
-                protocol_combobox.configure(style="comb_input_invalid.TCombobox")
-            protocol_combobox.update_idletasks()  # re-draw the combobox ASAP
+            # Only update if this is actually a PairTupleCombobox (protocol comboboxes should be)
+            if isinstance(protocol_combobox, PairTupleCombobox):
+                # Rebuild the (key, display) pairs for PairTupleCombobox
+                protocol_tuples = [(p, p) for p in protocols]
+                # Get current selection and validate it against new protocols
+                current_selection = protocol_combobox.get_selected_key()
+                if current_selection and current_selection not in protocols:
+                    # Current selection is not valid for new protocols, clear it
+                    invalid_selection = current_selection
+                    current_selection = None
+                    component: str = " > ".join(protocol_path)
+                    err_msg = _(
+                        "On {component} the selected\nprotocol '{invalid_selection}' "
+                        "is not available for the selected connection Type."
+                    )
+                    err_msg = err_msg.format(component=component, invalid_selection=invalid_selection)
+
+                # Update the combobox entries using set_entries_tuple with validated selection
+                protocol_combobox.set_entries_tuple(protocol_tuples, current_selection)
+
+                if err_msg:
+                    show_error_message(_("Error"), err_msg)
+                    protocol_combobox.configure(style="comb_input_invalid.TCombobox")
+                protocol_combobox.update_idletasks()  # re-draw the combobox ASAP
         return err_msg
 
     def update_cell_voltage_limits_entries(self, component_path: ComponentPath, chemistry: str) -> str:
@@ -163,7 +174,7 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
 
     def add_entry_or_combobox(
         self, value: Union[str, float], entry_frame: ttk.Frame, path: ComponentPath, is_optional: bool = False
-    ) -> Union[ttk.Entry, ttk.Combobox]:
+    ) -> Union[ttk.Entry, PairTupleCombobox]:
         # Get combobox values from data model
         combobox_values = self.data_model.get_combobox_values_for_path(path)
 
@@ -174,15 +185,27 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
             return self._validate_combobox(event, path)
 
         if combobox_values:
-            cb = ttk.Combobox(entry_frame, values=combobox_values, foreground=fg_color)
+            # Convert all combobox values to tuples for PairTupleCombobox
+            # For FC Connection Type paths, add bus labels; for others, use value as both key and display
+            if path in FC_CONNECTION_TYPE_PATHS:
+                combobox_tuples = get_connection_type_tuples_with_labels(combobox_values)
+            else:
+                combobox_tuples = [(val, val) for val in combobox_values]
+
+            # Always use PairTupleCombobox for consistency and simplicity
+            cb = PairTupleCombobox(
+                entry_frame,
+                combobox_tuples,
+                str(value) if value else None,
+                f"{' > '.join(path)}",
+            )
+            cb.config(foreground=fg_color)
+
             cb.bind("<FocusOut>", on_validate_combobox)
             cb.bind("<KeyRelease>", on_validate_combobox)
             cb.bind("<Return>", on_validate_combobox)
             cb.bind("<ButtonRelease>", on_validate_combobox)
 
-            # Set up mouse wheel handling to prevent unwanted value changes
-            setup_combobox_mousewheel_handling(cb)
-
             # Override the FocusOut binding to also handle validation
             def combined_focus_out(event: tk.Event) -> None:
                 # First handle the dropdown closing logic (already done by setup function)
@@ -192,9 +215,10 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
             cb.bind("<FocusOut>", combined_focus_out, add="+")
 
             if path in FC_CONNECTION_TYPE_PATHS:
-                cb.bind(  # immediate update of Protocol combobox choices after changing connection Type selection
+                # immediate update of Protocol combobox choices after changing connection Type selection
+                cb.bind(
                     "<<ComboboxSelected>>",
-                    lambda event: self.update_component_protocol_combobox_entries(path, cb.get()),  # noqa: ARG005
+                    lambda _event: self.update_component_protocol_combobox_entries(path, cb.get_selected_key() or ""),
                 )
 
             # When battery chemistry changes, the max, low and crit voltages will change to the
@@ -202,10 +226,9 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
             if path == ("Battery", "Specifications", "Chemistry"):
                 cb.bind(
                     "<<ComboboxSelected>>",
-                    lambda event: self.update_cell_voltage_limits_entries(path, cb.get()),  # noqa: ARG005
+                    lambda _event: self.update_cell_voltage_limits_entries(path, cb.get_selected_key() or ""),
                 )
 
-            cb.set(value)
             return cb
 
         entry = ttk.Entry(entry_frame, foreground=fg_color)
@@ -220,12 +243,16 @@ class ComponentEditorWindow(ComponentEditorWindowBase):
         return entry
 
     def _validate_combobox(self, event: tk.Event, path: ComponentPath) -> bool:
-        """Validates the value of a combobox."""
+        """Validates the value of a PairTupleCombobox."""
         combobox = event.widget  # Get the combobox widget that triggered the event
-        if not isinstance(combobox, ttk.Combobox):
+        if not isinstance(combobox, PairTupleCombobox):
             return False
-        value = combobox.get()  # Get the current value of the combobox
-        allowed_values = combobox.cget("values")  # Get the list of allowed values
+
+        # Get the selected key (internal value)
+        value = combobox.get_selected_key() or ""
+
+        # Get allowed values from list_keys
+        allowed_values = combobox.list_keys
 
         # Events that should trigger data model update (when value is valid)
         should_update_data_model = event.type in {

ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py

@@ -3,7 +3,7 @@
 """
 Component editor GUI that is not data dependent.
 
-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>
 
@@ -33,6 +33,7 @@ from ardupilot_methodic_configurator.data_model_vehicle_components_json_schema i
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_component_template_manager import ComponentTemplateManager
 from ardupilot_methodic_configurator.frontend_tkinter_font import create_scaled_font, get_safe_font_config
+from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import PairTupleCombobox
 from ardupilot_methodic_configurator.frontend_tkinter_rich_text import RichText
 from ardupilot_methodic_configurator.frontend_tkinter_scroll_frame import ScrollFrame
 from ardupilot_methodic_configurator.frontend_tkinter_show import show_error_message, show_tooltip
@@ -63,7 +64,7 @@ def argument_parser() -> Namespace:
 
 
 # Type aliases to improve code readability
-EntryWidget = Union[ttk.Entry, ttk.Combobox]
+EntryWidget = Union[ttk.Entry, PairTupleCombobox]
 
 WINDOW_WIDTH_PIX = 880
 VEHICLE_IMAGE_WIDTH_PIX = 100
@@ -293,6 +294,10 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
 
     def _display_component_editor_usage_instructions(self, parent: tk.Tk) -> None:
         """Display usage instructions for the component editor."""
+        # Check if parent window still exists before showing popup
+        if not parent.winfo_exists():
+            return
+
         # pylint: disable=duplicate-code
         usage_popup_window = BaseWindow(parent)
         style = ttk.Style()
@@ -482,8 +487,11 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
     def validate_data_and_highlight_errors_in_red(self) -> str:
         """Validate all data using the data model."""
         # Collect all entry values
+        # For PairTupleCombobox, get the selected key; for ttk.Entry, get the text
         entry_values = {
-            path: entry.get() for path, entry in self.entry_widgets.items() if isinstance(entry, (ttk.Entry, ttk.Combobox))
+            path: entry.get_selected_key() or "" if isinstance(entry, PairTupleCombobox) else entry.get()
+            for path, entry in self.entry_widgets.items()
+            if isinstance(entry, (PairTupleCombobox, ttk.Entry))
         }
 
         # Use data model for validation
@@ -491,19 +499,16 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
 
         if not is_valid:
             # Update UI to show invalid states and display errors
-            for path, entry in (
-                (path, entry) for path, entry in self.entry_widgets.items() if isinstance(entry, (ttk.Entry, ttk.Combobox))
-            ):
-                value = entry.get()
-
-                # Check combobox validation
-                if isinstance(entry, ttk.Combobox):
-                    combobox_values = self.data_model.get_combobox_values_for_path(path)
-                    if combobox_values and value not in combobox_values:
+            for path, entry in self.entry_widgets.items():
+                if isinstance(entry, PairTupleCombobox):
+                    value = entry.get_selected_key() or ""
+                    # Check combobox validation
+                    if value not in entry.list_keys:
                         entry.configure(style="comb_input_invalid.TCombobox")
                     else:
                         entry.configure(style="comb_input_valid.TCombobox")
-                else:
+                elif isinstance(entry, ttk.Entry):
+                    value = entry.get()
                     # Check entry validation
                     error_message, _corr = self.data_model.validate_entry_limits(value, path)
                     if error_message:

ardupilot_methodic_configurator/frontend_tkinter_component_template_manager.py

@@ -1,7 +1,7 @@
 """
 Component template manager for the ArduPilot methodic configurator.
 
-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>, 2025 Francisco Fonseca
 

ardupilot_methodic_configurator/frontend_tkinter_connection_selection.py

@@ -3,7 +3,7 @@
 """
 GUI to select the connection to the FC.
 
-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/frontend_tkinter_directory_selection.py

@@ -1,7 +1,7 @@
 """
 GUI to select the directory to store the vehicle configuration files.
 
-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/frontend_tkinter_entry_dynamic.py

@@ -3,7 +3,7 @@
 """
 GUI entry Widget with autocompletion features.
 
-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
 
 https://code.activestate.com/recipes/580770-combobox-autocomplete/
 

ardupilot_methodic_configurator/frontend_tkinter_flightcontroller_info.py

@@ -1,7 +1,7 @@
 """
 Flight controller information GUI.
 
-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/frontend_tkinter_font.py

@@ -10,7 +10,7 @@ The module offers functions to safely retrieve font configurations, families,
 and sizes with appropriate platform-specific fallbacks. This ensures consistent
 text rendering across Windows, macOS, and Linux systems.
 
-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/frontend_tkinter_motor_test.py

@@ -13,7 +13,7 @@ The MotorTestView class provides:
 
 MotorTestWindow class provides a standalone window for development/testing.
 
-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>