powertrain-build 1.1.2.dev6__tar.gz → 1.1.3.dev2__tar.gz

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/ChangeLog

@@ -1,11 +1,10 @@
 CHANGES
 =======
 
-* Dummy 5
-* Dummy 4
-* Dummy 2
-* Dummy 2
-* Dummy 1
+1.1.3.dev2
+----------
+
+* Enable enums in interface for zone controller
 * Fixes in interface/zone\_controller.py
 
 1.1.1
@@ -47,15 +46,19 @@ CHANGES
 -----
 
 * Missed to update use of get function
+* Measure code coverage in tox tests
+* Add option for supplying custom step function name
 
 1.0.3
 -----
 
-* Measure code coverage in tox tests
-* Add option for supplying custom step function name
 * Aggregate project settings for ARXML specifications in ProjectCfg
 * CRLF -> LF
 * Update NOTICE file
+
+1.0.2.dev99
+-----------
+
 * Improve TargetLink documentation
 * Add option for supplying custom init function name
 * Add docs about TargetLink
@@ -78,6 +81,10 @@ CHANGES
 
 * Make composition\_yaml read diagnostics key instead
 * Devs asked for missing ZC dids to be erroneous
+
+0.1.1
+-----
+
 * Refactor usage of ecu\_supplier
 * Make powertrain-build not overlap with pybuild in site-packages
 * Bug fix - always set zc\_dids in compisition\_yaml

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev6
+Version: 1.1.3.dev2
 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/
@@ -39,7 +39,7 @@ Requires-Dist: scipy==1.14.1; python_version >= "3.11"
 Requires-Dist: importlib-resources==5.4.0; python_version < "3.9"
 Requires-Dist: pywin32==305; python_version == "3.6" and sys_platform == "win32"
 
-# train-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/README.md

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

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build/build.py

@@ -903,9 +903,8 @@ def build(
             project_nvm_defintions = unit_cfg.get_per_cfg_unit_cfg().get("nvm", {})
             zc_nvm = ZCNVMDef(build_cfg, unit_cfg, project_nvm_defintions)
             axis_data = merged_a2l.get_characteristic_axis_data()
-            composition_yaml = CompositionYaml(
-                build_cfg, signal_if.composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, axis_data
-            )
+            composition_yaml = CompositionYaml(build_cfg, signal_if.composition_spec, unit_cfg, zc_core,
+                                               zc_dids, zc_nvm, axis_data, udt.get_enumerations())
             LOG.info("******************************************************")
             composition_yaml.generate_yaml()
             LOG.info("******************************************************")

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build/build_proj_config.py

@@ -677,6 +677,25 @@ class BuildProjConfig:
             )
         return None
 
+    def include_all_enums(self):
+        """Return True if all enums encountered in the enum definition files should be included in the generated code,
+        even if they are not used in any models. Requires the ProjectInfo.enumDefDir key to be present in the project config.
+
+        Returns:
+            bool: True if all enumerations should be generated by source code, False otherwise.
+        """
+        if not self.get_enum_def_dir():
+            return False
+        return self._prj_cfg['ProjectInfo'].get('includeAllEnums', False)
+
+    def map_to_rte_enums(self):
+        """Return True/False whether external RTE headers should be included in ext vars. Default is false.
+
+        Returns:
+            (bool): True/False whether external RTE headers should be included in ext vars
+        """
+        return self._prj_cfg['CodeGenerationConfig'].get('mapEnumsToRteCounterpart', False)
+
 
 if __name__ == '__main__':
     # Function for testing the module

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build/interface/zone_controller.py

@@ -189,7 +189,6 @@ class ZCAL(BaseApplication):
                     raise BadYamlFormat(f"in/out signal for element in { element_name } is missing.")
                 if direction != temp_dir:
                     raise BadYamlFormat(f"Signal { element_name } has both in and out elements.")
-                direction = temp_dir
                 if element.get("updateBit", False):
                     update_elements.add(element_name)
 

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build/user_defined_types.py

@@ -52,6 +52,7 @@ class UserDefinedTypes(ProblemLogger):
         self._build_prj_cfg = build_prj_config
         self._unit_configs = unit_configs
         self.enums_per_unit = {}
+        self.common_enums = self._read_enums_from_definitions()
         self.structs_per_unit = {}
         self._parse_all_user_defined_types()
         self.common_header_files = []
@@ -304,14 +305,19 @@ class UserDefinedTypes(ProblemLogger):
             enum_members_tmp = re.findall(r'\s*(\w+) = ([-+]?\d+)', enum_content, flags=re.M)
             enum_members = [(k, int(v)) for k, v in enum_members_tmp]
             underlying_data_type = self._calculate_underlying_data_type(unit, enum_name, enum_members)
+            default = self.get_default_enum_value(unit, enum_name)
             enum_dict = {
                 'underlying_data_type': underlying_data_type,
                 'members': {},
                 'default_value': self.get_default_enum_value(unit, enum_name)
             }
