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

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

@@ -1,6 +1,7 @@
 CHANGES
 =======
 
+* TMP HIC: Remove old RTE checkpoint calls
 * Reapply "New RTE checkpoint interface" work
 * Don't generate VcDebug files if there are no variables
 

{powertrain_build-1.8.3.dev2 → powertrain_build-1.8.3.dev3}/PKG-INFO

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

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

@@ -71,7 +71,6 @@ class BuildProjConfig:
             'generateCoreDummy': False,
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,
-            'generateRteCheckpointIds': False,
             'rteCheckpointIdSize': None,
             'customRteCheckpointEntityName': None,
             'generateYamlInterfaceFile': False,

{powertrain_build-1.8.3.dev2 → powertrain_build-1.8.3.dev3}/powertrain_build/rte_dummy.py

@@ -67,7 +67,7 @@ class RteDummy(ProblemLogger):
             '#include "tl_basetypes.h"\n'
             f"{include_nvm_header}\n"
             "#define FALSE 0U\n"
-            "#define TRUE 1U\n"
+            "#define TRUE 1U\n\n"
         )
 
     def _get_type_header_footer(self):
@@ -88,8 +88,6 @@ class RteDummy(ProblemLogger):
         function_name = self.build_cfg.get_composition_config("compositionName")
         if function_name is None:
             function_name = self.build_cfg.get_composition_config("softwareComponentName")
-        if self.build_cfg.get_code_generation_config("generateRteCheckpointIds"):
-            typedefs.append(f"typedef UInt8 {function_name}FctList;\n")
 
         # MAPs get typedef:ed to structs and need special data type mapping in calibration.py
         for signal_name, signal_data in self.calibration_variables.items():

{powertrain_build-1.8.3.dev2 → powertrain_build-1.8.3.dev3}/powertrain_build/sched_funcs.py

@@ -64,8 +64,7 @@ class SchedFuncs(ProblemLogger):
         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")
-        rteCheckpointEntityName = self._prj_cfg.get_code_generation_config("customRteCheckpointEntityName")
+        customRteCheckpointEntityName = self._prj_cfg.get_code_generation_config("customRteCheckpointEntityName")
         rte_checkpoint_id_size = self._prj_cfg.get_code_generation_config("rteCheckpointIdSize")
         if rte_checkpoint_id_size is None:
             if generate_rte_checkpoint_calls:
@@ -80,8 +79,10 @@ class SchedFuncs(ProblemLogger):
         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 rteCheckpointEntityName is None:
+            if customRteCheckpointEntityName is None:
                 rteCheckpointEntityName = f'AR_{raster}_CheckpointReached'
+            else:
+                rteCheckpointEntityName = customRteCheckpointEntityName
             if raster == "init":
                 for unit in unit_raster_cfg['Rasters'][raster]:
                     if unit not in SchedFuncs.RESTART_FNC_EXCLUDE and 'code_generator' in per_unit_cfg[unit]:
@@ -104,9 +105,6 @@ class SchedFuncs(ProblemLogger):
                 includes = ""
                 if generate_rte_checkpoint_calls:
                     includes += f'#include "Rte_{include_name}.h"\n'
-                if generate_rte_checkpoint_ids:
-                    print("GOT HERE")
-                    includes += '#include "Rte_Type.h"\n'
                 if includes:
                     includes += '\n'
                 ext_def_str = ""
@@ -136,11 +134,13 @@ class SchedFuncs(ProblemLogger):
                         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'
-                            )
+                            # TEMPORARY REMOVE FOR HIC
+                            if not "HIC" in function_name:
+                                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_'

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

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

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

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

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

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