powertrain-build 1.11.7.dev2__tar.gz → 1.11.8.dev1__tar.gz

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/ChangeLog

@@ -1,8 +1,12 @@
 CHANGES
 =======
 
-* Dummy 1
-* ZC updates
+* ZC: Add support for S/R DIDs
+
+1.11.7
+------
+
+* Update includeSharedSwAddrMethod to take string to use as prefix
 
 1.11.6
 ------

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev2
+Version: 1.11.8.dev1
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# owertrain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/README.md

@@ -1,4 +1,4 @@
-# owertrain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/build.py

@@ -195,7 +195,6 @@ def generate_dummy_spm(build_cfg, unit_cfg, feature_cfg, signal_if, udt):
     dst_dir = build_cfg.get_src_code_dst_dir()
     # Get out ports for all units in project regardless of code switches
     unit_vars = unit_cfg.get_per_unit_cfg_total()
-    prefix = build_cfg.get_scheduler_prefix()
     undefined_outports = []
     defined_ports = []
 
@@ -212,7 +211,7 @@ def generate_dummy_spm(build_cfg, unit_cfg, feature_cfg, signal_if, udt):
         _add_undefined_signals_from_unit(data)
 
     dummy_spm = DummySpm(
-        undefined_outports, build_cfg, feature_cfg, unit_cfg, udt, f"{prefix}VcDummy_spm"
+        undefined_outports, build_cfg, feature_cfg, unit_cfg, udt, "VcDummy_spm"
     )
     dummy_spm.generate_files(dst_dir)
     LOG.info("Finished generating output vars (in %4.2f s)", time.time() - start_time)
