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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 2.0.2
+Version: 2.0.3
 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>
@@ -66,8 +66,8 @@ Provides-Extra: dev
 Requires-Dist: coverage==7.10.2; extra == "dev"
 Requires-Dist: mock==5.2.0; extra == "dev"
 Requires-Dist: mypy==1.17.1; extra == "dev"
-Requires-Dist: pre-commit==4.2.0; extra == "dev"
-Requires-Dist: pylint==3.3.7; 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: pytest==8.4.1; extra == "dev"
 Requires-Dist: pytest-cov==6.2.1; extra == "dev"

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

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

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/__main__.py

@@ -36,13 +36,13 @@ from ardupilot_methodic_configurator.backend_filesystem_program_settings import
 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.data_model_software_updates import UpdateManager, check_for_software_updates
 from ardupilot_methodic_configurator.frontend_tkinter_component_editor import ComponentEditorWindow
 from ardupilot_methodic_configurator.frontend_tkinter_connection_selection import ConnectionSelectionWindow
 from ardupilot_methodic_configurator.frontend_tkinter_directory_selection import VehicleDirectorySelectionWindow
 from ardupilot_methodic_configurator.frontend_tkinter_flightcontroller_info import FlightControllerInfoWindow
 from ardupilot_methodic_configurator.frontend_tkinter_parameter_editor import ParameterEditorWindow
 from ardupilot_methodic_configurator.frontend_tkinter_show import show_error_message
-from ardupilot_methodic_configurator.middleware_software_updates import UpdateManager, check_for_software_updates
 
 
 class ApplicationState:  # pylint: disable=too-few-public-methods

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/backend_filesystem_vehicle_components.py

@@ -26,8 +26,8 @@ from typing import Any, Union
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.backend_filesystem_json_with_schema import FilesystemJSONWithSchema
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
+from ardupilot_methodic_configurator.data_model_template_overview import TemplateOverview
 from ardupilot_methodic_configurator.data_model_vehicle_components_json_schema import VehicleComponentsJsonSchema
-from ardupilot_methodic_configurator.middleware_template_overview import TemplateOverview
 
 
 class VehicleComponents:
@@ -368,15 +368,12 @@ class VehicleComponents:
                 },
             }
 
-            def is_empty(val: Any) -> bool:
-                return val in (None, "", 0, 0.0, {}) or (isinstance(val, dict) and not val)
-
             def merge_defaults(target: dict, defaults: dict) -> None:
-                for key, value in defaults.items():
-                    if key not in target or is_empty(target[key]):
-                        target[key] = value
-                    elif isinstance(value, dict) and isinstance(target[key], dict):
-                        merge_defaults(target[key], value)
+                for key, default_value in defaults.items():
+                    if key not in target or not target[key]:
+                        target[key] = default_value
+                    elif isinstance(default_value, dict) and isinstance(target[key], dict):
+                        merge_defaults(target[key], default_value)
 
             merge_defaults(data["Components"], default_data)
 

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/backend_flightcontroller_info.py

@@ -16,7 +16,7 @@ from pymavlink import mavutil
 
 # import pymavlink.dialects.v20.ardupilotmega
 from ardupilot_methodic_configurator import _
