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

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

@@ -1,7 +1,8 @@
 CHANGES
 =======
 
-* Reapply "New RTE checkpoint interface" work
+* Dummy 1
+* Remove ZC direction verification for CLIENT/SERVER calls
 
 1.8.1
 -----

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.8.2.dev1
+Version: 1.8.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
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

{powertrain_build-1.8.2.dev1 → powertrain_build-1.8.2.dev2}/powertrain_build/build_proj_config.py

@@ -72,7 +72,6 @@ class BuildProjConfig:
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,
             'generateRteCheckpointIds': False,
-            'rteCheckpointIdSize': None,
             'generateYamlInterfaceFile': False,
             'includeAllEnums': False,
             'mapToRteEnums': False,

{powertrain_build-1.8.2.dev1 → powertrain_build-1.8.2.dev2}/powertrain_build/interface/zone_controller.py

@@ -171,13 +171,6 @@ class ZCAL(BaseApplication):
         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",
-        }
-        direction = supported_directions[direction]
         update_elements = set()
         for element_name, element_data in signal_struct.items():
             for element in element_data:
@@ -187,7 +180,8 @@ class ZCAL(BaseApplication):
                     temp_dir = "OUT"
                 else:
                     raise BadYamlFormat(f"in-/out-signal for element in { element_name } is missing.")
-                if direction != temp_dir:
+                # 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)

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

@@ -57,25 +57,19 @@ class SchedFuncs(ProblemLogger):
         Args:
             generate_rte_checkpoint_calls (bool): Generate RTE function checkpoint calls.
         """
-        dst_dir = self._prj_cfg.get_src_code_dst_dir()
-        unit_raster_cfg = self._prj_cfg.get_units_raster_cfg()
-        per_unit_cfg = self._unit_cfg.get_per_unit_cfg()
-        prefix = self._prj_cfg.get_scheduler_prefix()
-        unit_counter = 1
         generate_rte_checkpoint_ids = self._prj_cfg.get_code_generation_config("generateRteCheckpointIds")
-        rte_checkpoint_id_size = self._prj_cfg.get_code_generation_config("rteCheckpointIdSize")
-        if rte_checkpoint_id_size is None:
-            if generate_rte_checkpoint_calls:
-                self.warning("RTE checkpoint ID size not set, assuming size is the same as the number of units.")
-            rte_checkpoint_id_size = len(self._prj_cfg.get_all_units())
         include_name = self._prj_cfg.get_composition_config("softwareComponentName")
         function_name = self._prj_cfg.get_composition_config("compositionName")
         if function_name is None:
             function_name = include_name
-
+        dst_dir = self._prj_cfg.get_src_code_dst_dir()
+        unit_raster_cfg = self._prj_cfg.get_units_raster_cfg()
+        per_unit_cfg = self._unit_cfg.get_per_unit_cfg()
+        prefix = self._prj_cfg.get_scheduler_prefix()
         init_ext_def_s = ""
         init_call_s = f'#include "{build_defs.CVC_CODE_START}"\n\n'
         init_call_s += f'void {prefix}VcExtINI(void)\n{{\n'
+
         for raster in unit_raster_cfg['SampleTimes']:
             if raster == "init":
                 for unit in unit_raster_cfg['Rasters'][raster]:
@@ -107,10 +101,6 @@ class SchedFuncs(ProblemLogger):
                 call_str = f'#include "{build_defs.CVC_CODE_START}"\n'
                 call_str += f'void {prefix}{raster}(void)\n{{\n'
                 for unit in unit_raster_cfg['Rasters'][raster]:
-                    if unit_counter > rte_checkpoint_id_size:
-                        self.critical(
-                            'RTE checkpoint ID size %d is smaller than the number of units.', rte_checkpoint_id_size
-                        )
                     if unit not in SchedFuncs.RESTART_FNC_EXCLUDE and 'code_generator' in per_unit_cfg[unit]:
                         code_generator = per_unit_cfg[unit]['code_generator']
                     else:
@@ -126,30 +116,15 @@ 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 += (
-                                '  (void)Rte_Call_alive_WdgMSupervisedEntity_'
-                                f'AR_{raster}_CheckpointReached({unit_counter}U);\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'
                             init_call_s += f'  RESTART_{unit_name}();\n'
-                    unit_counter += 1
-                if generate_rte_checkpoint_calls:
-                    # Also call remaining dummy IDs, "new way" only
-                    for i in range(unit_counter, rte_checkpoint_id_size + 1):
-                        call_str += (
-                            '  (void)Rte_Call_alive_WdgMSupervisedEntity_'
-                            f'AR_{raster}_CheckpointReached({i}U);\n'
-                        )
                 ext_def_str += '\n'
                 call_str += '}\n'
                 call_str += f'#include "{build_defs.CVC_CODE_END}"\n\n'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.8.2.dev1
+Version: 1.8.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
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

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

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