@@ -311,14 +310,15 @@ def generate_external_var(build_cfg, unit_cfg, udt, asil_level_dep, nrm_dict, de
         ext_var_nrm = ExtVarCsv(nrm_dict, build_cfg, unit_cfg, udt)
         ext_var_dep = ExtVarCsv(dep_dict, build_cfg, unit_cfg, udt, asil_level_dep)
         ext_var_sec = ExtVarCsv(sec_dict, build_cfg, unit_cfg, udt, build_defs.SECURE)
-    prefix = build_cfg.get_scheduler_prefix()
+
     ext_var_instances = {
-        ext_var_nrm: f"{prefix}VcExtVar",
-        ext_var_dep: f"{prefix}VcExtVarSafe",
+        ext_var_nrm: "VcExtVar",
+        ext_var_dep: "VcExtVarSafe",
     }
 
     if not build_cfg.has_yaml_interface:
-        ext_var_instances[ext_var_sec] = f"{prefix}VcExtVarSecure"
+        ext_var_instances[ext_var_sec] = "VcExtVarSecure"
+
     for instance, dir_name in ext_var_instances.items():
         ext_var_path = Path(build_cfg.get_src_code_dst_dir(), dir_name)
         instance.generate_files(ext_var_path)
@@ -406,11 +406,17 @@ def copy_common_src_to_src_out(build_cfg):
     delivery folder (defined in the config file for the project),
     from the units that are included in the project.
 
+    Optionally, also patch the defined functions with the "schedulerPrefix".
+
     Args:
         build_cfg (BuildProjConfig): Build project class holding where files should be stored.
     """
     LOG.info("******************************************************")
-    LOG.info("Start copying common source files")
+    prefix = build_cfg.get_scheduler_prefix()
+    if prefix:
+        LOG.info("Start copying and patching common source files")
+    else:
+        LOG.info("Start copying common source files")
 
     start_time = time.time()
     src_dir = build_cfg.get_common_src_dir()
@@ -426,7 +432,10 @@ def copy_common_src_to_src_out(build_cfg):
 
     files_to_copy = filter(os.path.isfile, files)
     for file_ in files_to_copy:
-        shutil.copy2(file_, src_dst_dir)
+        if prefix:
+            patch_and_copy_common_src_to_src_out(prefix, Path(file_), Path(src_dst_dir))
+        else:
+            shutil.copy2(file_, src_dst_dir)
         LOG.debug("copied %s to %s", file_, src_dst_dir)
 
     LOG.info(
@@ -437,9 +446,6 @@ def copy_common_src_to_src_out(build_cfg):
 def patch_and_copy_common_src_to_src_out(prefix, file_path, dest_dir):
     """Copy common source code to delivery folder, patched with "schedulerPrefix" as prefix.
 
-    DEPRECATED: SPA3 platform team is no longer linking the SWCs,
-    instead they are copying and compiling all source files directly.
-
     Args:
         prefix (str): Prefix.
         file_path (Path): Path to file to patch and copy.
@@ -615,71 +621,6 @@ def propagate_tag_name(build_cfg, tag_name, problem_logger):
     LOG.info("Finished propagating tag name (in %4.2f s)", time.time() - start_time)
 
 
-def patch_target_link_sources(build_cfg):
-    """Patch TargetLink generated source files to instead include prefixed version of common headers.
-    Common headers will also be renamed accordingly.
-
-    Args:
-        build_cfg (BuildProjConfig): Build project class holding where files should be stored.
-    """
-    patch_tl_sources = build_cfg.get_code_generation_config("patchTargetLinkSources")
-    prefix = build_cfg.get_scheduler_prefix()
-    if not patch_tl_sources:
-        return
-    elif patch_tl_sources and not prefix:
-        LOG.warning(
-            "patchTargetLinkSources is set to true but schedulerPrefix is not defined. "
-            "Skipping patching of TargetLink generated source files."
-        )
-        return
-
-    start_time = time.time()
-    LOG.info("******************************************************")
-    LOG.info("Start patching TargetLink generated source files")
-
-    mem_map_files = []
-    for section_dict in build_defs.PREDECL_EXTRA.values():
-        for section_file in section_dict.values():
-            mem_map_files.append(section_file)
-    for asil_dict in build_defs.ASIL_LEVEL_MAP.values():
-        for type_dict in asil_dict.values():
-            for section_dict in type_dict.values():
-                for section_file in section_dict.values():
-                    mem_map_files.append(section_file)
-    for nvm_dict in build_defs.NVM_LEVEL_MAP.values():
-        for section_dict in nvm_dict.values():
-            for section_file in section_dict.values():
-                mem_map_files.append(section_file)
-    nvm_defs = build_cfg.get_nvm_defs()
-    tl_headers_to_prefix = [
-        ZCCore.FILE_NAME + ".h",
-        build_cfg.get_ts_header_name(),
-        build_cfg.get_feature_conf_header_name(),
-        nvm_defs["fileName"] + ".h",
-    ]
-    tl_headers_to_prefix.extend(mem_map_files)
-
-    src_code_dst_dir = build_cfg.get_src_code_dst_dir()
-    for file_path in [f for f in Path(src_code_dst_dir).glob("*") if f.suffix in [".c", ".h"]]:
-        with file_path.open(mode="r", encoding="utf-8") as file_handle:
-            content = file_handle.read()
-        for header in tl_headers_to_prefix:
-            content = content.replace(f'#include "{header}"', f'#include "{prefix}{header}"')
-        with file_path.open(mode="w", encoding="utf-8") as file_handle:
-            file_handle.write(content)
-
-    for header_file in tl_headers_to_prefix:
-        source_file = Path(src_code_dst_dir, header_file).with_suffix(".c")
-        if source_file.exists():
-            source_file.replace(Path(src_code_dst_dir, f"{prefix}{header_file}").with_suffix(".c"))
-        Path(src_code_dst_dir, header_file).replace(Path(src_code_dst_dir, f"{prefix}{header_file}"))
-
-    LOG.info(
-        "Finished patching TargetLink generated source files (in %4.2f s)",
-        time.time() - start_time,
-    )
-
-
 def add_args(parser):
     """Add command line arguments for powertrain_build.
 
@@ -1030,8 +971,6 @@ def build(
                     core = Core(build_cfg, unit_cfg)
                     generate_core_dummy(build_cfg, core, unit_cfg)
 
-        patch_target_link_sources(build_cfg)
-
         if problem_logger.errors():
             problem_logger.info(
                 "Critical errors were detected, aborting" " after %4.2f s.",

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/build_proj_config.py

@@ -67,6 +67,7 @@ class BuildProjConfig:
             'generalAsilLevelDebug': 'B',
             'generalAsilLevelDependability': 'B',
             'generateCalibrationInterfaceFiles': False,
+            'useCalibrationRteMacroExpansion': False,
             'generateCoreDummy': False,
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,
@@ -75,11 +76,9 @@ class BuildProjConfig:
             'includeAllEnums': False,
             'mapToRteEnums': False,
             'propagateTagName': False,
-            'patchTargetLinkSources': False,
             'useA2lSymbolLinks': False,
             'useRteNvmStructs': False,
-            'useCamelCaseForNvmVariables': False,
-            'useCalibrationRteMacroExpansion': False,
+            'useCamelCaseForNvmVariables': False
         }
 
     def _get_code_generation_config(self):
@@ -269,7 +268,7 @@ class BuildProjConfig:
             'secure': file_config.get('secure', False),
             'includeStatic': file_config.get('includeStatic', True),
             'includeShared': file_config.get('includeShared', True),
-            'includeSharedSwAddrMethod': file_config.get('includeSharedSwAddrMethod', False),
+            'includeSharedSwAddrMethod': file_config.get('includeSharedSwAddrMethod', None),
             'includeDiagnostics': file_config.get('includeDiagnostics', True),
             'includeNvm': file_config.get('includeNvm', True),
             'scaleMapsAndCurves': file_config.get('scaleMapsAndCurves', True),

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/dids.py

@@ -374,7 +374,7 @@ class HIDIDs(ProblemLogger):
         super().__init__()
         self._build_cfg = build_cfg
         self._unit_cfgs = unit_cfgs
-        self._file_name = 'VcDIDAPI'
+        self.file_name = 'VcDIDAPI'
         self.did_dict = self._compose_did_data()
 
     def _load_did_config_files(self, config_file):
@@ -531,7 +531,7 @@ class HIDIDs(ProblemLogger):
             (list(str)): List of lines to write to DID API header file.
         """
         name = self._build_cfg.get_a2l_cfg()['name']
-        header_guard = f'{self._file_name.upper()}_H'
+        header_guard = f'{self.file_name.upper()}_H'
         header = [
             f'#ifndef {header_guard}\n',
             f'#define {header_guard}\n',
@@ -565,7 +565,7 @@ class HIDIDs(ProblemLogger):
             (list(str)): List of lines to write to DID API source file.
         """
         header = [
-            f'#include "{self._file_name}.h"\n',
+            f'#include "{self.file_name}.h"\n',
             '\n'
         ]
 
@@ -598,7 +598,7 @@ class HIDIDs(ProblemLogger):
         }
         src_dst_dir = self._build_cfg.get_src_code_dst_dir()
         for extension, content in file_contents.items():
-            file_path = Path(src_dst_dir, self._file_name + extension)
+            file_path = Path(src_dst_dir, self.file_name + extension)
             with file_path.open(mode='w', encoding='utf-8') as file_handler:
                 file_handler.writelines(content)
 
@@ -617,8 +617,9 @@ class ZCDIDs(ProblemLogger):
         self._build_cfg = build_cfg
         self._unit_cfgs = unit_cfgs
         self._valid_dids = None
-        prefix = build_cfg.get_scheduler_prefix()
-        self._file_name = f'{prefix}VcDIDAPI'
+        prefix = self._build_cfg.get_scheduler_prefix()
+        self.operation_file_name = 'VcDIDAPI'
+        self.sender_receiver_file_name = f'{prefix}UpdatingDIDValues'
         self.project_dids = self._get_project_dids()
 
     @property
@@ -666,7 +667,107 @@ class ZCDIDs(ProblemLogger):
             return {}
         return project_dids
 
-    def get_operation_data(self, operation, did_data):
+    def _get_sender_receiver_header_file_content(self):
+        """Get content for the S/R DID API header file.
+
+        The function in this file is a runnable generated by yaml2arxml.
+
+        Returns:
+            (bool): True if any S/R DIDs are defined.
+            (list(str)): List of lines to write to the S/R DID API header file.
+        """
+        name = self._build_cfg.get_composition_config("softwareComponentName")
+        header_guard = f'{self.sender_receiver_file_name.upper()}_H'
+        header = [
+            f'#ifndef {header_guard}\n',
+            f'#define {header_guard}\n',
+            '\n',
+            '#include "tl_basetypes.h"\n',
+            f'#include "Rte_{name}.h"\n',
+            '\n'
+        ]
+        footer = [f'\n#endif /* {header_guard} */\n']
+
+        if not self.valid_dids:
+            return False, header + footer
+
+        variable_declarations = []
+        function_declarations = []
+        sender_receiver_dids_exist = False
+        for did, did_data in self.valid_dids.items():
+            project_did_data = self.project_dids[did]
+            if did_data.get('PortType', 'dummy') not in ['BOTH', 'SENDER-RECEIVER']:
+                continue  # C/R DIDs are handled in _get_operation... functions
+            if not project_did_data['type'].startswith('UInt'):
+                self.warning(
+                    f'Ignoring DID {did} of type {project_did_data["type"]}, only unsigned integers are supported.'
+                )
+                continue
+            sender_receiver_dids_exist = True
+            define = self.project_dids[did]["class"].split('/')[-1]  # E.q. for ASIL D it is ASIL_D/CVC_DISP_ASIL_D
+            variable_declarations.append(
+                f'extern {define} {self.project_dids[did]["type"]} {self.project_dids[did]["name"]};\n'
+            )
+            function_declarations.append(
+                f'extern UInt8 Rte_Write_{name}_DataServices_DID_{did}_data({project_did_data["type"]} {did});\n'
+            )
+
+        function_declarations.append(f'\nvoid Run_{self.sender_receiver_file_name}(void);\n')
+
+        body = [
+            f'#include "{build_defs.PREDECL_DISP_ASIL_D_START}"\n',
+            *variable_declarations,
+            f'#include "{build_defs.PREDECL_DISP_ASIL_D_END}"\n',
+            f'\n#include "{build_defs.PREDECL_CODE_ASIL_D_START}"\n',
+            *function_declarations,
+            f'#include "{build_defs.PREDECL_CODE_ASIL_D_END}"\n',
+        ]
+
+        return sender_receiver_dids_exist, header + body + footer
+
+    def _get_sender_receiver_source_file_content(self):
+        """Get content for the S/R DID API source file.
+
+        The function in this file is a runnable generated by yaml2arxml.
+
+        Returns:
+            (bool): True if any S/R DIDs are defined.
+            (list(str)): List of lines to write to the S/R DID API source file.
+        """
+        header = [
+            f'#include "{self.sender_receiver_file_name}.h"\n',
+            '\n'
+        ]
+
+        if not self.valid_dids:
+            return False, header
+
+        name = self._build_cfg.get_composition_config("softwareComponentName")
+        sender_receiver_dids_exist = False
+        body = [
+            f'#include "{build_defs.CVC_CODE_ASIL_D_START}"\n',
+            f'void Run_{self.sender_receiver_file_name}(void)\n',
+            '{\n'
+        ]
+        for did, did_data in self.valid_dids.items():
+            project_did_data = self.project_dids[did]
+            if did_data.get('PortType', 'dummy') not in ['BOTH', 'SENDER-RECEIVER']:
+                continue  # C/R DIDs are handled in _get_operation... functions
+            if not project_did_data['type'].startswith('UInt'):
+                self.warning(
+                    f'Ignoring DID {did} of type {project_did_data["type"]}, only unsigned integers are supported.'
+                )
+                continue
+            sender_receiver_dids_exist = True
+            body.append(f'  Rte_Write_{name}_DataServices_DID_{did}_data({did});\n')
+        body.extend([
+            '}\n',
+            f'#include "{build_defs.CVC_CODE_ASIL_D_END}"\n'
+        ])
+
+        return sender_receiver_dids_exist, header + body
+
+    def _get_operation_data(self, operation, did_data):
         """Get operation function data of supported operations.
 
         Args:
@@ -704,14 +805,14 @@ class ZCDIDs(ProblemLogger):
             return None
         return operation_data[operation]
 
-    def _get_header_file_content(self):
+    def _get_operation_header_file_content(self):
         """Get content for the DID API header file.
 
         Returns:
-            (list(str)): List of lines to write to DID API header file.
+            (list(str)): List of lines to write to the DID API header file.
         """
         name = self._build_cfg.get_composition_config("softwareComponentName")
-        header_guard = f'{self._file_name.upper()}_H'
+        header_guard = f'{self.operation_file_name.upper()}_H'
         header = [
             f'#ifndef {header_guard}\n',
             f'#define {header_guard}\n',
@@ -728,12 +829,14 @@ class ZCDIDs(ProblemLogger):
         variable_declarations = []
         function_declarations = []
         for did, did_data in self.valid_dids.items():
+            if did_data.get('PortType', 'dummy') == 'SENDER-RECEIVER':
+                continue  # S/R DIDs are handled in _get_sender_receiver... functions
             define = self.project_dids[did]["class"].split('/')[-1]  # E.q. for ASIL D it is ASIL_D/CVC_DISP_ASIL_D
             variable_declarations.append(
                 f'extern {define} {self.project_dids[did]["type"]} {self.project_dids[did]["name"]};\n'
             )
             for operation in did_data["operations"]:
-                operation_data = self.get_operation_data(operation, self.project_dids[did])
+                operation_data = self._get_operation_data(operation, self.project_dids[did])
                 if operation_data is None:
                     self.warning(
                         f'Will not generate code for unsupported operation {operation}. Add manually for DID {did}.'
@@ -752,14 +855,14 @@ class ZCDIDs(ProblemLogger):
 
         return header + body + footer
 
-    def _get_source_file_content(self):
+    def _get_operation_source_file_content(self):
         """Get content for the DID API source file.
 
         Returns:
-            (list(str)): List of lines to write to DID API source file.
+            (list(str)): List of lines to write to the DID API source file.
         """
         header = [
-            f'#include "{self._file_name}.h"\n',
+            f'#include "{self.operation_file_name}.h"\n',
             '\n'
         ]
 
@@ -768,8 +871,10 @@ class ZCDIDs(ProblemLogger):
 
         body = [f'#include "{build_defs.CVC_CODE_ASIL_D_START}"\n']
         for did, did_data in self.valid_dids.items():
+            if did_data.get('PortType', 'dummy') == 'SENDER-RECEIVER':
+                continue  # S/R DIDs are handled in _get_sender_receiver... functions
             for operation in did_data["operations"]:
-                operation_data = self.get_operation_data(operation, self.project_dids[did])
+                operation_data = self._get_operation_data(operation, self.project_dids[did])
                 if operation_data is None:
                     continue  # Warning already given in header generation
                 body.append(operation_data['declaration'] + '\n' + operation_data['body'])
@@ -788,12 +893,25 @@ class ZCDIDs(ProblemLogger):
             self.critical('Valid DIDs not set. Cannot generate DID files.')
             return
 
+        src_dst_dir = self._build_cfg.get_src_code_dst_dir()
+
+        # CLIENT-SERVER DIDs
         file_contents = {
-            '.h': self._get_header_file_content(),
-            '.c': self._get_source_file_content()
+            '.h': self._get_operation_header_file_content(),
+            '.c': self._get_operation_source_file_content()
         }
-        src_dst_dir = self._build_cfg.get_src_code_dst_dir()
         for extension, content in file_contents.items():
-            file_path = Path(src_dst_dir, self._file_name + extension)
+            file_path = Path(src_dst_dir, self.operation_file_name + extension)
             with file_path.open(mode='w', encoding='utf-8') as file_handler:
                 file_handler.writelines(content)
+
+        # SENDER-RECEIVER DIDs
+        sender_receiver_dids_exist_header, header_contents = self._get_sender_receiver_header_file_content()
+        sender_receiver_dids_exist_source, source_contents = self._get_sender_receiver_source_file_content()
+        if sender_receiver_dids_exist_header and sender_receiver_dids_exist_source:
+            file_path = Path(src_dst_dir, self.sender_receiver_file_name + '.h')
+            with file_path.open(mode='w', encoding='utf-8') as file_handler:
+                file_handler.writelines(header_contents)
+            file_path = Path(src_dst_dir, self.sender_receiver_file_name + '.c')
+            with file_path.open(mode='w', encoding='utf-8') as file_handler:
+                file_handler.writelines(source_contents)

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/sched_funcs.py

@@ -137,13 +137,13 @@ class SchedFuncs(ProblemLogger):
                 call_str += '}\n'
                 call_str += f'#include "{build_defs.CVC_CODE_END}"\n\n'
 
-                file_name = pjoin(dst_dir, f'{prefix}{raster}.c')
+                file_name = pjoin(dst_dir, f'{raster}.c')
                 with open(file_name, 'w', encoding="utf-8") as fhndl:
                     fhndl.write(includes)
                     fhndl.write(ext_def_str)
                     fhndl.write(call_str)
                     self.info(f'generated {file_name}')
-                file_name = pjoin(dst_dir, f'{prefix}{raster}.h')
+                file_name = pjoin(dst_dir, f'{raster}.h')
                 with open(file_name, 'w', encoding="utf-8") as f_h:
                     f_h.write(f'#ifndef {raster.upper()}_H\n')
                     f_h.write(f'#define {raster.upper()}_H\n\n')
@@ -152,13 +152,13 @@ class SchedFuncs(ProblemLogger):
         init_ext_def_s += '\n'
         init_call_s += '}\n\n'
         init_call_s += f'#include "{build_defs.CVC_CODE_END}"\n\n'
-        file_name = pjoin(dst_dir, f'{prefix}VcExtINI.c')
+        file_name = pjoin(dst_dir, 'VcExtINI.c')
         with open(file_name, 'w', encoding="utf-8") as fhndl:
             fhndl.write(init_ext_def_s)
             fhndl.write(init_call_s)
-            self.info(f'generated {file_name}')
+            self.info('generated %s', file_name)
 
-        file_name = pjoin(dst_dir, f'{prefix}VcExtINI.h')
+        file_name = pjoin(dst_dir, 'VcExtINI.h')
         with open(file_name, 'w', encoding="utf-8") as f_h:
             f_h.write('#ifndef VCEXTINI_H\n')
             f_h.write('#define VCEXTINI_H\n')

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/user_defined_types.py

@@ -71,11 +71,8 @@ class UserDefinedTypes(ProblemLogger):
         self.info('  Start parsing files with user defined data types')
         self._build_prj_cfg = build_prj_config
         self._unit_configs = unit_configs
-        prefix = build_prj_config.get_scheduler_prefix()
-        self.enum_file_name = f'{prefix}VcEnumerations.h'
         self.enums_per_unit = {}
         self.common_enums = self._read_enums_from_definitions()
-        self.struct_file_name = f'{prefix}VcStructs.h'
         self.structs_per_unit = {}
         self._parse_all_user_defined_types()
         self.common_header_files = []
@@ -591,7 +588,7 @@ class UserDefinedTypes(ProblemLogger):
         guard = f"{file_path.stem.upper()}_H"
         with file_path.open('w') as fh:
             fh.write(self._get_header_file_header(guard))
-            fh.write(f'#include "{self.enum_file_name}"\n')  # struct members may be of enum type
+            fh.write('#include "VcEnumerations.h"\n')  # struct members may be of enum type
             fh.write('/* VCC Structs */\n')
             for struct_name, struct_data in structs.items():
                 fh.write('\n')
@@ -656,8 +653,8 @@ class UserDefinedTypes(ProblemLogger):
             common_header_files (list(Path)): List of names of generated files.
         """
         src_dir = self._build_prj_cfg.get_src_code_dst_dir()
-        enum_file_path = Path(src_dir, self.enum_file_name)
-        struct_file_path = Path(src_dir, self.struct_file_name)
+        enum_file_path = Path(src_dir, 'VcEnumerations.h')
+        struct_file_path = Path(src_dir, 'VcStructs.h')
         self._generate_enum_header_file(enum_file_path)
         self._generate_struct_header_file(struct_file_path)
         self.common_header_files.extend([enum_file_path.name, struct_file_path.name])

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build/zone_controller/composition_yaml.py

@@ -54,6 +54,11 @@ class CompositionYaml(ProblemLogger):
             **self.composition_spec.get("data_types", {}),
         }
         self.port_interfaces = self.composition_spec.get("port_interfaces", {})
+        self.sharedSwAddrMethod = self.build_cfg.get_composition_config("includeSharedSwAddrMethod")
+        if self.sharedSwAddrMethod is not None and not isinstance(self.sharedSwAddrMethod, str):
+            self.sharedSwAddrMethod = None
+            self.critical("includeSharedSwAddrMethod must be a string if set.")
+
         calibration_variables, measurable_variables = self._get_variables()
         self.calibration_init_values = self.get_init_values(calibration_variables)
         self.cal_class_info = self._get_class_info(calibration_variables)
@@ -706,7 +711,6 @@ class CompositionYaml(ProblemLogger):
         if info["type"] in self.enums.keys():
             return class_info, data_types
 
-        includeSharedSwAddrMethod = self.build_cfg.get_composition_config("includeSharedSwAddrMethod")
         isReadOnly = "CVC_DISP" in info["class"] or info["class"] == "CVC_EXT"
         if "Bool" in info["type"]:
             upper = 1
@@ -727,8 +731,8 @@ class CompositionYaml(ProblemLogger):
                 class_info[signal_name]["longname"] = self._prepare_for_xml(signal_name, info["description"])
             if info["unit"] and info["unit"] != "-":
                 class_info[signal_name]["unit"] = info["unit"]
-            if includeSharedSwAddrMethod and not isReadOnly:
-                class_info[signal_name]["swAddrMethod"] = f"VCC_CALIBRATION_{signal_name.split('_')[0]}"
+            if self.sharedSwAddrMethod is not None and not isReadOnly:
+                class_info[signal_name]["swAddrMethod"] = f"{self.sharedSwAddrMethod}_{signal_name.split('_')[0]}"
             return class_info, data_types
 
         if isinstance(lower, list) or isinstance(upper, list):
@@ -838,7 +842,7 @@ class CompositionYaml(ProblemLogger):
         }
         if info["description"]:
             class_info[signal_name]["longname"] = self._prepare_for_xml(signal_name, info["description"])
-        if includeSharedSwAddrMethod and not isReadOnly:
-            class_info[signal_name]["swAddrMethod"] = f"VCC_CALIBRATION_{signal_name.split('_')[0]}"
+        if self.sharedSwAddrMethod is not None and not isReadOnly:
+            class_info[signal_name]["swAddrMethod"] = f"{self.sharedSwAddrMethod}_{signal_name.split('_')[0]}"
         data_types = {**data_types, **new_data_type}
         return class_info, data_types

{powertrain_build-1.11.7.dev2 → powertrain_build-1.11.8.dev1}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev2
+Version: 1.11.8.dev1
 Summary: A Continuous Integration (CI) build system testing all configurations where a Simulink model is used.
 Home-page: https://opendev.org/volvocars/powertrain-build
 Download-URL: https://pypi.org/project/powertrain-build/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# owertrain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

powertrain_build-1.11.8.dev1/powertrain_build.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "7705917", "is_release": false}

powertrain_build-1.11.7.dev2/powertrain_build.egg-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "b4279b4", "is_release": false}