+
             for key, value in enum_members:
                 enum_dict['members'][key] = value
 
+            if default is None:
+                print(enum_dict)
+
             if enum_name in self.enums_per_unit[unit]:
                 is_consistent_enums = self._compare_enum_definitions(
                     [unit],
@@ -369,47 +375,58 @@ class UserDefinedTypes(ProblemLogger):
 
         return underlying_data_type
 
-    def _get_default_enum_value_tmp(self, enum_name):
-        """Get default value of given enumeration name.
-
-        Requires "enumDefDir" in the ProjectCfg.json file.
+    def _read_enums_from_definitions(self):
+        """ Reads all enums from .m files where they are defined. Requires projectInfo.enumDefDir in
+        ProjectCfg.json file.
         Files defining simulink class enumerations are expected to follow a template.
 
-        TODO: Remove this function when there is a default enum value in every config_*.json file.
-
-        Args:
-            enum_name (str): Name of an enumeration.
-        Returns:
-            default_value_str (str): Default value (string) for the given enumeration name.
-                None if value could not be extracted.
         """
+        common_enums = {}
         if self._build_prj_cfg.get_enum_def_dir() is None:
             self.warning(
                 'Cannot extract default enumeration value for %s. Missing "enumDefDir" in ProjectCfg.json.',
-                enum_name
             )
             return None
 
-        enum_def_file = Path(self._build_prj_cfg.get_enum_def_dir(), f'{enum_name}.m')
-        if not enum_def_file.is_file():
-            self.warning('Cannot extract default enumeration value. File not found: %s', str(enum_def_file))
-            return None
-
-        with enum_def_file.open(mode='r', encoding='ISO-8859-1') as fh:
-            enum_def_content = fh.read()
-        get_default_value = re.search(
-            r'function ([A-Za-z0-9]+) = getDefaultValue\(\)[\s\n]*'
-            r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9]+);[\s\n]*'
-            r'end',
-            enum_def_content,
-            flags=re.MULTILINE
-        )
-        if get_default_value is None:
-            self.warning('Cannot extract default enumeration values in: %s', str(enum_def_file))
-            return None
+        enum_files = Path(self._build_prj_cfg.get_enum_def_dir()).rglob('*.m')
+        for enum_file in enum_files:
+            with enum_file.open(mode='r', encoding='ISO-8859-1') as fh:
+                enum_file_content = fh.read()
+
+            enum_name = enum_file.stem
+            members_part = re.search(
+                r'\s+enumeration\n'
+                r'(\s*\w+\(\d+\)\n)+'
+                r'\s+end',
+                enum_file_content,
+                flags=re.MULTILINE
+            )
+            if not members_part:
+                self.warning('Cannot extract enumeration members from %s', str(enum_file))
+                continue
+            members = re.findall(r'(\w+)\((\d+)\)', members_part.group(0))
+            member_dict = {enum_name + '_' + member[0]: int(member[1]) for member in members}
+            get_default_value = re.search(
+                r'function ([A-Za-z0-9]+) = getDefaultValue\(\)[\s\n]*'
+                r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9]+);[\s\n]*'
+                r'end',
+                enum_file_content,
+                flags=re.MULTILINE
+            )
+            if get_default_value is None:
+                self.warning('Cannot extract default enumeration values in: %s', str(enum_file))
+                return None
+            _unused, default_value = get_default_value.groups()
+            default_member = f'{enum_name.upper()}_{default_value.upper()}'
+            enum_members = [(member_name, member_value) for member_name, member_value in member_dict.items()]
+            underlying_data_type = self._calculate_underlying_data_type('target_link', enum_name, enum_members)
+            common_enums[enum_name] = {
+                "underlying_data_type": underlying_data_type,
+                "default": default_member,
+                "members": member_dict
+            }
+        return common_enums
 
-        _unused, default_value = get_default_value.groups()
-        return f'{enum_name.upper()}_{default_value.upper()}'
 
     def get_default_enum_value(self, unit, enum_name):
         """Get default value of given enumeration name by searching in the unit configuration.
@@ -446,7 +463,7 @@ class UserDefinedTypes(ProblemLogger):
             enum_name,
             unit
         )
-        return self._get_default_enum_value_tmp(enum_name)
+        return self.common_enums.get(enum_name, {}).get('default', None)
 
     def get_enumerations(self):
         """Get all enumeration defined in the project, together with unit usage.
@@ -464,6 +481,12 @@ class UserDefinedTypes(ProblemLogger):
                 else:
                     enumerations[enum_name] = deepcopy(enum_data)
                     enumerations[enum_name]['units'] = [unit]
+        if self._build_prj_cfg.include_all_enums():
+            for enum_name, enum_data in self.common_enums.items():
+                if enum_name not in enumerations:
+                    self.warning("Enumeration %s is not used in any unit. Generated anyway since 'includeAllEnums' is True", enum_name) 
+                    enumerations[enum_name] = deepcopy(enum_data)
+                    enumerations[enum_name]['units'] = []
         return enumerations
 
     def get_interface_data_types(self):
@@ -529,18 +552,36 @@ class UserDefinedTypes(ProblemLogger):
             file_path (Path): Path to file to generate.
         """
         enumerations = self.get_enumerations()
