ardupilot-methodic-configurator 2.0.3__py3-none-any.whl → 2.0.5__py3-none-any.whl

ardupilot_methodic_configurator/data_model_configuration_step.py

@@ -0,0 +1,262 @@
+"""
+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
+
+SPDX-FileCopyrightText: 2024-2025 Amilcar do Carmo Lucas <amilcar.lucas@iav.de>
+
+SPDX-License-Identifier: GPL-3.0-or-later
+"""
+
+from logging import info as logging_info
+from typing import Any, Optional
+
+from ardupilot_methodic_configurator import _
+from ardupilot_methodic_configurator.backend_filesystem import LocalFilesystem
+from ardupilot_methodic_configurator.data_model_ardupilot_parameter import ArduPilotParameter
+
+
+class ConfigurationStepProcessor:
+    """
+    Handles configuration step processing operations.
+
+    This class encapsulates the business logic for processing configuration steps,
+    including parameter computation, domain model creation, and connection renaming.
+    """
+
+    def __init__(self, local_filesystem: LocalFilesystem) -> None:
+        """
+        Initialize the configuration step processor.
+
+        Args:
+            local_filesystem: The local filesystem instance to work with
+
+        """
+        self.local_filesystem = local_filesystem
+
+    def process_configuration_step(
+        self,
+        selected_file: str,
+        fc_parameters: dict[str, float],
+        variables: dict,
+    ) -> tuple[dict[str, ArduPilotParameter], bool, list[tuple[str, str]], list[tuple[str, str]]]:
+        """
+        Process a configuration step including parameter computation and domain model creation.
+
+        Args:
+            selected_file: The name of the selected parameter file
+            fc_parameters: Dictionary of flight controller parameters
+            variables: Variables dictionary for evaluation
+
+        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
+
+        """
+        at_least_one_param_edited = False
+        ui_errors: list[tuple[str, str]] = []
+        ui_infos: list[tuple[str, str]] = []
+
+        # Process configuration step operations if configuration steps exist
+        if self.local_filesystem.configuration_steps and selected_file in self.local_filesystem.configuration_steps:
+            variables["fc_parameters"] = fc_parameters
+
+            # Compute derived 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
+
+        # 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]]]:
+        """
+        Handle connection renaming operations for the selected file.
+
+        Args:
+            selected_file: The name of the selected parameter file
+            variables: Variables dictionary for evaluation
+
+        Returns:
+            Tuple containing:
+            - True if parameters were modified, False otherwise
+            - List of (title, message) tuples for UI info feedback
+
+        """
+        if "rename_connection" not in self.local_filesystem.configuration_steps[selected_file]:
+            return False, []
+
+        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(
+            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
+        for old_name in duplicated_parameters:
+            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:
+            logging_info(_("Renaming parameter %s to %s"), old_name, new_name)
+            info_msg = _(
+                "The parameter '{old_name}' was renamed to '{new_name}'.\n"
+                "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
+
+    def _create_domain_model_parameters(
+        self, selected_file: str, fc_parameters: dict[str, float]
+    ) -> dict[str, ArduPilotParameter]:
+        """
+        Create ArduPilotParameter domain model objects for each parameter in the file.
+
+        Args:
+            selected_file: The name of the selected parameter file
+            fc_parameters: Dictionary of flight controller parameters
+
+        Returns:
+            Dictionary mapping parameter names to ArduPilotParameter objects
+
+        """
+        parameters: dict[str, ArduPilotParameter] = {}
+
+        for param_name, param in self.local_filesystem.file_parameters[selected_file].items():
+            # Get parameter metadata and default values
+            metadata = self.local_filesystem.doc_dict.get(param_name, {})
+            default_par = self.local_filesystem.param_default_dict.get(param_name, None)
+
+            # Check if parameter is forced or derived
+            forced_par = self.local_filesystem.forced_parameters.get(selected_file, {}).get(param_name, None)
+            derived_par = self.local_filesystem.derived_parameters.get(selected_file, {}).get(param_name, None)
+
+            # Get FC value if available
+            fc_value = fc_parameters.get(param_name)
+
+            # Create domain model parameter
+            parameters[param_name] = ArduPilotParameter(
+                param_name, param, metadata, default_par, fc_value, forced_par, derived_par
+            )
+
+        return parameters
+
+    def filter_different_parameters(self, parameters: dict[str, ArduPilotParameter]) -> dict[str, ArduPilotParameter]:
+        """
+        Filter parameters to only include those that are different from FC values or missing from FC.
+
+        Args:
+            parameters: Dictionary of all parameters
+
+        Returns:
+            Dictionary of parameters that are different from FC
+
+        """
+        return {name: param for name, param in parameters.items() if param.is_different_from_fc or not param.has_fc_value}
+
+    @staticmethod
+    def _generate_connection_renames(parameters: list[str], new_connection_prefix: str) -> dict[str, str]:
+        """
+        Generate a dictionary of parameter renames based on a new connection prefix.
+
+        Args:
+            parameters: List of parameter names to potentially rename
+            new_connection_prefix: The new prefix to apply (like "CAN2")
+
+        Returns:
+            Dictionary mapping old parameter names to new parameter names
+
+        """
+        renames: dict[str, str] = {}
+
+        # Extract the type and number from the new connection prefix
+        if len(new_connection_prefix) < 2:
+            return renames
+
+        new_type = new_connection_prefix[:-1]  # e.g., "CAN" from "CAN2"
+        new_number = new_connection_prefix[-1]  # e.g., "2" from "CAN2"
+
+        for param_name in parameters:
+            new_prefix = new_connection_prefix
+            old_prefix = param_name.split("_")[0]
+            if new_type == "CAN" and "CAN_P" in param_name:
+                old_prefix = param_name.split("_")[0] + "_" + param_name.split("_")[1]
+                new_prefix = "CAN_P" + new_number
+            if new_type == "CAN" and "CAN_D" in param_name:
+                old_prefix = param_name.split("_")[0] + "_" + param_name.split("_")[1]
+                new_prefix = "CAN_D" + new_number
+
+            if new_type in old_prefix:
+                renames[param_name] = param_name.replace(old_prefix, new_prefix)
+
+        return renames
+
+    @staticmethod
+    def _apply_connection_renames(
+        parameters: dict[str, Any], 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.
+
+        Args:
+            parameters: Dictionary of parameter objects to rename, it will modify it
+            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
+
+        """
+        if variables:
+            # If variables provided, evaluate the new_connection_prefix
+            new_connection_prefix = eval(str(new_connection_prefix), {}, variables)  # noqa: S307 pylint: disable=eval-used
+
+        # 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()
+        renamed_pairs = []
+        for old_name, new_name in renames.items():
+            if new_name in new_names:
+                parameters.pop(old_name)
+                duplicates.add(old_name)
+            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", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "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-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "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", "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", "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", "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", "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", "YJUAV_A6", "YJUAV_A6SE", "YJUAV_A6SE_H743", "YJUAV_A6Ultra", "ZeroOneX6", "ZeroOneX6_Air"],
+    (0x1209, 0x5741): ["AcctonGodwit_GA1", "ACNS-CM4Pilot", "ACNS-F405AIO", "AEDROXH7", "AEROFOX-H7", "AET-H743-Basic", "airbotf4", "AIRLink", "Airvolute-DCS2", "AnyleafH7", "Aocoda-RC-H743Dual", "AR-F407SmartBat", "ARK_CANNODE", "ARK_FPV", "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-X25-EVO", "CUAV-X7", "CUAVv5", "CUAVv5Nano", "CubeNode", "CubeRedSecondary", "CubeRedSecondary-IO", "CubeSolo", "DAKEFPVF405", "DAKEFPVH743", "DAKEFPVH743Pro", "DevEBoxH7v2", "DroneerF405", "DrotekP3Pro", "F35Lightning", "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", "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", "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"],
     (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 256 supported boards
+# Maps 16-bit APJ board ID to board name(s) for 260 supported boards
 APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1124: ["3DRControlZeroG"],
     7120: ["AcctonGodwit_GA1"],
@@ -97,6 +97,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     7000: ["CUAV-7-Nano"],
     1009: ["CUAV-Nora"],
     9: ["CUAV-Pixhack-v3", "CubeBlack", "CubeGreen-solo", "CubePurple", "CubeSolo", "fmuv2", "fmuv3", "mRoX21", "Pixhawk1", "Pixhawk1-1M", "skyviper-f412-rev1", "skyviper-journey", "skyviper-v2450"],
+    7002: ["CUAV-X25-EVO"],
     1010: ["CUAV-X7"],
     50: ["CUAVv5", "CUAVv5Nano", "fmuv5", "PH4-mini", "Pix32v5", "Pixhawk4", "Swan-K1", "TBS-Colibri-F7"],
     1003: ["CubeBlack+"],
@@ -144,6 +145,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1059: ["JHEMCU-GSF405A", "JHEMCU-GSF405A-RX2"],
     1411: ["JHEMCU-H743HD"],
     1412: ["JHEMCUF405PRO"],
+    1169: ["JHEMCUF405WING"],
     122: ["KakuteF4"],
     5406: ["KakuteF4-Wing"],
     1030: ["KakuteF4Mini"],
@@ -248,6 +250,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1503: ["StellarH7V2"],
     1011: ["SuccexF4"],
     2005: ["SULILGH7-P1-P2"],
+    6110: ["SVehicle-E2"],
     6001: ["sw-boom-f407"],
     6002: ["sw-nav-f405"],
     6000: ["sw-spar-f407"],
@@ -265,6 +268,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     1351: ["VRUBrain-v51"],
     7100: ["VUAV-V7pro"],
     1174: ["X-MAV-AP-H743v2"],
+    1234: ["YARIV6X"],
     1113: ["YJUAV_A6"],
     1127: ["YJUAV_A6SE"],
     1141: ["YJUAV_A6SE_H743"],
@@ -272,7 +276,7 @@ APJ_BOARD_ID_NAME_DICT: dict[int, list[str]] = {
     5600: ["ZeroOneX6", "ZeroOneX6_Air"],
 }
 
-# Maps 16-bit APJ board ID to board vendor for 256 supported boards
+# Maps 16-bit APJ board ID to board vendor for 260 supported boards
 APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1124: ["3DR"],  # 3DRControlZeroG
     7120: ["ArduPilot"],  # AcctonGodwit_GA1
@@ -320,6 +324,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     7000: ["ArduPilot"],  # CUAV-7-Nano
     1009: ["ArduPilot"],  # CUAV-Nora
     9: ["ArduPilot", "Hex/ProfiCNC"],  # CUAV-Pixhack-v3, CubeBlack, CubeGreen-solo, CubePurple, CubeSolo, fmuv2, fmuv3, mRoX21, Pixhawk1, Pixhawk1-1M, skyviper-f412-rev1, skyviper-journey, skyviper-v2450
+    7002: ["ArduPilot"],  # CUAV-X25-EVO
     1010: ["ArduPilot"],  # CUAV-X7
     50: ["ArduPilot", "Holybro"],  # CUAVv5, CUAVv5Nano, fmuv5, PH4-mini, Pix32v5, Pixhawk4, Swan-K1, TBS-Colibri-F7
     1003: ["Hex/ProfiCNC"],  # CubeBlack+
@@ -367,6 +372,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1059: ["ArduPilot"],  # JHEMCU-GSF405A, JHEMCU-GSF405A-RX2
     1411: ["ArduPilot"],  # JHEMCU-H743HD
     1412: ["ArduPilot"],  # JHEMCUF405PRO
+    1169: ["ArduPilot"],  # JHEMCUF405WING
     122: ["ArduPilot"],  # KakuteF4
     5406: ["ArduPilot"],  # KakuteF4-Wing
     1030: ["ArduPilot"],  # KakuteF4Mini
@@ -471,6 +477,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1503: ["ArduPilot"],  # StellarH7V2
     1011: ["ArduPilot"],  # SuccexF4
     2005: ["ArduPilot"],  # SULILGH7-P1-P2
+    6110: ["ArduPilot"],  # SVehicle-E2
     6001: ["ArduPilot"],  # sw-boom-f407
     6002: ["ArduPilot"],  # sw-nav-f405
     6000: ["ArduPilot"],  # sw-spar-f407
@@ -488,6 +495,7 @@ APJ_BOARD_ID_VENDOR_DICT: dict[int, list[str]] = {
     1351: ["Laser Navigation"],  # VRUBrain-v51
     7100: ["ArduPilot"],  # VUAV-V7pro
     1174: ["ArduPilot"],  # X-MAV-AP-H743v2
+    1234: ["ArduPilot"],  # YARIV6X
     1113: ["ArduPilot"],  # YJUAV_A6
     1127: ["ArduPilot"],  # YJUAV_A6SE
     1141: ["ArduPilot"],  # YJUAV_A6SE_H743
@@ -495,7 +503,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 256 supported boards
+# Maps 16-bit APJ board ID to MCU series for 260 supported boards
 APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1124: ["STM32H7xx"],  # 3DRControlZeroG
     7120: ["STM32H7xx"],  # AcctonGodwit_GA1
@@ -543,6 +551,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     7000: ["STM32H7xx"],  # CUAV-7-Nano
     1009: ["STM32H7xx"],  # CUAV-Nora
     9: ["STM32F4xx"],  # CUAV-Pixhack-v3, CubeBlack, CubeGreen-solo, CubePurple, CubeSolo, fmuv2, fmuv3, mRoX21, Pixhawk1, Pixhawk1-1M, skyviper-f412-rev1, skyviper-journey, skyviper-v2450
+    7002: ["STM32H7xx"],  # CUAV-X25-EVO
     1010: ["STM32H7xx"],  # CUAV-X7
     50: ["STM32F7xx"],  # CUAVv5, CUAVv5Nano, fmuv5, PH4-mini, Pix32v5, Pixhawk4, Swan-K1, TBS-Colibri-F7
     1003: ["STM32F4xx"],  # CubeBlack+
@@ -590,6 +599,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1059: ["STM32F4xx"],  # JHEMCU-GSF405A, JHEMCU-GSF405A-RX2
     1411: ["STM32H7xx"],  # JHEMCU-H743HD
     1412: ["STM32F4xx"],  # JHEMCUF405PRO
+    1169: ["STM32F4xx"],  # JHEMCUF405WING
     122: ["STM32F4xx"],  # KakuteF4
     5406: ["STM32F4xx"],  # KakuteF4-Wing
     1030: ["STM32F4xx"],  # KakuteF4Mini
@@ -694,6 +704,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1503: ["STM32H7xx"],  # StellarH7V2
     1011: ["STM32F4xx"],  # SuccexF4
     2005: ["STM32H7xx"],  # SULILGH7-P1-P2
+    6110: ["STM32H7xx"],  # SVehicle-E2
     6001: ["STM32F4xx"],  # sw-boom-f407
     6002: ["STM32F4xx"],  # sw-nav-f405
     6000: ["STM32F4xx"],  # sw-spar-f407
@@ -711,6 +722,7 @@ APJ_BOARD_ID_MCU_SERIES_DICT: dict[int, list[str]] = {
     1351: ["STM32F4xx"],  # VRUBrain-v51
     7100: ["STM32H7xx"],  # VUAV-V7pro
     1174: ["STM32H7xx"],  # X-MAV-AP-H743v2
+    1234: ["STM32H7xx"],  # YARIV6X
     1113: ["STM32H7xx"],  # YJUAV_A6
     1127: ["STM32H7xx"],  # YJUAV_A6SE
     1141: ["STM32H7xx"],  # YJUAV_A6SE_H743
@@ -718,12 +730,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 256 supported boards
+# Maps MCU series to 16-bit APJ board ID for 260 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, 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, 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, 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, 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, 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, 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, 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, 7110, 2024, 5200, 1146, 5210, 59, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 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, 1032, 56, 53, 1408, 1083, 1160, 6104, 1036, 1118, 1102, 1111, 1167, 1195, 1123, 2714, 1075, 1196, 1060, 1108, 1503, 2005, 5250, 5253, 1138, 5230, 7100, 1174, 1113, 1127, 1141, 1144, 5600],  # 3DRControlZeroG, AcctonGodwit_GA1, AEDROXH7, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, 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, 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, TBS_LUCID_H7, TBS_LUCID_H7_WING, TMotorH743, uav-dev-fc-um982, VUAV-V7pro, X-MAV-AP-H743v2, YJUAV_A6, YJUAV_A6SE, YJUAV_A6SE_H743, YJUAV_A6Ultra, ZeroOneX6, ZeroOneX6_Air
+    "STM32H7xx": [1124, 7120, 1198, 7110, 2024, 5200, 1146, 5210, 59, 57, 1025, 1056, 1162, 1168, 1148, 5810, 1182, 1156, 1189, 7000, 1009, 7002, 1010, 1079, 140, 1033, 1063, 1069, 1409, 1070, 1193, 1194, 1061, 139, 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, 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, AEROFOX-H7, AET-H743-Basic, Airvolute-DCS2, AnyleafH7, Aocoda-RC-H743Dual, ARK_FPV, ARKV6X, BeastH7, BeastH7v2, BlitzH743Pro, BlitzWingH743, BotBloxDroneNet, BROTHERHOBBYH743, CBU-H7-LC-Stamp, CBU-H7-Stamp, CORVON743V1, CUAV-7-Nano, CUAV-Nora, CUAV-X25-EVO, CUAV-X7, CubeNode, CubeOrange, CubeOrange-joey, CubeOrangePlus, CubeRedPrimary, CubeRedPrimary-PPPGW, CubeRedSecondary, CubeRedSecondary-IO, DAKEFPVH743, DAKEFPVH743Pro, DevEBoxH7v2, Durandal, NucleoH743, NucleoH755, 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, 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
     "STM32L476": [1051],  # Nucleo-L476
     "STM32L496": [1047],  # Nucleo-L496
     "STM32L4xx": [1090],  # PixFlamingo

ardupilot_methodic_configurator/data_model_vehicle_components_base.py

@@ -39,6 +39,7 @@ class ComponentDataModelBase:
         self._possible_choices: dict[ComponentPath, tuple[str, ...]] = {}
         self._mot_pwm_types: tuple[str, ...] = ()
         self._component_datatypes: dict[str, Any] = component_datatypes
+        self._is_new_project: bool = False
         self.schema: VehicleComponentsJsonSchema = schema
 
     def get_component_data(self) -> ComponentData:
@@ -305,3 +306,12 @@ class ComponentDataModelBase:
     def get_combobox_values_for_path(self, path: ComponentPath) -> tuple[str, ...]:
         """Get valid combobox values for a given path."""
         return self._possible_choices.get(path, ())
+
+    def set_configuration_template(self, vehicle_template_name: str) -> None:
+        """Set the vehicle configuration template name in the data."""
+        self._data["Configuration template"] = vehicle_template_name
+        self._is_new_project = True
+
+    def is_new_project(self) -> bool:
+        """Check if the project is new."""
+        return self._is_new_project

ardupilot_methodic_configurator/data_model_vehicle_components_templates.py

@@ -24,10 +24,6 @@ class ComponentDataModelTemplates(ComponentDataModelBase):
     This improves testability by isolating data operations.
     """
 
-    def set_configuration_template(self, template_name: str) -> None:
-        """Set the configuration template name in the data."""
-        self._data["Configuration template"] = template_name
-
     def update_component(self, component_name: str, component_data: dict) -> None:
         """Update a component with new data."""
         if "Components" not in self._data:

ardupilot_methodic_configurator/frontend_tkinter_base_window.py

@@ -22,6 +22,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 import os
 import tkinter as tk
+import tkinter.font as tkfont
 
 # from logging import debug as logging_debug
 # from logging import info as logging_info
@@ -87,6 +88,8 @@ class BaseWindow:
         # Detect DPI scaling for HiDPI support
         self.dpi_scaling_factor = self._get_dpi_scaling_factor()
 
+        self.default_font_size: int = 0
+
         # Configure theme and styling
         self._setup_theme_and_styling()
 
@@ -134,7 +137,9 @@ class BaseWindow:
         style.theme_use("alt")
 
         # Create custom styles with DPI-aware font sizes
-        bold_font_size = self.calculate_scaled_font_size(8)
+        self.default_font_size = tkfont.nametofont("TkDefaultFont").cget("size")
+        # Warning: on linux the font size might be negative
+        bold_font_size = self.calculate_scaled_font_size(self.default_font_size)
         style.configure("Bold.TLabel", font=("TkDefaultFont", bold_font_size, "bold"))  # type: ignore[no-untyped-call]
 
     def _get_dpi_scaling_factor(self) -> float:

ardupilot_methodic_configurator/frontend_tkinter_component_editor_base.py

@@ -17,6 +17,7 @@ from argparse import ArgumentParser, Namespace
 from logging import basicConfig as logging_basicConfig
 from logging import getLevelName as logging_getLevelName
 from logging import info as logging_info
+from platform import system as platform_system
 from sys import exit as sys_exit
 from tkinter import messagebox, ttk
 from typing import Any, Optional, Union, cast
@@ -153,7 +154,10 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
     def _setup_styles(self) -> None:
         """Configure the styles for UI elements."""
         style = ttk.Style()
-        style.configure("bigger.TLabel", font=("TkDefaultFont", 13))  # type: ignore[no-untyped-call]
+        style.configure(
+            "bigger.TLabel",  # type: ignore[no-untyped-call]
+            font=("TkDefaultFont", self.calculate_scaled_font_size(self.default_font_size)),
+        )
         style.configure("comb_input_invalid.TCombobox", fieldbackground="red")  # type: ignore[no-untyped-call]
         style.configure("comb_input_valid.TCombobox", fieldbackground="white")  # type: ignore[no-untyped-call]
         style.configure("entry_input_invalid.TEntry", fieldbackground="red")  # type: ignore[no-untyped-call]
@@ -258,9 +262,7 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
         save_frame = ttk.Frame(self.main_frame)
         save_frame.pack(side=tk.TOP, fill="x", expand=False)
 
-        self.save_button = ttk.Button(
-            save_frame, text=_("Save data and start configuration"), command=self.validate_and_save_component_json
-        )
+        self.save_button = ttk.Button(save_frame, text=_("Save data and start configuration"), command=self.on_save_pressed)
         show_tooltip(
             self.save_button,
             _("Save component data to the vehicle_components.json file\nand start parameter value configuration and tuning."),
@@ -516,14 +518,15 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
 
         return ""
 
-    def validate_and_save_component_json(self) -> None:
-        """Validate and save the component JSON data."""
+    def on_save_pressed(self) -> None:
+        """Validate component data, save the component JSON file and close the window."""
         error_msg = self.validate_data_and_highlight_errors_in_red()
         if error_msg:
             show_error_message(_("Error"), error_msg)
             return
         if self._confirm_component_properties():
             self.save_component_json()
+        self.root.destroy()
 
     def _confirm_component_properties(self) -> bool:
         """Show confirmation dialog for component properties."""
@@ -535,23 +538,29 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
         )
         return messagebox.askyesno(_("Confirm that all component properties are correct"), confirm_message)
 
-    def save_component_json(self) -> None:
+    def save_component_json(self) -> bool:
         """Save component JSON data to file."""
-        save_result = self._perform_file_save()
-        self._handle_save_result(save_result)
+        try:
+            save_result = self._perform_file_save()
+        except Exception as exc:  # pylint: disable=broad-except # Catch unexpected exceptions and present them as a save error
+            # Convert exception into the expected save_result shape: (is_error: bool, message: str)
+            save_result = (True, str(exc))
+        return self._handle_save_result(save_result)
 
     def _perform_file_save(self) -> tuple[bool, str]:
         """Perform file save operation."""
         return self.data_model.save_to_filesystem(self.local_filesystem)
 
-    def _handle_save_result(self, save_result: tuple[bool, str]) -> None:
+    def _handle_save_result(self, save_result: tuple[bool, str]) -> bool:
         """Handle save operation result."""
         if save_result[0]:
             show_error_message(_("Error"), _("Failed to save data to file.") + "\n" + save_result[1])
+            ret = True
         else:
             logging_info(_("Vehicle component data saved successfully."))
+            ret = False
 
-        self.root.destroy()
+        return ret
 
     def on_closing(self) -> None:
         """Handle window closing event."""
@@ -560,11 +569,22 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
         if answer is None:  # Cancel was clicked
             return
 
+        ret = False
         if answer:
-            self.save_component_json()
+            ret = self.save_component_json()
         else:
-            self.root.destroy()
-        sys_exit(0)
+            # If it just created the files from a new template and the user chooses not to save,
+            # delete the created files
+            if self.data_model.is_new_project():
+                # remove the files created
+                err_msg = self.local_filesystem.remove_created_files_and_vehicle_dir()
+                if err_msg:
+                    show_error_message(_("Error"), err_msg)
+                ret = bool(err_msg)
+            logging_info(_("Changes discarded. No data saved."))
+        # Close the window and exit. ret indicates if there was an error earlier (e.g. cleanup failed).
+        self.root.destroy()
+        sys_exit(int(ret))
 
     # This function will be overwritten in child classes
     def add_entry_or_combobox(
@@ -648,6 +668,7 @@ class ComponentEditorWindowBase(BaseWindow):  # pylint: disable=too-many-instanc
             instance.save_button = MagicMock()
             instance.template_manager = MagicMock()
             instance.complexity_var = MagicMock()
+            instance.default_font_size = 9 if platform_system() == "Windows" else -12
 
             return instance