powertrain-build 1.12.1__tar.gz → 1.13.0__tar.gz

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/ChangeLog

@@ -1,11 +1,16 @@
 CHANGES
 =======
 
+1.13.0
+------
+
+
 1.12.1
 ------
 
 * Don't check supported operations in ZCCore, yaml2arxml does that
 * Add ACC2 to force quote list composition\_yaml.\_edit\_event\_dict
+* ZC: yaml2arxml non-backwards compatible update
 
 1.12.0
 ------

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.12.1
+Version: 1.13.0
 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/

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/powertrain_build/build_proj_config.py

@@ -264,7 +264,6 @@ class BuildProjConfig:
             'customYamlStepFunctionName': file_config.get("customYamlStepFunctionName", None),
             'generateExternalImplementationType': file_config.get("generateExternalImplementationType", True),
             'softwareComponentName': file_config.get("softwareComponentName", self.get_a2l_cfg()['name']),
-            'softwareComponentTemplate': file_config.get('softwareComponentTemplate', None),
             'asil': file_config.get('asil', 'QM'),
             'secure': file_config.get('secure', False),
             'includeStatic': file_config.get('includeStatic', True),

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/powertrain_build/interface/zone_controller.py

@@ -171,7 +171,9 @@ class ZCAL(BaseApplication):
         if direction is None:
             raise BadYamlFormat(f'Port {port_name} is missing required property "direction".')
 
-        update_elements = set()
+        port_info = {}
+        update_elements = []
+        end_to_end_elements = {}
         for element_name, element_data in signal_struct.items():
             for element in element_data:
                 if "insignal" in element:
@@ -183,12 +185,16 @@ class ZCAL(BaseApplication):
                 # CLIENT and SERVER direction support both in and out signals
                 if direction not in ["CLIENT", "SERVER"] and direction != temp_dir:
                     raise BadYamlFormat(f"Signal { element_name } has both in and out elements.")
-                if element.get("updateBit", False):
-                    update_elements.add(element_name)
+                if element.get("updateBit", False) and element_name not in update_elements:
+                    update_elements.append(element_name)
+                if element.get("e2eStatus", False) and element_name not in end_to_end_elements:
+                    end_to_end_elements[element_name] = {}
 
         if update_elements:
-            return {"enable_update": list(update_elements)}
-        return {}
+            port_info.update({"enable_update": update_elements})
+        if end_to_end_elements:
+            port_info.update({"end_to_end": [{k: v} for k, v in end_to_end_elements.items()]})
+        return port_info
 
     def populate_signal_translations(self, port_name, element_name, element_data):
         """Populate class translations data.

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/powertrain_build/zone_controller/composition_yaml.py

@@ -516,14 +516,39 @@ class CompositionYaml(ProblemLogger):
         ) + list(
             self.composition_spec.get("shared", {}).keys()
         )
-        swc_content = {init_function: {"type": "INIT", "accesses": calibration_variables}}
+        swc_content = {
+            init_function: {
+                "type": "INIT",
+                "mode_ref": {
+                    "port": "EcuMVccActivationMode",
+                    "mode": ["VCC_ACTIVE"],
+                    "trigger": "ON-ENTRY"
+                },
+                "accesses": calibration_variables
+            }
+        }
 
         if self.include_calibration_interface_files:
             swc_name = self.build_cfg.get_composition_config("softwareComponentName")
             cal_init_function = autosar_prefix + ZCC.calibration_function_init_template.format(swc_name=swc_name)
             cal_step_function = autosar_prefix + ZCC.calibration_function_step_template.format(swc_name=swc_name)
-            swc_content[cal_init_function] = {"type": "INIT", "accesses": calibration_variables}
-            swc_content[cal_step_function] = {"type": "PERIODIC", "period": 0.1, "accesses": calibration_variables}
+            swc_content[cal_init_function] = {
+                "type": "INIT",
+                "mode_ref": {
+                    "port": "EcuMVccActivationMode",
+                    "mode": ["VCC_ACTIVE"],
+                    "trigger": "ON-ENTRY"
+                },
+                "accesses": calibration_variables
+            }
+            swc_content[cal_step_function] = {
+                "type": "PERIODIC",
+                "period": 0.1,
+                "mode_suppression": [
+                    {"port": "EcuMVccActivationMode", "disabled_mode": ["VCC_NOT_ACTIVE"]}
+                ],
+                "accesses": calibration_variables
+            }
 
         call_dict = self._get_runnable_calls_info()
         mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
@@ -540,6 +565,9 @@ class CompositionYaml(ProblemLogger):
             swc_content[custom_step_function] = {
                 "type": "PERIODIC",
                 "period": list(runnables.values())[0],
+                "mode_suppression": [
+                    {"port": "EcuMVccActivationMode", "disabled_mode": ["VCC_NOT_ACTIVE"]}
+                ],
                 "accesses": calibration_variables,
             }
             if call_dict:
@@ -562,6 +590,9 @@ class CompositionYaml(ProblemLogger):
             swc_content[key] = {
                 "period": period,
                 "type": "PERIODIC",
+                "mode_suppression": [
+                    {"port": "EcuMVccActivationMode", "disabled_mode": ["VCC_NOT_ACTIVE"]}
+                ],
                 "accesses": calibration_variables,
             }
             if call_dict:
@@ -583,11 +614,8 @@ class CompositionYaml(ProblemLogger):
             data_types (dict): Data types information.
         """
         software_component_name = self.build_cfg.get_composition_config("softwareComponentName")
-        software_component_template = self.build_cfg.get_composition_config("softwareComponentTemplate")
         swcs = {software_component_name: {}}
         swcs[software_component_name]["type"] = "SWC"  # Other types than swc??
-        if software_component_template is not None:
-            swcs[software_component_name]["template"] = software_component_template
         swcs[software_component_name]["asil"] = self.build_cfg.get_composition_config("asil")
         swcs[software_component_name]["secure"] = self.build_cfg.get_composition_config("secure")
         swcs[software_component_name]["runnables"] = self._get_runnable_info()

{powertrain_build-1.12.1 → powertrain_build-1.13.0}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.12.1
+Version: 1.13.0
 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/

powertrain_build-1.13.0/powertrain_build.egg-info/pbr.json

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

powertrain_build-1.12.1/powertrain_build.egg-info/pbr.json

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