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

ardupilot_methodic_configurator/configuration_steps_ArduCopter.json

@@ -69,7 +69,9 @@
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "",
             "derived_parameters": {
-                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" }
+                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" },
+                "RC5_OPTION": { "New Value": "1 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('RC5_OPTION', 0)", "Change Reason": "ExpressLRS requires RC5 to be used for arming (Arm/Disarm function)" },
+                "FLTMODE_CH": { "New Value": "6 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('FLTMODE_CH', 5)", "Change Reason": "ExpressLRS requires FLTMODE_CH != 5" }
             },
             "rename_connection": "vehicle_components['RC Receiver']['FC Connection']['Type']",
             "old_filenames": []
@@ -212,7 +214,7 @@
             "wiki_text": "Follow the blog instructions and use Mission Planner instead of this tool to configure the mandatory hardware parameters.",
             "wiki_url": "",
             "external_tool_text": "Mission Planner",
-            "external_tool_url": "https://github.com/ArduPilot/MethodicConfigurator/blob/latest/TUNING_GUIDE_ArduCopter.md#212-configure-mandatory-hardware-parameters-17",
+            "external_tool_url": "https://ardupilot.org/copter/docs/configuring-hardware.html",
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "Mission Planner. If you have not done this step in Mission Planner yet, close this application and use Mission Planner",
             "old_filenames": ["11_mp_setup_mandatory_hardware.param"]
@@ -250,9 +252,9 @@
                 "LOG_FILE_DSRMROT": { "New Value": 1, "Change Reason": "One .bin log file per flight, not per battery/reboot" }
             },
             "derived_parameters": {
-                "INS_LOG_BAT_MASK": { "New Value": "1 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] < 16 else 0", "Change Reason": "Use acc and gyro batch logging on F4 processors, gyro raw logging on others" },
-                "INS_LOG_BAT_OPT": { "New Value": "4 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] < 16 else 0", "Change Reason": "Use pre and post filters acc and gyro batch logging on F4 processors, pre-post gyro raw logging on others" },
-                "INS_RAW_LOG_OPT": { "New Value": "0 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] < 16 else 9", "Change Reason": "Use pre and post filters acc and gyro batch logging on F4 processors, pre-post gyro raw logging on others" }
+                "INS_LOG_BAT_MASK": { "New Value": "1 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] > 16 else 0", "Change Reason": "Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others" },
+                "INS_LOG_BAT_OPT": { "New Value": "4 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] > 16 else 0", "Change Reason": "Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others" },
+                "INS_RAW_LOG_OPT": { "New Value": "0 if 'F4' in vehicle_components['Flight Controller']['Specifications']['MCU Series'] or vehicle_components['Propellers']['Specifications']['Diameter_inches'] > 16 else 9", "Change Reason": "Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others" }
             },
             "old_filenames": ["13_logging.param"]
         },

ardupilot_methodic_configurator/configuration_steps_ArduPlane.json

@@ -69,7 +69,9 @@
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "",
             "derived_parameters": {
-                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" }
+                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" },
+                "RC5_OPTION": { "New Value": "1 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('RC5_OPTION', 0)", "Change Reason": "ExpressLRS requires RC5 to be used for arming (Arm/Disarm function)" },
+                "FLTMODE_CH": { "New Value": "6 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('FLTMODE_CH', 5)", "Change Reason": "ExpressLRS requires FLTMODE_CH != 5" }
             },
             "rename_connection": "vehicle_components['RC Receiver']['FC Connection']['Type']",
             "old_filenames": []

ardupilot_methodic_configurator/configuration_steps_Heli.json

@@ -69,7 +69,9 @@
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "",
             "derived_parameters": {
-                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" }
+                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" },
+                "RC5_OPTION": { "New Value": "1 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('RC5_OPTION', 0)", "Change Reason": "ExpressLRS requires RC5 to be used for arming (Arm/Disarm function)" },
+                "FLTMODE_CH": { "New Value": "6 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('FLTMODE_CH', 5)", "Change Reason": "ExpressLRS requires FLTMODE_CH != 5" }
             },
             "rename_connection": "vehicle_components['RC Receiver']['FC Connection']['Type']",
             "old_filenames": []

ardupilot_methodic_configurator/configuration_steps_Rover.json

@@ -69,7 +69,9 @@
             "mandatory_text": "100% mandatory (0% optional)",
             "auto_changed_by": "",
             "derived_parameters": {
-                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" }
+                "RC_PROTOCOLS": { "New Value": "vehicle_components['RC Receiver']['FC Connection']['Protocol']", "Change Reason": "Selected in the component editor" },
+                "RC5_OPTION": { "New Value": "1 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('RC5_OPTION', 0)", "Change Reason": "ExpressLRS requires RC5 to be used for arming (Arm/Disarm function)" },
+                "FLTMODE_CH": { "New Value": "6 if vehicle_components['RC Receiver']['FC Connection']['Protocol'] == 'ExpressLRS' else fc_parameters.get('FLTMODE_CH', 5)", "Change Reason": "ExpressLRS requires FLTMODE_CH != 5" }
             },
             "rename_connection": "vehicle_components['RC Receiver']['FC Connection']['Type']",
             "old_filenames": []

ardupilot_methodic_configurator/configuration_steps_strings.py

@@ -1,7 +1,7 @@
 """
 Auto-generated by the update_configuration_steps_translation.py. Do not edit, ALL CHANGES WILL BE LOST.
 
-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
 
@@ -253,6 +253,8 @@ Jump to '47_position_controller.param' file?""")
     _config_steps_strings = _("Derived from vehicle component editor propeller size")
     _config_steps_strings = _("Disable fast harmonic notch logging")
     _config_steps_strings = _("Do not allow arming below this voltage")
+    _config_steps_strings = _("ExpressLRS requires FLTMODE_CH != 5")
+    _config_steps_strings = _("ExpressLRS requires RC5 to be used for arming (Arm/Disarm function)")
     _config_steps_strings = _("Gather data for the offline IMU temperature calibration while the FC is disarmed")
     _config_steps_strings = _("Gyro raw logging no longer required, notch filter setup is complete, this reduces processor load and log file size")
     _config_steps_strings = _("Hover learn will improve this initial guess")