-from ardupilot_methodic_configurator.middleware_fc_ids import (
+from ardupilot_methodic_configurator.data_model_fc_ids import (
     APJ_BOARD_ID_MCU_SERIES_DICT,
     APJ_BOARD_ID_NAME_DICT,
     APJ_BOARD_ID_VENDOR_DICT,

ardupilot_methodic_configurator-2.0.2/ardupilot_methodic_configurator/ardupilot_parameter.py → ardupilot_methodic_configurator-2.0.3/ardupilot_methodic_configurator/data_model_ardupilot_parameter.py

@@ -16,6 +16,25 @@ from ardupilot_methodic_configurator.annotate_params import Par
 from ardupilot_methodic_configurator.backend_filesystem import is_within_tolerance
 
 
+class ParameterUnchangedError(Exception):
+    """
+    Raised when a call to set_new_value would not change the stored value.
+
+    This allows callers to distinguish between an invalid input (ValueError)
+    and a valid input that simply results in no change.
+    """
+
+
+class ParameterOutOfRangeError(Exception):
+    """
+    Raised when a provided value is outside the configured min/max limits.
+
+    This allows callers (usually the UI) to ask the user for confirmation
+    before proceeding. If the caller passes `ignore_out_of_range=True` to
+    `set_new_value`, the value will be accepted despite being out of range.
+    """
+
+
 class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-many-public-methods
     """Domain model representing an ArduPilot parameter with all its attributes."""
 
@@ -279,28 +298,106 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         """Return an error message if the RC 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 set_new_value(self, value: float) -> bool:
+    def set_new_value(self, value: str, ignore_out_of_range: bool = False) -> float:  # pylint: disable=too-many-branches
         """
-        Set the new parameter value and return whether it changed.
+        Set the new parameter value from a UI string input.
+
+        This method parses and validates the provided string and updates
+        ``self._new_value``. On invalid input it raises a ``ValueError`` or
+        ``TypeError`` with a user-friendly, translatable message.
 
         Args:
-            value: The new value to set
+            value: The new value as a string (e.g. "1.23", "0x10", or a choice label).
+            ignore_out_of_range: If True accept values outside min/max limits.
 
         Returns:
-            True if the new value was changed, False otherwise
+            The new value as a float (or int for bitmask values).
+
+        Raises:
+            TypeError: if the provided value is not a string.
+            ValueError: if the value is invalid for this parameter (not in choices,
+                        invalid bitmask bits, invalid numeric format, etc.).
+            ParameterOutOfRangeError: if the value is outside min/max limits and
+                `ignore_out_of_range` is False.
+            ParameterUnchangedError: if the provided value is valid but does not
+                change the currently stored value.
 
         """
         if self._is_forced or self._is_derived:
-            return False
-
-        if (self.is_bitmask or self.is_multiple_choice) and value == self._new_value:
-            return False
-
-        if not (self.is_bitmask or self.is_multiple_choice) and is_within_tolerance(self._new_value, value):
-            return False
+            raise ValueError(_("This parameter is forced or derived and cannot be changed."))
+
+        if not isinstance(value, str):
+            raise TypeError(_("Parameter value must be provided as a string."))
+
+        s = value.strip()
+        if s == "":
+            raise ValueError(_("Empty value is not allowed for {param_name}").format(param_name=self._name))
+
+        # Multiple-choice parameters: accept either the choice label or the numeric key
+        if self.is_multiple_choice:
+            new_value = float(s)
+            # No change
+            if new_value == self._new_value:
+                raise ParameterUnchangedError(
+                    _("The provided value for {param_name} would not change the parameter.").format(param_name=self._name)
+                )
+
+            self._new_value = new_value
+            return self._new_value
+
+        # Bitmask parameters: require integer value; allow 0x / 0b prefixes
+        if self.is_bitmask:
+            try:
+                int_value = int(s, 0)
+            except ValueError as exc:
+                raise ValueError(
+                    _("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(
+                        param_name=self._name
+                    )
+                )
+
+            self._new_value = float(int_value)
+            return self._new_value
+
+        # Otherwise expect a numeric value
+        try:
+            f = float(s)
+        except ValueError as exc:
+            raise ValueError(_("The value for {param_name} must be a number.").format(param_name=self._name)) from exc
+
+        if not isfinite(f) or isnan(f):
+            raise ValueError(self.is_invalid_number(f))
+
+        msg = self.is_above_limit(f)
+        if msg and not ignore_out_of_range:
+            raise ParameterOutOfRangeError(msg)
+
+        msg = self.is_below_limit(f)
+        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 = value
-        return True
+        self._new_value = f
+        return self._new_value
 
     def set_change_reason(self, change_reason: str) -> bool:
         """
@@ -339,10 +436,11 @@ class BitmaskHelper:
             Set of keys (bit positions) that are set in the value
 
         """
-        return {key for key in bitmask_dict if (value >> key) & 1}
+        # Ensure keys are integers (metadata may contain string keys)
+        return {int(key) for key in bitmask_dict if (value >> int(key)) & 1}
 
     @staticmethod
-    def get_value_from_keys(checked_keys: set[int]) -> int:
+    def get_value_from_keys(checked_keys: set[int]) -> str:
         """
         Convert a list of checked bit keys to a decimal value.
 
@@ -350,10 +448,10 @@ class BitmaskHelper:
             checked_keys: List of bit positions that are set
 
         Returns:
-            The decimal value representing the bits set
+            The decimal value string representing the bits set
 
         """
-        return sum(1 << key for key in checked_keys)
+        return str(sum(1 << key for key in checked_keys))
 
 
 class ConnectionRenamer:

ardupilot_methodic_configurator-2.0.2/ardupilot_methodic_configurator/middleware_template_overview.py → ardupilot_methodic_configurator-2.0.3/ardupilot_methodic_configurator/data_model_template_overview.py

@@ -1,5 +1,5 @@
 """
-Middleware between the flight controller information backend and the GUI fronted.
+Vehicle template configuration overview information data model.
 
 This file is part of Ardupilot methodic configurator. https://github.com/ArduPilot/MethodicConfigurator
 

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/data_model_vehicle_components_validation.py

@@ -414,7 +414,8 @@ class ComponentDataModelValidation(ComponentDataModelBase):
                     except ValueError:
                         return _("Takeoff Weight max must be a float"), None
                     lim = self.get_component_value(("Frame", "Specifications", "TOW min Kg"))
-                    return self.validate_against_another_value(tow_max, lim, "TOW min Kg", above=True, delta=0.01)
+                    if lim:
+                        return self.validate_against_another_value(tow_max, lim, "TOW min Kg", above=True, delta=0.01)
 
                 if path[2] == "TOW min Kg":
                     try:
@@ -422,7 +423,8 @@ class ComponentDataModelValidation(ComponentDataModelBase):
                     except ValueError:
                         return _("Takeoff Weight min must be a float"), None
                     lim = self.get_component_value(("Frame", "Specifications", "TOW max Kg"))
-                    return self.validate_against_another_value(tow_min, lim, "TOW max Kg", above=False, delta=0.01)
+                    if lim:
+                        return self.validate_against_another_value(tow_min, lim, "TOW max Kg", above=False, delta=0.01)
 
         if path in BATTERY_CELL_VOLTAGE_PATHS:
             return self.validate_cell_voltage(value, path)

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py

@@ -290,6 +290,7 @@ 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."""
+        # pylint: disable=duplicate-code
         usage_popup_window = BaseWindow(parent)
         style = ttk.Style()
 
@@ -300,6 +301,7 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
             bd=0,
             background=style.lookup("TLabel", "background"),  # type: ignore[no-untyped-call]
         )
+        # pylint: enable=duplicate-code
         instructions_text.insert(tk.END, _("1. Describe the properties of the vehicle components in the window below.\n"))
         instructions_text.insert(tk.END, _("2. Each field has mouse-over tooltips for additional guidance.\n"))
         instructions_text.insert(tk.END, _("3. Optional fields are marked with gray text and can be left blank.\n"))

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/frontend_tkinter_parameter_editor.py

@@ -46,6 +46,8 @@ from ardupilot_methodic_configurator.frontend_tkinter_stage_progress import Stag
 from ardupilot_methodic_configurator.frontend_tkinter_usage_popup_window import UsagePopupWindow
 from ardupilot_methodic_configurator.tempcal_imu import IMUfit
 
+# pylint: disable=too-many-lines
+
 
 def show_about_window(root: ttk.Frame, _version: str) -> None:  # pylint: disable=too-many-locals
     # Create a new window for the custom "About" message
@@ -255,7 +257,7 @@ class ParameterEditorWindow(BaseWindow):  # pylint: disable=too-many-instance-at
         image_label.bind("<Button-1>", lambda event: show_about_window(self.main_frame, version))  # noqa: ARG005
         show_tooltip(image_label, _("User Manual, Support Forum, Report a Bug, Licenses, Source Code"))
 
-    def legend_frame(self, config_subframe: ttk.Frame, font_family: str) -> None:
+    def legend_frame(self, config_subframe: ttk.Frame, font_family: str) -> None:  # pylint: disable=too-many-locals
         style = ttk.Style()
         style.configure("Legend.TLabelframe", font=(font_family, 9))  # type: ignore[no-untyped-call]
         legend_frame = ttk.LabelFrame(config_subframe, text=_("Legend"), style="Legend.TLabelframe")

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/frontend_tkinter_parameter_editor_table.py

@@ -20,8 +20,14 @@ from typing import Union
 
 from ardupilot_methodic_configurator import _
 from ardupilot_methodic_configurator.annotate_params import Par
-from ardupilot_methodic_configurator.ardupilot_parameter import ArduPilotParameter, BitmaskHelper, ConnectionRenamer
 from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
+from ardupilot_methodic_configurator.data_model_ardupilot_parameter import (
+    ArduPilotParameter,
+    BitmaskHelper,
+    ConnectionRenamer,
+    ParameterOutOfRangeError,
+    ParameterUnchangedError,
+)
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
 from ardupilot_methodic_configurator.frontend_tkinter_entry_dynamic import EntryWithDynamicalyFilteredListbox
 from ardupilot_methodic_configurator.frontend_tkinter_pair_tuple_combobox import PairTupleCombobox
@@ -164,7 +170,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
                 info_msg = _("No different parameters found in {selected_file}. Skipping...").format(**locals())
                 logging_info(info_msg)
                 messagebox.showinfo(_("ArduPilot methodic configurator"), info_msg)
-                self.parameter_editor.on_skip_click(force_focus_out_event=False)
+                self.parameter_editor.on_skip_click()
                 return
         else:
             self._update_table(self.parameters, fc_parameters, self.parameter_editor.gui_complexity)
@@ -362,24 +368,28 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
         self, combobox_widget: PairTupleCombobox, param: ArduPilotParameter, event: tk.Event, change_reason_widget: ttk.Entry
     ) -> None:
         """Update the combobox style based on selection."""
-        new_value_str = combobox_widget.get_selected_key()
+        new_value_str = combobox_widget.get_selected_key() or ""
         try:
-            # we want None to raise an exception
-            new_value = float(new_value_str)  # type: ignore[arg-type]
-            if param.set_new_value(new_value):
-                show_tooltip(change_reason_widget, param.tooltip_change_reason)
-                self.at_least_one_param_edited = True
-                # Update the corresponding file parameter
-                self.local_filesystem.file_parameters[self.current_file][param.name].value = new_value
-            combobox_widget.configure(
-                style="default_v.TCombobox" if param.new_value_equals_default_value else "readonly.TCombobox"
-            )
-            event.width = NEW_VALUE_WIDGET_WIDTH
-            combobox_widget.on_combo_configure(event)
-        except ValueError as e:
-            msg = _("Could not solve the selected {new_value_str} key to a float value.").format(new_value_str=new_value_str)
-            logging_exception(msg, e)
-            messagebox.showerror(_("Error"), msg)
+            # Pass the string to the domain model; it will validate and raise on error
+            new_value = param.set_new_value(new_value_str)
+        except ParameterUnchangedError:
+            # valid but no change; just refresh style
+            pass
+        except (ValueError, TypeError) as exc:  # user provided invalid input
+            msg = _("Could not apply the selected value: {new_value_str}").format(new_value_str=new_value_str)
+            logging_exception(msg, exc)
+            messagebox.showerror(_("Error"), str(exc))
+        else:
+            # Success: mark edited and update the stored file parameter value
+            show_tooltip(change_reason_widget, param.tooltip_change_reason)
+            self.at_least_one_param_edited = True
+            self.local_filesystem.file_parameters[self.current_file][param.name].value = new_value
+
+        combobox_widget.configure(
+            style="default_v.TCombobox" if param.new_value_equals_default_value else "readonly.TCombobox"
+        )
+        event.width = NEW_VALUE_WIDGET_WIDTH
+        combobox_widget.on_combo_configure(event)
 
     @staticmethod
     def _update_new_value_entry_text(new_value_entry: ttk.Entry, param: ArduPilotParameter) -> None:
@@ -390,13 +400,14 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
         new_value_entry.delete(0, tk.END)
         new_value_entry.insert(0, param.value_as_string)
         if param.new_value_equals_default_value:
-            new_value_entry.configure(style="default_v.TEntry")
+            style = "default_v.TEntry"
         elif param.is_below_limit():
-            new_value_entry.configure(style="below_limit.TEntry")
+            style = "below_limit.TEntry"
         elif param.is_above_limit():
-            new_value_entry.configure(style="above_limit.TEntry")
+            style = "above_limit.TEntry"
         else:
-            new_value_entry.configure(style="TEntry")
+            style = "TEntry"
+        new_value_entry.configure(style=style)
 
     def _create_new_value_entry(  # pylint: disable=too-many-statements # noqa: PLR0915
         self, param: ArduPilotParameter, change_reason_widget: ttk.Entry
@@ -453,7 +464,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
         def _on_parameter_value_change(event: tk.Event) -> None:
             """Handle changes to parameter values."""
-            # Get the new value from the Entry widget
+            # Get the new value string from the Entry widget (always treat as string)
             new_value = (
                 event.widget.get_selected_key()
                 if isinstance(event.widget, PairTupleCombobox)
@@ -461,43 +472,39 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
                 if isinstance(event.widget, (ttk.Entry, tk.Entry))
                 else None
             )
-            valid: bool = True
-            value: float = 0.0
 
-            # Check if the input is a valid float
-            try:
-                value = float(new_value)  # type: ignore[arg-type] # workaround a mypy bug
-
-                err_msg = param.is_invalid_number(value)
-                if err_msg:
-                    messagebox.showerror(_("Invalid Value"), err_msg)
-                    valid = False
+            # If we couldn't extract a string, abort early
+            if new_value is None:
+                return
 
-                # Check if value is valid according to domain model
-                err_msg = param.is_below_limit(value)
-                if err_msg and not messagebox.askyesno(
-                    _("Out-of-bounds Value"), err_msg + _("Use out-of-bounds value?"), icon="warning"
-                ):
-                    valid = False
+            new_value_result = None
+            valid = True
 
-                err_msg = param.is_above_limit(value)
-                if err_msg and not messagebox.askyesno(
-                    _("Out-of-bounds Value"), err_msg + _("Use out-of-bounds value?"), icon="warning"
-                ):
+            try:
+                # first attempt: let the model validate the provided string
+                # (it will convert/validate as required)
+                new_value_result = param.set_new_value(new_value)
+            except ParameterOutOfRangeError as oor:  # user-visible warning from model
+                # Ask the user if they want to accept the out-of-range value
+                if messagebox.askyesno(_("Out-of-bounds Value"), str(oor) + _(" Use out-of-bounds value?"), icon="warning"):
+                    # Retry accepting the value while telling the model to ignore range checks
+                    new_value_result = param.set_new_value(new_value, ignore_out_of_range=True)
+                else:
                     valid = False
-
-            except ValueError:
-                # Handle invalid value
-                error_msg = _("The value for {param.name} must be a valid float.")
-                messagebox.showerror(_("Invalid Value"), error_msg.format(**locals()))
+            except ParameterUnchangedError:
+                # Valid but no change — just refresh the UI and do not mark edited
+                valid = False
+            except (ValueError, TypeError) as exc:  # invalid input according to model
+                messagebox.showerror(_("Invalid Value"), str(exc))
                 valid = False
 
-            if valid and param.set_new_value(value):
+            if valid and new_value_result is not None:
                 logging_debug(_("Parameter %s changed, will later ask if change(s) should be saved to file."), param.name)
                 show_tooltip(change_reason_widget, param.tooltip_change_reason)
                 self.at_least_one_param_edited = True
-                # Update the corresponding file parameter
-                self.local_filesystem.file_parameters[self.current_file][param.name].value = value
+                # Update the corresponding file parameter with the model-returned value
+                # (model returns the canonical numeric/string representation)
+                self.local_filesystem.file_parameters[self.current_file][param.name].value = new_value_result
 
             # Update the displayed value in the Entry or Combobox
             if isinstance(
@@ -515,12 +522,16 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
             new_value_entry.bind("<Button-3>", show_parameter_error)
         elif param.is_bitmask:
             new_value_entry.bind(
-                "<Double-Button>",
+                "<Double-Button-1>",
                 lambda event: self._open_bitmask_selection_window(event, param, change_reason_widget),
             )
             new_value_entry.bind("<FocusOut>", _on_parameter_value_change)
+            new_value_entry.bind("<Return>", _on_parameter_value_change)
+            new_value_entry.bind("<KP_Enter>", _on_parameter_value_change)
         else:
             new_value_entry.bind("<FocusOut>", _on_parameter_value_change)
+            new_value_entry.bind("<Return>", _on_parameter_value_change)
+            new_value_entry.bind("<KP_Enter>", _on_parameter_value_change)
 
         tooltip_new_value = param.tooltip_new_value
         if tooltip_new_value:
@@ -534,22 +545,28 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
 
         def on_close() -> None:
             try:
-                checked_keys = [int(key) for key, var in checkbox_vars.items() if var.get()]
+                checked_keys = {int(key) for key, var in checkbox_vars.items() if var.get()}
             except (ValueError, TypeError) as e:
                 logging_exception(_("Error getting {param_name} checked keys: %s").format(param_name=param.name), e)
                 messagebox.showerror(
                     _("Error"), _("Could not get {param_name} checked keys. Please try again.").format(param_name=param.name)
                 )
                 return
-            # Convert checked keys back to a decimal value using our helper
-            new_decimal_value = BitmaskHelper.get_value_from_keys(set(checked_keys))
 
             # Update the parameter value and entry text
-            if param.set_new_value(new_decimal_value):
+            try:
+                new_value = param.set_new_value(BitmaskHelper.get_value_from_keys(checked_keys))
+            except ParameterUnchangedError:
+                # valid but no change
+                pass
+            except (ValueError, TypeError) as exc:
+                logging_exception(_("Could not set bitmask value for %s: %s"), param.name, exc)
+                messagebox.showerror(_("Error"), str(exc))
+            else:
                 show_tooltip(change_reason_widget, param.tooltip_change_reason)
                 self.at_least_one_param_edited = True
                 # Update the corresponding file parameter
-                self.local_filesystem.file_parameters[self.current_file][param.name].value = new_decimal_value
+                self.local_filesystem.file_parameters[self.current_file][param.name].value = new_value
 
             # Update new_value_entry with the new decimal value
             # For bitmask windows, event.widget should always be ttk.Entry (not PairTupleCombobox)
@@ -770,7 +787,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
                 self.parameter_editor.repopulate_parameter_table(self.current_file)
                 return True
             messagebox.showerror(_("Invalid parameter name."), _("Parameter name not found in the flight controller."))
-        elif self.local_filesystem.doc_dict:
+        if self.local_filesystem.doc_dict:
             if param_name in self.local_filesystem.doc_dict:
                 self.local_filesystem.file_parameters[self.current_file][param_name] = Par(
                     self.local_filesystem.param_default_dict.get(param_name, Par(0, "")).value, ""
@@ -780,7 +797,7 @@ class ParameterEditorTable(ScrollFrame):  # pylint: disable=too-many-ancestors,
                 return True
             error_msg = _("'{param_name}' not found in the apm.pdef.xml file.")
             messagebox.showerror(_("Invalid parameter name."), error_msg.format(**locals()))
-        else:
+        if not fc_parameters and not self.local_filesystem.doc_dict:
             messagebox.showerror(
                 _("Operation not possible"),
                 _("Can not add parameter when no FC is connected and no apm.pdef.xml file exists."),

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/frontend_tkinter_scroll_frame.py

@@ -30,7 +30,11 @@ class ScrollFrame(ttk.Frame):  # pylint: disable=too-many-ancestors
         super().__init__(master)  # create a frame (self)
 
         # place canvas on self, copy ttk.background to tk.background
-        self.canvas = tk.Canvas(self, borderwidth=0, background=ttk.Style(master).lookup("TFrame", "background"))  # type: ignore[no-untyped-call]
+        self.canvas = tk.Canvas(
+            self,
+            borderwidth=0,
+            background=ttk.Style(master).lookup("TFrame", "background"),  # type: ignore[no-untyped-call]
+        )
 
         # place a frame on the canvas, this frame will hold the child widgets
         self.view_port = ttk.Frame(self.canvas)

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator/frontend_tkinter_template_overview.py

@@ -23,8 +23,8 @@ from ardupilot_methodic_configurator import _, __version__
 from ardupilot_methodic_configurator.backend_filesystem_program_settings import ProgramSettings
 from ardupilot_methodic_configurator.backend_filesystem_vehicle_components import VehicleComponents
 from ardupilot_methodic_configurator.common_arguments import add_common_arguments
+from ardupilot_methodic_configurator.data_model_template_overview import TemplateOverview
 from ardupilot_methodic_configurator.frontend_tkinter_base_window import BaseWindow
-from ardupilot_methodic_configurator.middleware_template_overview import TemplateOverview
 
 
 class VehicleComponentsProviderProtocol(Protocol):

{ardupilot_methodic_configurator-2.0.2 → ardupilot_methodic_configurator-2.0.3}/ardupilot_methodic_configurator.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ardupilot_methodic_configurator
-Version: 2.0.2
+Version: 2.0.3
 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>
@@ -66,8 +66,8 @@ Provides-Extra: dev
 Requires-Dist: coverage==7.10.2; extra == "dev"
 Requires-Dist: mock==5.2.0; extra == "dev"
 Requires-Dist: mypy==1.17.1; extra == "dev"
-Requires-Dist: pre-commit==4.2.0; extra == "dev"
-Requires-Dist: pylint==3.3.7; 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: pytest==8.4.1; extra == "dev"
 Requires-Dist: pytest-cov==6.2.1; extra == "dev"