+        rte_interface_enums = self._build_prj_cfg.map_to_rte_enums()
         guard = f"{file_path.stem.upper()}_H"
         with file_path.open('w') as fh:
             fh.write(self._get_header_file_header(guard))
-            fh.write('/* VCC Enumerations */\n')
+            if rte_interface_enums:
+                composition_name = self._build_prj_cfg.get_composition_config("softwareComponentName")
+                fh.write(f'#include "Rte_{ composition_name }_Type.h"\n')
+            fh.write('/* VCC Enumerations */\n\n')
             for enum_name, enum_data in enumerations.items():
-                fh.write('\n')
-                fh.write(f'typedef enum {enum_name}_tag {{\n')
-                nr_of_enum_members = len(enum_data['members'])
-                for idx, enum_member_name in enumerate(enum_data['members']):
-                    ending = ', ' if idx < nr_of_enum_members - 1 else ' '
-                    fh.write(f"   {enum_member_name} = {enum_data['members'][enum_member_name]}{ending}\n")
-                fh.write(f'}} {enum_name};\n')
+                members = enum_data['members']
+                member_strs = ',\n'.join([f"   {member.upper()} = {value}" for member, value in members.items()])
+                enum_definition = (
+                    f'typedef enum {enum_name}_tag {{\n'
+                    f'{member_strs}'
+                    '\n'
+                    f'}} {enum_name};\n'
+                )
+                if rte_interface_enums:
+                    enum = self.common_enums[enum_name]
+                    enum_member_0 = [member for member, value in enum["members"].items() if value == 0][0]
+                    rte_translation = '\n'.join(f"#define {member.upper()} {member}" for member in enum["members"].keys())
+                    compile_time_guard = f""
+                    enum_definition = (
+                        f'#ifndef {enum_member_0}\n'
+                        f'{enum_definition}\n'
+                        f'#else\n'
+                        f'{rte_translation}\n'
+                        f'#endif /* {enum_member_0} */\n'
+                    )
+                fh.write(enum_definition + '\n')
             fh.write(f'#endif /* {guard} */\n')
 
     def generate_common_header_files(self):

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build/zone_controller/composition_yaml.py

@@ -15,7 +15,7 @@ from powertrain_build.zone_controller.calibration import ZoneControllerCalibrati
 class CompositionYaml(ProblemLogger):
     """Class for handling ZoneController composition yaml generation."""
 
-    def __init__(self, build_cfg, composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, a2l_axis_data):
+    def __init__(self, build_cfg, composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, a2l_axis_data, enums):
         """Init.
 
         Args:
@@ -44,6 +44,7 @@ class CompositionYaml(ProblemLogger):
         self.zc_core = zc_core
         self.zc_dids = zc_dids
         self.zc_nvm = zc_nvm
+        self.enums = enums
         self.a2l_axis_data = a2l_axis_data
         base_data_types = self.get_base_data_types()  # Might not be necessary in the long run
         self.data_types = {
@@ -188,6 +189,10 @@ class CompositionYaml(ProblemLogger):
                 re.compile(r"^\s*CVC_CAL[A-Z_]*\s+\w+\s+(?P<name>\w+)\[(?P<rows>[\d]+)\]\[(?P<cols>[\d]+)\]\s*=\s*"),
                 self._get_matrix_init_values,
             ),
+            (
+                re.compile(r"^\s*CVC_CAL[A-Z_]*\s+\w+\s+(?P<name>\w+)\s*=\s*(?P<enum>[a-zA-Z_$][\w_]*?)*;"),
+                lambda regex_match, _: regex_match.group("enum"),
+            ),
         ]
 
         init_values = {}
@@ -591,10 +596,13 @@ class CompositionYaml(ProblemLogger):
             data_types (dict): Dictionary with data types.
             signal_name (string): Name of signal to process.
             info (dict): signal data.
-        Returns:
+        Returns::wq
+
             class_info (dict): Updated dictionary with variables.
             data_types (dict): Updated dictionary with data types.
         """
+        if info["type"] in self.enums:
+            return class_info, data_types
         if "Bool" in info["type"]:
             upper = 1
             lower = 0

{powertrain_build-1.1.2.dev6 → powertrain_build-1.1.3.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev6
+Version: 1.1.3.dev2
 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/
@@ -39,7 +39,7 @@ Requires-Dist: scipy==1.14.1; python_version >= "3.11"
 Requires-Dist: importlib-resources==5.4.0; python_version < "3.9"
 Requires-Dist: pywin32==305; python_version == "3.6" and sys_platform == "win32"
 
-# train-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

@@ -0,0 +1 @@
+{"git_version": "afdb37d", "is_release": true}

powertrain_build-1.1.2.dev6/powertrain_build.egg-info/pbr.json

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