@@ -287,9 +289,9 @@ Jump to '47_position_controller.param' file?""")
     _config_steps_strings = _("Use INS_GYRO_FILTER / 4 as a first guess")
     _config_steps_strings = _("Use MOT_THST_HOVER assuming MOT_THST_HOVER has been correctly learned")
     _config_steps_strings = _("Use VTOL-Quicktune lua script to estimate a good PID starting values")
-    _config_steps_strings = _("Use acc and gyro batch logging on F4 processors, gyro raw logging on others")
+    _config_steps_strings = _("Use acc and gyro batch logging on F4 processors or big props, gyro raw logging on others")
     _config_steps_strings = _("Use lua scripting for VTOL-Quicktune, MagFit automation and wind speed estimation automation")
-    _config_steps_strings = _("Use pre and post filters acc and gyro batch logging on F4 processors, pre-post gyro raw logging on others")
+    _config_steps_strings = _("Use pre and post filters acc and gyro batch logging on F4 processors or big props, pre-post gyro raw logging on others")
     _config_steps_strings = _("Use the first notch filter to filter the noise created by the motors/propellers")
     _config_steps_strings = _("Value for the first couple of flights will be changed later once MOT_THST_HOVER is learned")
     _config_steps_strings = _("allow post flight tuning with Replay")

ardupilot_methodic_configurator/data_model_ardupilot_parameter.py

@@ -1,7 +1,7 @@
 """
 ArduPilot parameter domain 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>
 
@@ -185,7 +185,7 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         value_dirty = (
             self._new_value != self._value_on_file
             if self.is_bitmask or self.is_multiple_choice
-            else is_within_tolerance(self._new_value, self._value_on_file)
+            else not is_within_tolerance(self._new_value, self._value_on_file)
         )
         return value_dirty or self._change_reason != self._change_reason_on_file
 
@@ -259,6 +259,10 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         """Return the change reason string for this parameter."""
         return self._change_reason
 
+    def get_new_value(self) -> float:
+        """Return the new value for this parameter (to be saved to file or uploaded to FC)."""
+        return self._new_value
+
     def get_selected_value_from_dict(self) -> Optional[str]:
         """Return the string representation from the values dictionary for the new value."""
         if self.is_in_values_dict:
@@ -430,6 +434,55 @@ class ArduPilotParameter:  # pylint: disable=too-many-instance-attributes, too-m
         self._change_reason = change_reason
         return True
 
+    def set_forced_or_derived_value(self, value: float) -> None:
+        """
+        Set the value for a forced or derived parameter.
+
+        This method bypasses normal validation and is intended for use only
+        when applying forced or derived parameter values after parameter creation.
+
+        Args:
+            value: The new value to set
+
+        Raises:
+            ValueError: If this parameter is not forced or derived
+
+        """
+        if not (self._is_forced or self._is_derived):
+            raise ValueError(_("This method is only for forced or derived parameters."))
+
+        if self.is_readonly:
+            raise ValueError(_("Readonly parameters cannot be forced or derived."))
+
+        self._new_value = value
+
+    def set_forced_or_derived_change_reason(self, change_reason: str) -> None:
+        """
+        Set the change reason for a forced or derived parameter.
+
+        This method bypasses normal validation and is intended for use only
+        when applying forced or derived parameter change reasons after parameter creation.
+
+        Args:
+            change_reason: The new change reason to set
+
+        Raises:
+            ValueError: If this parameter is not forced or derived
+
+        """
+        if not (self._is_forced or self._is_derived):
+            raise ValueError(_("This method is only for forced or derived parameters."))
+
+        if self.is_readonly:
+            raise ValueError(_("Readonly parameters cannot be forced or derived."))
+
+        self._change_reason = change_reason
+
+    def copy_new_value_to_file(self) -> None:
+        """Copy the new value to the value on file, marking it as saved, resetting the is_dirty property."""
+        self._value_on_file = self._new_value
+        self._change_reason_on_file = self._change_reason
+
 
 class BitmaskHelper:
     """Helper class for working with ArduPilot parameter bitmasks."""

ardupilot_methodic_configurator/data_model_configuration_step.py

@@ -4,7 +4,7 @@ Configuration step data model for parameter processing and domain model creation
 This file contains business logic for processing configuration steps, including parameter
 computation, domain model creation, and connection renaming operations.
 
-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>
 
@@ -28,6 +28,11 @@ class ConfigurationStepProcessor:
     including parameter computation, domain model creation, and connection renaming.
     """
 
+    # Bits indicating ExpressLRS in RC_OPTIONS parameter
+    # 9: Suppress CRSF mode/rate message for ELRS systems
+    # 13: Use 420kbaud for ELRS protocol
+    ELRS_RC_OPTIONS_BITS = (9, 13)
+
     def __init__(self, local_filesystem: LocalFilesystem) -> None:
         """
         Initialize the configuration step processor.
@@ -42,11 +47,18 @@ class ConfigurationStepProcessor:
         # These variables are used by the forced_parameters and derived_parameters in configuration_steps_*.json files
         self.variables = self.local_filesystem.get_eval_variables()
 
-    def process_configuration_step(
+    def process_configuration_step(  # pylint: disable=too-many-locals
         self,
         selected_file: str,
         fc_parameters: dict[str, float],
-    ) -> tuple[dict[str, ArduPilotParameter], bool, list[tuple[str, str]], list[tuple[str, str]]]:
+    ) -> tuple[
+        dict[str, ArduPilotParameter],
+        list[tuple[str, str]],
+        list[tuple[str, str]],
+        set[str],
+        list[tuple[str, str]],
+        ParDict,
+    ]:
         """
         Process a configuration step including parameter computation and domain model creation.
 
@@ -57,67 +69,103 @@ class ConfigurationStepProcessor:
         Returns:
             Tuple containing:
             - Dictionary of ArduPilotParameter domain model objects
-            - Boolean indicating if at least one parameter was edited
             - List of (title, message) tuples for UI error feedback
             - List of (title, message) tuples for UI info feedback
+            - Set of parameter names to remove (duplicates from rename operations)
+            - List of (old_name, new_name) pairs to rename
+            - ParDict of derived parameters to apply to domain model
 
         """
-        at_least_one_param_edited = False
         ui_errors: list[tuple[str, str]] = []
         ui_infos: list[tuple[str, str]] = []
+        duplicates_to_remove: set[str] = set()
+        renames_to_apply: list[tuple[str, str]] = []
+        derived_params_to_apply: ParDict = ParDict()
 
         # Process configuration step operations if configuration steps exist
         if self.local_filesystem.configuration_steps and selected_file in self.local_filesystem.configuration_steps:
             variables = self.variables
             variables["fc_parameters"] = fc_parameters
 
-            # Compute derived parameters
+            # Compute derived parameters (does NOT mutate filesystem.file_parameters)
             error_msg = self.local_filesystem.compute_parameters(
                 selected_file, self.local_filesystem.configuration_steps[selected_file], "derived", variables
             )
             if error_msg:
                 ui_errors.append((_("Error in derived parameters"), error_msg))
