powertrain-build 1.1.2.dev2__tar.gz → 1.1.2.dev3__tar.gz

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/ChangeLog

@@ -1,10 +1,9 @@
 CHANGES
 =======
 
-1.1.2.dev2
-----------
-
-* Enable enums in interface for zone controller
+* Dummy 2
+* Dummy 1
+* Fixes in interface/zone\_controller.py
 
 1.1.1
 -----
@@ -45,19 +44,15 @@ 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
@@ -80,10 +75,6 @@ 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.dev2 → powertrain_build-1.1.2.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev2
+Version: 1.1.2.dev3
 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"
 
-# powertrain-build
+# rtrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/README.md

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

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/powertrain_build/build.py

@@ -904,7 +904,8 @@ def build(
             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, udt.get_enumerations())
+                build_cfg, signal_if.composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, axis_data
+            )
             LOG.info("******************************************************")
             composition_yaml.generate_yaml()
             LOG.info("******************************************************")

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/powertrain_build/build_proj_config.py

@@ -677,21 +677,6 @@ class BuildProjConfig:
             )
         return None
 
-    def enable_snake_case_enums(self):
-        """Return True/False whether enums should be snake case in source code. Default is false (all caps).
-
-        Returns:
-            (bool): True/False whether enums should be snake case in source code
-        """
-        return self._prj_cfg['ProjectInfo'].get('snakeCaseEnums', False)
-
-    def enable_external_rte_headers(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('enableExternalRteHeaders', False)
 
 if __name__ == '__main__':
     # Function for testing the module

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/powertrain_build/ext_var.py

@@ -160,10 +160,6 @@ class ExtVarBase(ProblemLogger):
 
             for common_header_file in self._common_header_files:
                 fh_c.write(f'#include "{common_header_file}"\n')
-            if self._prj_cfg.enable_external_rte_headers():
-                fh_c.write('#include "Rte_Type.h"\n')
-                composition_name = self._prj_cfg.get_composition_config("softwareComponentName")
-                fh_c.write(f'#include "Rte_{ composition_name }_Type.h"\n')
             fh_c.write("\n")
 
             fh_c.write(f'#include "{self._decl_start}"\n')

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

@@ -139,7 +139,6 @@ class ZCAL(BaseApplication):
         Args:
             definition (list(Path)): Definition files
         """
-
         raw = self.read_translation_files(definition)
         self.composition_spec = {
             key: raw[key] for key in ("port_interfaces", "data_types", "calls", "diagnostics", "nv-needs") if key in raw
@@ -147,12 +146,13 @@ class ZCAL(BaseApplication):
         ports_info = {}
         for port_name, port in raw.get("ports", {}).items():
             signal_struct = port.get("element", {})
+            direction = port.get("direction", None)
             if signal_struct:
                 for element_name, element_data in signal_struct.items():
                     self.populate_signal_translations(port_name, element_name, element_data)
                 # Loop inside function to make sure direction is consistent
                 ports_info[port_name] = {
-                    **self.get_port_info(signal_struct),
+                    **self.get_port_info(port_name, direction, signal_struct),
                     "interface": port.get("interface")
                 }
             else:
@@ -160,18 +160,31 @@ class ZCAL(BaseApplication):
         self.composition_spec["ports"] = ports_info
 
     @staticmethod
-    def get_port_info(signal_struct):
+    def get_port_info(port_name, direction, signal_struct):
         """Extract port information from signal elements in port. Raises exception
         if signal elements are not exclusively sent in one direction.
 
         Args:
-            signal_struct (dict): Signal dict containing list of signal elements
+            port_name (str): Name of the port.
+            direction (str): Direction of the port.
+            signal_struct (dict): Signal dict containing list of signal elements.
         Returns:
             port_info (dict): Dict containing port direction and if any elements
             should have an update bit associated with them.
         """
+        if direction is None:
+            raise BadYamlFormat(f'Port {port_name} is missing required property "direction".')
+
+        supported_directions = {
+            "IN": "IN",
+            "OUT": "OUT",
+            "CLIENT": "IN",
+            "SERVER": "OUT",
+        }
+        initial_direction = direction
+        direction = supported_directions[direction]
+
         update_elements = set()
-        direction = None
         for element_name, element_data in signal_struct.items():
             for element in element_data:
                 if "insignal" in element:
@@ -180,12 +193,12 @@ class ZCAL(BaseApplication):
                     temp_dir = "OUT"
                 else:
                     raise BadYamlFormat(f"in/out signal for element in { element_name } is missing.")
-                if direction is not None and direction != temp_dir:
+                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)
-        port_info = {"direction": direction}
+        port_info = {"direction": initial_direction}
         if update_elements:
             port_info["enable_update"] = list(update_elements)
         return port_info

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/powertrain_build/user_defined_types.py

@@ -437,8 +437,6 @@ class UserDefinedTypes(ProblemLogger):
         for signal_type in ['inports', 'outports', 'local_vars', 'calib_consts']:
             for signal_data in u_cfg[signal_type].values():
                 if enum_name == signal_data['type'] and 'default' in signal_data:
-                    if self._build_prj_cfg.enable_snake_case_enums():
-                        return f"{enum_name}_{signal_data['default']}"
                     return f"{enum_name.upper()}_{signal_data['default'].upper()}"
 
         self.warning(
@@ -535,17 +533,14 @@ class UserDefinedTypes(ProblemLogger):
         with file_path.open('w') as fh:
             fh.write(self._get_header_file_header(guard))
             fh.write('/* VCC Enumerations */\n')
-            if self._build_prj_cfg.enable_external_rte_headers():
-                fh.write('\n/* External enums located in rte headers */\n\n')
-            else:
-                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')
+            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')
             fh.write(f'#endif /* {guard} */\n')
 
     def generate_common_header_files(self):

{powertrain_build-1.1.2.dev2 → powertrain_build-1.1.2.dev3}/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, enums):
+    def __init__(self, build_cfg, composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, a2l_axis_data):
         """Init.
 
         Args:
@@ -44,7 +44,6 @@ 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 = {
@@ -189,10 +188,6 @@ 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 = {}
@@ -596,22 +591,13 @@ class CompositionYaml(ProblemLogger):
             data_types (dict): Dictionary with data types.
             signal_name (string): Name of signal to process.
             info (dict): signal data.
-        Returns::wq
-
+        Returns:
             class_info (dict): Updated dictionary with variables.
             data_types (dict): Updated dictionary with data types.
         """
         if "Bool" in info["type"]:
             upper = 1
             lower = 0
-        elif info["type"] in self.enums:
-            new_data_type = {info["type"]: {"type": "ENUMERATION", "enums": self.enums[info["type"]]["members"]}}
-            class_info[signal_name] = {
-                "type": info["type"], "access": ("READ-ONLY" if "CVC_DISP" in info["class"] else "READ-WRITE"),
-                "init": self.enums[info["type"]]["default_value"]
-            }
-            #data_types = {**data_types, **new_data_type}
-            return class_info, data_types
         else:
             base_type_lower = self.data_types[info["type"]]["limits"]["lower"]
             base_type_upper = self.data_types[info["type"]]["limits"]["upper"]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev2
+Version: 1.1.2.dev3
 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"
 
-# powertrain-build
+# rtrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

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

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