powertrain-build 1.5.3.dev2__tar.gz → 1.5.3.dev4__tar.gz

{powertrain_build-1.5.3.dev2 → powertrain_build-1.5.3.dev4}/ChangeLog

@@ -1,49 +1,24 @@
 CHANGES
 =======
 
-* Continuation of new RTE checkpoint interface
-* New RTE checkpoint interface
-
-1.5.2
------
+1.5.3.dev4
+----------
 
+* Test fix for decoder error
+* New RTE checkpoint interface
 * Revert "Set error\_handling true for e2eStatus signals"
-
-1.5.1
------
-
 * Set error\_handling true for e2eStatus signals
 * External inports should also be considered as measurable variables
-
-1.5.0
------
-
 * Bug fixes to rte\_dummy.py
 * Add option for redirecting calibration variables as RTE function calls
 * Start adding io keys from ZC yaml files
 * Add RTE SWC dummy files and data types to rte\_dummy
 * Try using data type from Simulink class for enumerations
 * Refactor user\_defined\_types.py
-
-1.4.8
------
-
 * Updates to NVM handling
-
-1.4.7
------
-
 * Bug fix in powertrain\_build/sched\_funcs.py
-
-1.4.6
------
-
 * No longer need to define the FctList thing for watch dogs
 * Use generated header files in calibration.py
-
-1.4.5
------
-
 * calibration\_interface.c files needs to have distinct names since they are included in some linking process in integration. This appends the scheduler prefix as a suffix to calibration\_interface.c
 * Generate rte nvm function call dummys for silver unit tests
 * Nvm blocks should read nvm block info at init, so that the stored data can be used

{powertrain_build-1.5.3.dev2 → powertrain_build-1.5.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.3.dev2
+Version: 1.5.3.dev4
 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.5.3.dev2 → powertrain_build-1.5.3.dev4}/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.5.3.dev2 → powertrain_build-1.5.3.dev4}/powertrain_build/pt_matlab.py

@@ -401,7 +401,11 @@ class Matlab:
                         while not os.path.isfile(self.log) and p_matlab.poll() == pt_win32.STILL_ACTIVE:
                             time.sleep(POLL_TIME)
 
-                self.open_log_file = open(self.log, "r", encoding="utf-8") if self.log else None
+                try:
+                    self.open_log_file = open(self.log, "r", encoding="utf-8") if self.log else None
+                except:
+                    self.open_log_file = open(self.log, "r", encoding="ascii") if self.log else None
+
 
             wait_for_process(p_matlab)
             process_status = p_matlab.poll()

{powertrain_build-1.5.3.dev2 → powertrain_build-1.5.3.dev4}/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(per_unit_cfg)
         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,8 +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:
@@ -133,21 +125,13 @@ class SchedFuncs(ProblemLogger):
                             )
                             # new
                             call_str += (
-                                '  Rte_Call_alive_WdgMSupervisedEntity_'
-                                f'AR_{raster}_CheckpointReached({unit_counter});\n'
+                                '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'
                             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 += (
-                            '  Rte_Call_alive_WdgMSupervisedEntity_'
-                            f'AR_{raster}_CheckpointReached({i});\n'
-                        )
                 ext_def_str += '\n'
                 call_str += '}\n'
                 call_str += f'#include "{build_defs.CVC_CODE_END}"\n\n'

{powertrain_build-1.5.3.dev2 → powertrain_build-1.5.3.dev4}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.5.3.dev2
+Version: 1.5.3.dev4
 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.5.3.dev4/powertrain_build.egg-info/pbr.json

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

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

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