powertrain-build 1.5.2.dev1__tar.gz → 1.5.2.dev2__tar.gz

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.2.dev2}/ChangeLog

@@ -1,7 +1,8 @@
 CHANGES
 =======
 
-* Add ports to runnables/reads and writes key
+* Dummy1
+* New RTE checkpoint interface
 
 1.5.1
 -----

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.2.dev1
+Version: 1.5.2.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/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.2.dev2}/README.md

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

{powertrain_build-1.5.2.dev1 → powertrain_build-1.5.2.dev2}/powertrain_build/sched_funcs.py

@@ -116,11 +116,18 @@ class SchedFuncs(ProblemLogger):
                     else:
                         ext_def_str += f'extern void {unit_name}(void);\n'
                         if generate_rte_checkpoint_calls:
+                            # Add both calls during transition period
+                            # old
                             call_str += (
                                 f'  Rte_Call_{function_name}_'
                                 f'{function_name}LogicalCheckpointReached_CddPFMC_ASILD_'
                                 f'{function_name}_LogicalCheckpointReached(ID_{unit_name});\n'
                                 )
+                            # new
+                            call_str += (
+                                'Rte_Call_alive_WdgMSupervisedEntity_'
+                                f'AR_{raster}_CheckpointReached(ID_{unit_name});\n'
+                            )
                         call_str += f'  {unit_name}();\n'
                         if unit_name not in SchedFuncs.RESTART_FNC_EXCLUDE:
                             init_ext_def_s += f'extern void RESTART_{unit_name}(void);\n'

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

@@ -449,33 +449,25 @@ class CompositionYaml(ProblemLogger):
         Returns:
             dict: Dict containing runnables information.
         """
+        swc_name = self.build_cfg.get_composition_config("softwareComponentName")
         autosar_prefix = "AR_"
         swc_prefix = self.build_cfg.get_scheduler_prefix()
         custom_step_function = self.build_cfg.get_composition_config("customYamlStepFunctionName")
         custom_init_function = self.build_cfg.get_composition_config("customYamlInitFunctionName")
         standard_init_function = autosar_prefix + swc_prefix + "VcExtINI"
         init_function = custom_init_function if custom_init_function is not None else standard_init_function
+        call_dict = self._get_runnable_calls_info()
+        mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
+        runnables = self.build_cfg.get_units_raster_cfg()["SampleTimes"]
         calibration_variables = list(self.cal_class_info["autosar"]["class_info"].keys())
         swc_content = {init_function: {"type": "INIT", "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}
 
-        call_dict = self._get_runnable_calls_info()
-        mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
-        reads = []
-        writes = []
-        for port, port_data in self._get_ports_info().items():
-            if port_data["direction"] in ["IN", "CLIENT"]:
-                reads.append(port)
-            else:
-                writes.append(port)
-        runnables = self.build_cfg.get_units_raster_cfg()["SampleTimes"]
-
         if len(runnables) == 1 and custom_step_function is not None:
             swc_content[custom_step_function] = {
                 "type": "PERIODIC",
@@ -486,10 +478,6 @@ class CompositionYaml(ProblemLogger):
                 swc_content[custom_step_function]["calls"] = call_dict
             if mode_switch_points_dict:
                 swc_content[custom_step_function]["mode_switch_points"] = mode_switch_points_dict
-            if reads:
-                swc_content[custom_step_function]["reads"] = reads
-            if writes:
-                swc_content[custom_step_function]["writes"] = writes
             return swc_content
 
         if custom_step_function is not None:
@@ -508,10 +496,6 @@ class CompositionYaml(ProblemLogger):
                 swc_content[key]["calls"] = call_dict
             if mode_switch_points_dict:
                 swc_content[key]["mode_switch_points"] = mode_switch_points_dict
-            if reads:
-                swc_content[key]["reads"] = reads
-            if writes:
-                swc_content[key]["writes"] = writes
 
         return swc_content
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.2.dev1
+Version: 1.5.2.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/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

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

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