-            # Merge derived parameter values
-            elif self.local_filesystem.merge_forced_or_derived_parameters(
-                selected_file, self.local_filesystem.derived_parameters, list(fc_parameters.keys())
-            ):
-                at_least_one_param_edited = True
-
-            # Handle connection renaming
-            connection_edited, ui_infos = self._handle_connection_renaming(selected_file, variables)
-            if connection_edited:
-                at_least_one_param_edited = True
+            # Collect derived parameter values to apply later in domain model
+            elif selected_file in self.local_filesystem.derived_parameters:
+                # Filter derived parameters that exist in FC (if fc_parameters provided)
+                fc_param_names = set(fc_parameters.keys()) if fc_parameters else set()
+                for param_name, param in self.local_filesystem.derived_parameters[selected_file].items():
+                    # Only include if no FC filter OR parameter exists in FC
+                    if not fc_param_names or param_name in fc_param_names:
+                        derived_params_to_apply[param_name] = param
+
+            # Populate new_connection_prefix from rename_connection configuration step
+            if "rename_connection" in self.local_filesystem.configuration_steps.get(selected_file, {}):
+                variables["new_connection_prefix"] = self.local_filesystem.configuration_steps[selected_file][
+                    "rename_connection"
+                ]
+
+            # Calculate connection rename operations (does NOT mutate filesystem.file_parameters)
+            rename_ui_infos, duplicates_to_remove, renames_to_apply = self._handle_connection_renaming(
+                selected_file, variables
+            )
+            ui_infos.extend(rename_ui_infos)
 
         # Create domain model parameters
-        parameters = self._create_domain_model_parameters(selected_file, fc_parameters)
-
-        return parameters, at_least_one_param_edited, ui_errors, ui_infos
-
-    def _handle_connection_renaming(self, selected_file: str, variables: dict) -> tuple[bool, list[tuple[str, str]]]:
+        current_step_parameters = self._create_domain_model_parameters(selected_file, fc_parameters)
+
+        # Check for ExpressLRS and add FLTMODE_CH warning
+        if current_step_parameters.get("RC_OPTIONS") is not None or current_step_parameters.get("FLTMODE_CH") is not None:
+            rc_options = int(fc_parameters.get("RC_OPTIONS", 32))
+            if (rc_options & (1 << self.ELRS_RC_OPTIONS_BITS[0])) or (rc_options & (1 << self.ELRS_RC_OPTIONS_BITS[1])):
+                fltmode_ch = fc_parameters.get("FLTMODE_CH", 5)
+                if fltmode_ch == 5:
+                    ui_infos.append(
+                        (
+                            _("ExpressLRS Configuration Warning"),
+                            _(
+                                "FLTMODE_CH must be set to a channel other than 5 (currently set to 5).\n"
+                                "Please change FLTMODE_CH to a different channel (e.g., 6, 7, 8, etc.)\n"
+                                "to avoid conflicts with the required RC5 arming channel."
+                            ),
+                        )
+                    )
+
+        return current_step_parameters, ui_errors, ui_infos, duplicates_to_remove, renames_to_apply, derived_params_to_apply
+
+    def _handle_connection_renaming(
+        self, selected_file: str, variables: dict
+    ) -> tuple[list[tuple[str, str]], set[str], list[tuple[str, str]]]:
         """
-        Handle connection renaming operations for the selected file.
+        Calculate connection renaming operations for the selected file.
+
+        This method calculates what renames should happen but does NOT modify
+        filesystem.file_parameters. The operations are returned for the caller
+        to apply to the domain model.
 
         Args:
             selected_file: The name of the selected parameter file
-            variables: Variables dictionary for evaluation
+            variables: Dictionary of variables for parameter evaluation
 
         Returns:
             Tuple containing:
-            - True if parameters were modified, False otherwise
             - List of (title, message) tuples for UI info feedback
+            - Set of parameter names to remove (duplicates)
+            - List of (old_name, new_name) pairs to rename
 
         """
-        if "rename_connection" not in self.local_filesystem.configuration_steps[selected_file]:
-            return False, []
+        new_connection_prefix = variables.get("new_connection_prefix")
+        if not new_connection_prefix:
+            return [], set(), []
 
-        new_connection_prefix = self.local_filesystem.configuration_steps[selected_file]["rename_connection"]
-
-        # Apply renames to the parameters dictionary
-        duplicated_parameters, renamed_pairs = self._apply_connection_renames(
+        # Calculate rename operations WITHOUT mutating file_parameters
+        duplicated_parameters, renamed_pairs = self._calculate_connection_rename_operations(
             self.local_filesystem.file_parameters[selected_file], new_connection_prefix, variables
         )
 
-        at_least_one_param_edited = False
         ui_infos: list[tuple[str, str]] = []
 
         # Handle duplicated parameters
@@ -125,7 +173,6 @@ class ConfigurationStepProcessor:
             logging_info(_("Removing duplicate parameter %s"), old_name)
             info_msg = _("The parameter '{old_name}' was removed due to duplication.")
             ui_infos.append((_("Parameter Removed"), info_msg.format(**locals())))
-            at_least_one_param_edited = True
 
         # Handle renamed parameters
         for old_name, new_name in renamed_pairs:
@@ -135,9 +182,8 @@ class ConfigurationStepProcessor:
                 "to obey the flight controller connection defined in the component editor window."
             )
             ui_infos.append((_("Parameter Renamed"), info_msg.format(**locals())))
-            at_least_one_param_edited = True
 
-        return at_least_one_param_edited, ui_infos
+        return ui_infos, duplicated_parameters, renamed_pairs
 
     def _create_domain_model_parameters(
         self, selected_file: str, fc_parameters: dict[str, float]
@@ -225,21 +271,25 @@ class ConfigurationStepProcessor:
         return renames
 
     @staticmethod
-    def _apply_connection_renames(
-        parameters: dict[str, Any], new_connection_prefix: str, variables: Optional[dict[str, Any]] = None
+    def _calculate_connection_rename_operations(
+        parameters: ParDict, new_connection_prefix: str, variables: Optional[dict[str, Any]] = None
     ) -> tuple[set[str], list[tuple[str, str]]]:
         """
-        Apply connection prefix renames to a parameter dictionary.
+        Calculate connection prefix rename operations without mutating the parameters dictionary.
+
+        This method determines which parameters should be renamed and which are duplicates,
+        but does NOT modify the input dictionary. The caller is responsible for applying
+        the operations to their domain model.
 
         Args:
-            parameters: Dictionary of parameter objects to rename, it will modify it
+            parameters: Dictionary of parameter objects to analyze (NOT modified)
             new_connection_prefix: The new prefix to apply
             variables: Optional dictionary of variables for evaluation
 
         Returns:
             Tuple containing:
-            - Set of duplicated parameter names that got removed
-            - List of (old_name, new_name) pairs that were renamed
+            - Set of parameter names that should be removed (duplicates)
+            - List of (old_name, new_name) pairs that should be renamed
 
         """
         if variables:
@@ -249,18 +299,18 @@ class ConfigurationStepProcessor:
         # Generate the rename mapping
         renames = ConfigurationStepProcessor._generate_connection_renames(list(parameters.keys()), new_connection_prefix)
 
-        # Track unique new names and actual renames performed
-        new_names = set()
-        duplicates = set()
+        # Track unique new names and actual renames to perform
+        # Initialize with all existing parameter names to prevent conflicts
+        new_names = set(parameters.keys())
+        duplicates: set[str] = set()
         renamed_pairs = []
         for old_name, new_name in renames.items():
             if new_name in new_names:
-                parameters.pop(old_name)
-                duplicates.add(old_name)
+                # Do not perform rename due to conflict, let the user handle it
+                pass
             else:
                 new_names.add(new_name)
                 if new_name != old_name:
-                    parameters[new_name] = parameters.pop(old_name)
                     renamed_pairs.append((old_name, new_name))
 
         return duplicates, renamed_pairs

ardupilot_methodic_configurator/data_model_fc_ids.py

@@ -26,7 +26,7 @@ VID_VENDOR_DICT: dict[int, list[str]] = {
 # Maps USB VID,PID tuple to product name(s)
 VID_PID_PRODUCT_DICT: dict[tuple[int, int], list[str]] = {
     (0x26AC, 0x1124): ["CZOEMrevG"],
-    (0x1209, 0x5741): ["AcctonGodwit_GA1", "ACNS-CM4Pilot", "ACNS-F405AIO", "AEDROXH7", "AeroCogito-H7Digital", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "ARK_PI6X", "ARKV6X", "AtomRCF405NAVI", "ATOMRCF405NAVI-Deluxe", "BeastF7", "BeastF7v2", "BeastH7", "BeastH7v2", "BETAFPV-F405", "BirdCANdy", "BlitzF745", "BlitzF745AIO", "BlitzH743Pro", "BlitzMiniF745", "BlitzWingH743", "BotBloxDroneNet", "BOTWINGF405", "BrahmaF4", "BROTHERHOBBYF405v3", "BROTHERHOBBYH743", "C-RTK2-HP", "CarbonixF405", "CBU-H7-LC-Stamp", "CBU-H7-Stamp", "CORVON405V2_1", "CORVON743V1", "CrazyF405", "crazyflie2", "CSKY405", "CUAV-7-Nano", "CUAV-Nora", "CUAV-Pixhack-v3", "CUAV-V6X-v2", "CUAV-X25-EVO", "CUAV-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "F4BY_H743", "FlyingMoonF407", "FlyingMoonF427", "FlyingMoonH743", "FlywooF405HD-AIOv2", "FlywooF405Pro", "FlywooF405S-AIO", "FlywooF745", "FlywooF745Nano", "FlywooH743Pro", "fmuv2", "fmuv3", "fmuv5", "FoxeerF405v2", "FoxeerH743v1", "FreeflyRTK", "GEPRC_TAKER_H743", "GEPRCF745BTHD", "UltraBlue", "%BOARD%", "HEEWING-F405", "HEEWING-F405v2", "Here4AP", "Here4FC", "HolybroF4_PMU", "IFLIGHT_2RAW_H7", "JFB100", "JFB-110", "JHEM_JHEF405", "JHEMCU-GSF405A", "JHEMCU-GSF405A-RX2", "JHEMCU-H743HD", "JHEMCUF405PRO", "JHEMCUF405WING", "KakuteF4", "KakuteF4-Wing", "KakuteF4Mini", "KakuteF7", "KakuteF7Mini", "KakuteH7", "KakuteH7-Wing", "KakuteH7Mini", "KakuteH7Mini-Nand", "KakuteH7v2", "LongBowF405WING", "LumenierLUXF765-NDAA", "luminousbee4", "luminousbee5", "MambaF405-2022", "MambaF405v2", "MambaH743v4", "MatekF405", "MatekF405-CAN", "MatekF405-STD", "MatekF405-TE", "MatekF405-Wing", "MatekF765-SE", "MatekF765-Wing", "MatekH743", "MatekH7A3", "MazzyStarDrone", "MFE_POS3_CAN", "MFT-SEMA100", "MicoAir405Mini", "MicoAir405v2", "MicoAir743", "MicoAir743-AIO", "MicoAir743v2", "mindpx-v2", "mini-pix", "modalai_fc-v1", "mRoControlZeroClassic", "mRoControlZeroF7", "mRoControlZeroH7", "mRoControlZeroOEMH7", "mRoCZeroOEMH7", "mRoNexus", "mRoPixracerPro", "mRoX21", "mRoX21-777", "MUPilot", "NarinFC-H5", "NarinFC-H7", "Nucleo-L476", "Nucleo-L496", "NucleoH743", "NucleoH755", "NxtPX4v2", "omnibusf4", "omnibusf4pro", "omnibusf4pro-one", "omnibusf4v6", "OMNIBUSF7V2", "OmnibusNanoV6", "ORBITH743", "OrqaF405Pro", "OrqaH7QuadCore", "PH4-mini", "PixC4-Jetson", "PixFlamingo", "Pixhawk1", "Pixhawk1-1M", "Pixhawk4", "Pixhawk6X", "Pixhawk6X-PPPGW", "PixPilot-C3", "PixPilot-V3", "PixPilot-V6", "PixPilot-V6PRO", "Pixracer", "PixSurveyA1", "PixSurveyA1-IND", "PixSurveyA2-IND", "QioTekAdeptF407", "QioTekZealotF427", "QioTekZealotH743", "R9Pilot", "RadiolinkF405", "RadiolinkPIX6", "RADIX2HD", "ReaperF745", "revo-mini", "revo-mini-i2c", "revo-mini-sd", "rFCU", "SDMODELH7V1", "SDMODELH7V2", "SequreH743", "Sierra-F405", "Sierra-F412", "Sierra-F9P", "Sierra-PrecisionPoint", "SIYI_N7", "SkySakuraH743", "SkystarsF405v2", "SkystarsH7HD", "SkystarsH7HDv2", "skyviper-f412-rev1", "skyviper-journey", "skyviper-v2450", "sparky2", "SPEDIXF405", "SPEDIXH743", "speedybeef4", "SpeedyBeeF405AIO", "SpeedyBeeF405Mini", "SpeedyBeeF405WING", "speedybeef4v3", "speedybeef4v4", "SPRacingH7", "SPRacingH7RF", "StellarF4", "StellarF4V2", "StellarH7V2", "SuccexF4", "SULILGH7-P1-P2", "SVehicle-E2", "sw-boom-f407", "sw-nav-f405", "sw-spar-f407", "Swan-K1", "TBS-Colibri-F7", "TBS_LUCID_H7", "TBS_LUCID_H7_WING", "TBS_LUCID_PRO", "TMotorH743", "uav-dev-fc-um982", "VUAV-V7pro", "X-MAV-AP-H743v2", "YARIV6X", "YJUAV_A6", "YJUAV_A6SE", "YJUAV_A6SE_H743", "YJUAV_A6Ultra", "ZeroOneX6", "ZeroOneX6_Air"],
+    (0x1209, 0x5741): ["AcctonGodwit_GA1", "ACNS-CM4Pilot", "ACNS-F405AIO", "AEDROXH7", "AeroCogito-H7Digital", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "ARK_PI6X", "ARKV6X", "AtomRCF405NAVI", "ATOMRCF405NAVI-Deluxe", "BeastF7", "BeastF7v2", "BeastH7", "BeastH7v2", "BETAFPV-F405", "BirdCANdy", "BlitzF745", "BlitzF745AIO", "BlitzH743Pro", "BlitzMiniF745", "BlitzWingH743", "BotBloxDroneNet", "BOTWINGF405", "BrahmaF4", "BROTHERHOBBYF405v3", "BROTHERHOBBYH743", "C-RTK2-HP", "CarbonixF405", "CBU-H7-LC-Stamp", "CBU-H7-Stamp", "CORVON405V2_1", "CORVON743V1", "CrazyF405", "crazyflie2", "CSKY405", "CUAV-7-Nano", "CUAV-Nora", "CUAV-Pixhack-v3", "CUAV-V6X-v2", "CUAV-X25-EVO", "CUAV-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "F4BY_H743", "FlyingMoonF407", "FlyingMoonF427", "FlyingMoonH743", "FlysparkF4", "FlywooF405HD-AIOv2", "FlywooF405Pro", "FlywooF405S-AIO", "FlywooF745", "FlywooF745Nano", "FlywooH743Pro", "fmuv2", "fmuv3", "fmuv5", "FoxeerF405v2", "FoxeerH743v1", "FreeflyRTK", "GEPRC_TAKER_H743", "GEPRCF745BTHD", "UltraBlue", "%BOARD%", "HEEWING-F405", "HEEWING-F405v2", "Here4AP", "Here4FC", "HolybroF4_PMU", "IFLIGHT_2RAW_H7", "JFB100", "JFB-110", "JHEM_JHEF405", "JHEMCU-GSF405A", "JHEMCU-GSF405A-RX2", "JHEMCU-H743HD", "JHEMCUF405PRO", "JHEMCUF405WING", "KakuteF4", "KakuteF4-Wing", "KakuteF4Mini", "KakuteF7", "KakuteF7Mini", "KakuteH7", "KakuteH7-Wing", "KakuteH7Mini", "KakuteH7Mini-Nand", "KakuteH7v2", "LongBowF405WING", "LumenierLUXF765-NDAA", "luminousbee4", "luminousbee5", "MambaF405-2022", "MambaF405v2", "MambaH743v4", "MatekF405", "MatekF405-CAN", "MatekF405-STD", "MatekF405-TE", "MatekF405-Wing", "MatekF765-SE", "MatekF765-Wing", "MatekH743", "MatekH7A3", "MazzyStarDrone", "MFE_POS3_CAN", "MFT-SEMA100", "MicoAir405Mini", "MicoAir405v2", "MicoAir743", "MicoAir743-AIO", "MicoAir743v2", "mindpx-v2", "mini-pix", "modalai_fc-v1", "mRoControlZeroClassic", "mRoControlZeroF7", "mRoControlZeroH7", "mRoControlZeroOEMH7", "mRoCZeroOEMH7", "mRoNexus", "mRoPixracerPro", "mRoX21", "mRoX21-777", "MUPilot", "NarinFC-H5", "NarinFC-H7", "NarinFC-X3", "Nucleo-L476", "Nucleo-L496", "NucleoH743", "NucleoH755", "NxtPX4v2", "omnibusf4", "omnibusf4pro", "omnibusf4pro-one", "omnibusf4v6", "OMNIBUSF7V2", "OmnibusNanoV6", "ORBITH743", "OrqaF405Pro", "OrqaH7QuadCore", "PH4-mini", "PixC4-Jetson", "PixFlamingo", "Pixhawk1", "Pixhawk1-1M", "Pixhawk4", "Pixhawk6X", "Pixhawk6X-PPPGW", "PixPilot-C3", "PixPilot-V3", "PixPilot-V6", "PixPilot-V6PRO", "Pixracer", "PixSurveyA1", "PixSurveyA1-IND", "PixSurveyA2-IND", "QioTekAdeptF407", "QioTekZealotF427", "QioTekZealotH743", "R9Pilot", "RadiolinkF405", "RadiolinkPIX6", "RADIX2HD", "ReaperF745", "revo-mini", "revo-mini-i2c", "revo-mini-sd", "rFCU", "SDMODELH7V1", "SDMODELH7V2", "SequreH743", "Sierra-F405", "Sierra-F412", "Sierra-F9P", "Sierra-PrecisionPoint", "SIYI_N7", "SkySakuraH743", "SkystarsF405v2", "SkystarsH7HD", "SkystarsH7HDv2", "skyviper-f412-rev1", "skyviper-journey", "skyviper-v2450", "sparky2", "SPEDIXF405", "SPEDIXH743", "speedybeef4", "SpeedyBeeF405AIO", "SpeedyBeeF405Mini", "SpeedyBeeF405WING", "speedybeef4v3", "speedybeef4v4", "SPRacingH7", "SPRacingH7RF", "StellarF4", "StellarF4V2", "StellarH7V2", "SuccexF4", "SULILGH7-P1-P2", "SVehicle-E2", "sw-boom-f407", "sw-nav-f405", "sw-spar-f407", "Swan-K1", "TBS-Colibri-F7", "TBS_LUCID_H7", "TBS_LUCID_H7_WING", "TBS_LUCID_H7_WING_AIO", "TBS_LUCID_PRO", "TMotorH743", "uav-dev-fc-um982", "VUAV-V7pro", "X-MAV-AP-H743v2", "YARIV6X", "YJUAV_A6", "YJUAV_A6SE", "YJUAV_A6SE_H743", "YJUAV_A6Ultra", "ZeroOneX6", "ZeroOneX6_Air"],
     (0x2DAE, 0x1011): ["CubeBlack", "CubeGreen-solo"],
     (0x2DAE, 0x1101): ["CubeBlack+"],
     (0x2DAE, 0x1016): ["CubeOrange"],
@@ -49,7 +49,7 @@ VID_PID_PRODUCT_DICT: dict[tuple[int, int], list[str]] = {
     (0x27AC, 0x1351): ["VRUBrain-v51"],
 }
 
-# Maps 16-bit APJ board ID to board name(s) for 266 supported boards
+# Maps 16-bit APJ board ID to board name(s) for 269 supported boards
 APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1124: ["3DRControlZeroG"],
     7120: ["AcctonGodwit_GA1"],
@@ -126,6 +126,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1067: ["FlyingMoonF407"],
     1068: ["FlyingMoonF427"],
     1112: ["FlyingMoonH743"],
+    1361: ["FlysparkF4"],
     1180: ["FlywooF405HD-AIOv2"],
     1137: ["FlywooF405Pro"],
     1099: ["FlywooF405S-AIO"],
@@ -194,6 +195,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1222: ["MUPilot"],
     1188: ["NarinFC-H5"],
     1183: ["NarinFC-H7"],
+    1199: ["NarinFC-X3"],
     1051: ["Nucleo-L476"],
     1047: ["Nucleo-L496"],
     1159: ["NxtPX4v2"],
@@ -262,6 +264,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     6000: ["sw-spar-f407"],
     5250: ["TBS_LUCID_H7"],
     5253: ["TBS_LUCID_H7_WING"],
+    5254: ["TBS_LUCID_H7_WING_AIO"],
     5251: ["TBS_LUCID_PRO"],
     212: ["thepeach-k1"],
     213: ["thepeach-r1"],
@@ -282,7 +285,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     5600: ["ZeroOneX6", "ZeroOneX6_Air"],
 }
 
-# Maps 16-bit APJ board ID to board vendor for 266 supported boards
+# Maps 16-bit APJ board ID to board vendor for 269 supported boards
 APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1124: ["3DR"],  # 3DRControlZeroG
     7120: ["ArduPilot"],  # AcctonGodwit_GA1
@@ -359,6 +362,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1067: ["ArduPilot"],  # FlyingMoonF407
     1068: ["ArduPilot"],  # FlyingMoonF427
     1112: ["ArduPilot"],  # FlyingMoonH743
+    1361: ["ArduPilot"],  # FlysparkF4
     1180: ["ArduPilot"],  # FlywooF405HD-AIOv2
     1137: ["ArduPilot"],  # FlywooF405Pro
     1099: ["ArduPilot"],  # FlywooF405S-AIO
@@ -427,6 +431,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1222: ["ArduPilot"],  # MUPilot
     1188: ["ArduPilot"],  # NarinFC-H5
     1183: ["ArduPilot"],  # NarinFC-H7
+    1199: ["ArduPilot"],  # NarinFC-X3
     1051: ["ArduPilot"],  # Nucleo-L476
     1047: ["ArduPilot"],  # Nucleo-L496
     1159: ["ArduPilot"],  # NxtPX4v2
@@ -495,6 +500,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     6000: ["ArduPilot"],  # sw-spar-f407
     5250: ["ArduPilot"],  # TBS_LUCID_H7
     5253: ["ArduPilot"],  # TBS_LUCID_H7_WING
+    5254: ["ArduPilot"],  # TBS_LUCID_H7_WING_AIO
     5251: ["ArduPilot"],  # TBS_LUCID_PRO
     212: ["ThePeach"],  # thepeach-k1
     213: ["ThePeach"],  # thepeach-r1
@@ -515,7 +521,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     5600: ["ArduPilot"],  # ZeroOneX6, ZeroOneX6_Air
 }
 
-# Maps 16-bit APJ board ID to MCU series for 266 supported boards
+# Maps 16-bit APJ board ID to MCU series for 269 supported boards
 APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1124: ["STM32H7xx"],  # 3DRControlZeroG
     7120: ["STM32H7xx"],  # AcctonGodwit_GA1
@@ -592,6 +598,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1067: ["STM32F4xx"],  # FlyingMoonF407
     1068: ["STM32F4xx"],  # FlyingMoonF427
     1112: ["STM32H7xx"],  # FlyingMoonH743
+    1361: ["STM32F4xx"],  # FlysparkF4
     1180: ["STM32F4xx"],  # FlywooF405HD-AIOv2
     1137: ["STM32F4xx"],  # FlywooF405Pro
     1099: ["STM32F4xx"],  # FlywooF405S-AIO
@@ -660,6 +667,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1222: ["STM32F7xx"],  # MUPilot
     1188: ["STM32H7xx"],  # NarinFC-H5
     1183: ["STM32H7xx"],  # NarinFC-H7
+    1199: ["STM32H7xx"],  # NarinFC-X3
     1051: ["STM32L476"],  # Nucleo-L476
     1047: ["STM32L496"],  # Nucleo-L496
     1159: ["STM32H7xx"],  # NxtPX4v2
@@ -728,6 +736,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     6000: ["STM32F4xx"],  # sw-spar-f407
     5250: ["STM32H7xx"],  # TBS_LUCID_H7
     5253: ["STM32H7xx"],  # TBS_LUCID_H7_WING
+    5254: ["STM32H7xx"],  # TBS_LUCID_H7_WING_AIO
     5251: ["STM32F4xx"],  # TBS_LUCID_PRO
     212: ["STM32F4xx"],  # thepeach-k1
     213: ["STM32F4xx"],  # thepeach-r1
@@ -748,12 +757,12 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     5600: ["STM32H7xx"],  # ZeroOneX6, ZeroOneX6_Air
 }
 
-# Maps MCU series to 16-bit APJ board ID for 266 supported boards
+# Maps MCU series to 16-bit APJ board ID for 269 supported boards
 MCU_SERIES_APJ_BOARD_ID_DICT: dict[str, list[int]] = {
     "CKS32F4xx": [1134, 1065],  # AR-F407SmartBat, QioTekAdeptF407
-    "STM32F4xx": [1115, 1116, 128, 83, 1078, 1143, 1125, 1044, 2501, 1184, 5811, 1085, 1064, 1187, 1177, 12, 1158, 9, 1003, 1190, 5800, 13, 135, 20, 1530, 1067, 1068, 1180, 1137, 1099, 1157, 1119, 5401, 1081, 1059, 1412, 1169, 122, 5406, 1030, 1422, 11, 1038, 1019, 125, 1014, 1054, 127, 6101, 1161, 1150, 88, 3, 1002, 131, 137, 133, 1155, 1140, 1096, 1076, 1107, 1021, 1417, 124, 1052, 1055, 1034, 1095, 1201, 130, 1197, 134, 5271, 1135, 1106, 1082, 1136, 1500, 1504, 1011, 6001, 6002, 6000, 5251, 212, 213, 1151, 1152, 1154, 1910, 1351],  # ACNS-CM4Pilot, ACNS-F405AIO, airbotf4, ARK_CANNODE, AtomRCF405NAVI, ATOMRCF405NAVI-Deluxe, BETAFPV-F405, BirdCANdy, BOTWINGF405, BrahmaF4, BROTHERHOBBYF405v3, C-RTK2-HP, CarbonixF405, CORVON405V2_1, CrazyF405, crazyflie2, CSKY405, CUAV-Pixhack-v3, CubeBlack, CubeGreen-solo, CubePurple, CubeSolo, fmuv2, fmuv3, mRoX21, Pixhawk1, Pixhawk1-1M, skyviper-f412-rev1, skyviper-journey, skyviper-v2450, CubeBlack+, DAKEFPVF405, DroneerF405, DrotekP3Pro, F35Lightning, F4BY, F4BY_F427, FlyingMoonF407, FlyingMoonF427, FlywooF405HD-AIOv2, FlywooF405Pro, FlywooF405S-AIO, FoxeerF405v2, HEEWING-F405, HEEWING-F405v2, HolybroF4_PMU, JHEM_JHEF405, JHEMCU-GSF405A, JHEMCU-GSF405A-RX2, JHEMCUF405PRO, JHEMCUF405WING, KakuteF4, KakuteF4-Wing, KakuteF4Mini, LongBowF405WING, luminousbee4, Pixracer, MambaF405-2022, MambaF405v2, MatekF405, MatekF405-STD, MatekF405-CAN, MatekF405-TE, MatekF405-Wing, MFE_POS3_CAN, MicoAir405Mini, MicoAir405v2, mindpx-v2, mini-pix, omnibusf4, omnibusf4pro, omnibusf4pro-one, omnibusf4v6, OmnibusNanoV6, OrqaF405Pro, PixPilot-C3, PixPilot-V3, PixSurveyA1, PixSurveyA1-IND, QioTekZealotF427, RadiolinkF405, revo-mini, revo-mini-i2c, revo-mini-sd, Sierra-F405, Sierra-F412, Sierra-F9P, Sierra-PrecisionPoint, SkystarsF405v2, sparky2, SPEDIXF405, speedybeef4, SpeedyBeeF405AIO, SpeedyBeeF405Mini, SpeedyBeeF405WING, speedybeef4v3, speedybeef4v4, StellarF4, StellarF4V2, SuccexF4, sw-boom-f407, sw-nav-f405, sw-spar-f407, TBS_LUCID_PRO, thepeach-k1, thepeach-r1, VRBrain-v51, VRBrain-v52, VRBrain-v54, VRCore-v10, VRUBrain-v51
+    "STM32F4xx": [1115, 1116, 128, 83, 1078, 1143, 1125, 1044, 2501, 1184, 5811, 1085, 1064, 1187, 1177, 12, 1158, 9, 1003, 1190, 5800, 13, 135, 20, 1530, 1067, 1068, 1361, 1180, 1137, 1099, 1157, 1119, 5401, 1081, 1059, 1412, 1169, 122, 5406, 1030, 1422, 11, 1038, 1019, 125, 1014, 1054, 127, 6101, 1161, 1150, 88, 3, 1002, 131, 137, 133, 1155, 1140, 1096, 1076, 1107, 1021, 1417, 124, 1052, 1055, 1034, 1095, 1201, 130, 1197, 134, 5271, 1135, 1106, 1082, 1136, 1500, 1504, 1011, 6001, 6002, 6000, 5251, 212, 213, 1151, 1152, 1154, 1910, 1351],  # ACNS-CM4Pilot, ACNS-F405AIO, airbotf4, ARK_CANNODE, AtomRCF405NAVI, ATOMRCF405NAVI-Deluxe, BETAFPV-F405, BirdCANdy, BOTWINGF405, BrahmaF4, BROTHERHOBBYF405v3, C-RTK2-HP, CarbonixF405, CORVON405V2_1, CrazyF405, crazyflie2, CSKY405, CUAV-Pixhack-v3, CubeBlack, CubeGreen-solo, CubePurple, CubeSolo, fmuv2, fmuv3, mRoX21, Pixhawk1, Pixhawk1-1M, skyviper-f412-rev1, skyviper-journey, skyviper-v2450, CubeBlack+, DAKEFPVF405, DroneerF405, DrotekP3Pro, F35Lightning, F4BY, F4BY_F427, FlyingMoonF407, FlyingMoonF427, FlysparkF4, FlywooF405HD-AIOv2, FlywooF405Pro, FlywooF405S-AIO, FoxeerF405v2, HEEWING-F405, HEEWING-F405v2, HolybroF4_PMU, JHEM_JHEF405, JHEMCU-GSF405A, JHEMCU-GSF405A-RX2, JHEMCUF405PRO, JHEMCUF405WING, KakuteF4, KakuteF4-Wing, KakuteF4Mini, LongBowF405WING, luminousbee4, Pixracer, MambaF405-2022, MambaF405v2, MatekF405, MatekF405-STD, MatekF405-CAN, MatekF405-TE, MatekF405-Wing, MFE_POS3_CAN, MicoAir405Mini, MicoAir405v2, mindpx-v2, mini-pix, omnibusf4, omnibusf4pro, omnibusf4pro-one, omnibusf4v6, OmnibusNanoV6, OrqaF405Pro, PixPilot-C3, PixPilot-V3, PixSurveyA1, PixSurveyA1-IND, QioTekZealotF427, RadiolinkF405, revo-mini, revo-mini-i2c, revo-mini-sd, Sierra-F405, Sierra-F412, Sierra-F9P, Sierra-PrecisionPoint, SkystarsF405v2, sparky2, SPEDIXF405, speedybeef4, SpeedyBeeF405AIO, SpeedyBeeF405Mini, SpeedyBeeF405WING, speedybeef4v3, speedybeef4v4, StellarF4, StellarF4V2, SuccexF4, sw-boom-f407, sw-nav-f405, sw-spar-f407, TBS_LUCID_PRO, thepeach-k1, thepeach-r1, VRBrain-v51, VRBrain-v52, VRBrain-v54, VRCore-v10, VRUBrain-v51
     "STM32F7xx": [55, 1026, 1057, 1164, 1117, 1163, 50, 120, 1027, 1042, 1028, 1501, 1084, 123, 145, 4500, 143, 188, 41775, 141, 136, 1222, 121, 1131, 51, 1008, 1410, 1074],  # AIRLink, BeastF7, BeastF7v2, BlitzF745, BlitzF745AIO, BlitzMiniF745, CUAVv5, CUAVv5Nano, fmuv5, PH4-mini, Pix32v5, Pixhawk4, Swan-K1, TBS-Colibri-F7, CubeYellow, FlywooF745, FlywooF745Nano, FreeflyRTK, GEPRCF745BTHD, JFB100, KakuteF7, KakuteF7Mini, LumenierLUXF765-NDAA, MatekF765-SE, MatekF765-Wing, MazzyStarDrone, modalai_fc-v1, mRoControlZeroF7, mRoX21-777, MUPilot, OMNIBUSF7V2, PixFlamingo-F767, Pixhawk5X, R9Pilot, RadiolinkPIX6, ReaperF745
-    "STM32H7xx": [1124, 7120, 1198, 4300, 7110, 2024, 5200, 1146, 5210, 59, 58, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 7001, 7002, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 1531, 1112, 1181, 1089, 1502, 1071, 146, 1043, 1173, 1110, 1411, 1048, 1105, 1058, 1315, 1029, 1073, 1013, 1149, 2000, 1166, 1176, 1179, 1022, 1023, 1024, 1015, 1017, 1188, 1183, 1159, 1191, 1204, 1032, 56, 53, 1408, 1083, 1160, 6104, 1036, 1118, 1102, 1111, 1167, 1195, 1123, 2714, 1075, 1196, 1060, 1108, 1503, 2005, 6110, 5250, 5253, 1138, 5230, 7100, 1174, 1234, 1113, 1127, 1141, 1144, 5600],  # 3DRControlZeroG, AcctonGodwit_GA1, AEDROXH7, AeroCogito-H7Digital, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARK_PI6X, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-V6X-v2, CUAV-X25-EVO, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, F4BY_H743, FlyingMoonH743, FlywooH743Pro, FoxeerH743v1, GEPRC_TAKER_H743, GreenSightUltraBlue, H757I_EVAL, H757I_EVAL_intf, Here4AP, Here4FC, IFLIGHT_2RAW_H7, JFB110, JHEMCU-H743HD, KakuteH7, KakuteH7v2, KakuteH7-Wing, KakuteH7Mini, KakuteH7Mini-Nand, kha_eth, luminousbee5, MambaH743v4, MatekH743, MatekH7A3, MFT-SEMA100, MicoAir743, MicoAir743-AIO, MicoAir743v2, mRoControlZeroClassic, mRoControlZeroH7, mRoControlZeroOEMH7, mRoCZeroOEMH7, mRoNexus, mRoPixracerPro, NarinFC-H5, NarinFC-H7, NxtPX4v2, ORBITH743, OrqaH7QuadCore, PixC4-Jetson, Pixhawk6C, Pixhawk6X, Pixhawk6X-PPPGW, PixPilot-V6, PixPilot-V6PRO, PixSurveyA2-IND, QioTekZealotH743, RADIX2HD, rFCU, SDMODELH7V1, SDMODELH7V2, SequreH743, SIYI_N7, SkySakuraH743, SkystarsH7HD, SkystarsH7HDv2, SPEDIXH743, SPRacingH7, SPRacingH7RF, StellarH7V2, SULILGH7-P1-P2, SVehicle-E2, TBS_LUCID_H7, TBS_LUCID_H7_WING, TMotorH743, uav-dev-fc-um982, VUAV-V7pro, X-MAV-AP-H743v2, YARIV6X, YJUAV_A6, YJUAV_A6SE, YJUAV_A6SE_H743, YJUAV_A6Ultra, ZeroOneX6, ZeroOneX6_Air
+    "STM32H7xx": [1124, 7120, 1198, 4300, 7110, 2024, 5200, 1146, 5210, 59, 58, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 7001, 7002, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 1531, 1112, 1181, 1089, 1502, 1071, 146, 1043, 1173, 1110, 1411, 1048, 1105, 1058, 1315, 1029, 1073, 1013, 1149, 2000, 1166, 1176, 1179, 1022, 1023, 1024, 1015, 1017, 1188, 1183, 1199, 1159, 1191, 1204, 1032, 56, 53, 1408, 1083, 1160, 6104, 1036, 1118, 1102, 1111, 1167, 1195, 1123, 2714, 1075, 1196, 1060, 1108, 1503, 2005, 6110, 5250, 5253, 5254, 1138, 5230, 7100, 1174, 1234, 1113, 1127, 1141, 1144, 5600],  # 3DRControlZeroG, AcctonGodwit_GA1, AEDROXH7, AeroCogito-H7Digital, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARK_PI6X, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-V6X-v2, CUAV-X25-EVO, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, F4BY_H743, FlyingMoonH743, FlywooH743Pro, FoxeerH743v1, GEPRC_TAKER_H743, GreenSightUltraBlue, H757I_EVAL, H757I_EVAL_intf, Here4AP, Here4FC, IFLIGHT_2RAW_H7, JFB110, JHEMCU-H743HD, KakuteH7, KakuteH7v2, KakuteH7-Wing, KakuteH7Mini, KakuteH7Mini-Nand, kha_eth, luminousbee5, MambaH743v4, MatekH743, MatekH7A3, MFT-SEMA100, MicoAir743, MicoAir743-AIO, MicoAir743v2, mRoControlZeroClassic, mRoControlZeroH7, mRoControlZeroOEMH7, mRoCZeroOEMH7, mRoNexus, mRoPixracerPro, NarinFC-H5, NarinFC-H7, NarinFC-X3, NxtPX4v2, ORBITH743, OrqaH7QuadCore, PixC4-Jetson, Pixhawk6C, Pixhawk6X, Pixhawk6X-PPPGW, PixPilot-V6, PixPilot-V6PRO, PixSurveyA2-IND, QioTekZealotH743, RADIX2HD, rFCU, SDMODELH7V1, SDMODELH7V2, SequreH743, SIYI_N7, SkySakuraH743, SkystarsH7HD, SkystarsH7HDv2, SPEDIXH743, SPRacingH7, SPRacingH7RF, StellarH7V2, SULILGH7-P1-P2, SVehicle-E2, TBS_LUCID_H7, TBS_LUCID_H7_WING, TBS_LUCID_H7_WING_AIO, TMotorH743, uav-dev-fc-um982, VUAV-V7pro, X-MAV-AP-H743v2, YARIV6X, YJUAV_A6, YJUAV_A6SE, YJUAV_A6SE_H743, YJUAV_A6Ultra, ZeroOneX6, ZeroOneX6_Air
     "STM32L476": [1051],  # Nucleo-L476
     "STM32L496": [1047],  # Nucleo-L496
     "STM32L4xx": [1090],  # PixFlamingo

ardupilot_methodic_configurator/data_model_motor_test.py

@@ -1,7 +1,7 @@
 """
 Data model for motor test functionality.
 
-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>