powertrain-build 1.14.0__py3-none-any.whl → 1.14.1.dev3__py3-none-any.whl

powertrain_build/build.py

@@ -930,7 +930,7 @@ def build(
             if rte_dummy:
                 LOG.info("******************************************************")
                 LOG.info("Generating RTE dummy files")
-                zc_rte = RteDummy(build_cfg, zc_nvm, composition_yaml.cal_class_info["tl"])
+                zc_rte = RteDummy(build_cfg, zc_core, zc_nvm, composition_yaml.cal_class_info["tl"])
                 zc_rte.generate_rte_dummy()
 
             if code_generation_config["generateCalibrationInterfaceFiles"]:

powertrain_build/core.py

@@ -371,7 +371,7 @@ class ZCCore(ProblemLogger):
         footer = [f'\n#endif /* {header_guard} */\n']
 
         body = [
-            '/* enum EventStatus {passed=0, failed=1, prepassed=2, prefailed=3} */\n',
+            '/* EventStatus is an enumeration with members {passed=0, failed=1, prepassed=2, prefailed=3} */\n',
             '#define Dem_SetEventStatus(EventName, EventStatus)',
             '  ',
             'Rte_Call_Event_##EventName##_SetEventStatus(EventStatus)\n'

powertrain_build/rte_dummy.py

@@ -17,16 +17,18 @@ from pathlib import Path
 class RteDummy(ProblemLogger):
     """A class for RTE dummy file generation."""
 
-    def __init__(self, build_cfg, nvm_def, calib_data):
+    def __init__(self, build_cfg, core, nvm_def, calib_data):
         """Init.
 
         Args:
             build_cfg (BuildProjConfig): Object with build configuration settings.
+            core (ZCCore): Object representing the core configuration data.
             nvm_def (ZCNVMDef): Object with NVM definition information.
             calib_data (dict): Dictionary containing calibration data for a ZoneController project.
         """
         super().__init__()
         self.build_cfg = build_cfg
+        self.dtcs = core.project_dtcs
         self.nvm_def = nvm_def
         self.calibration_variables = calib_data.get("class_info", {})
         mem_map_config = self.build_cfg.get_memory_map_config()
@@ -231,6 +233,28 @@ class RteDummy(ProblemLogger):
         lines_to_write.append("")
         return "\n".join(lines_to_write)
 
+    def _get_core_header_dummy(self):
+        """Get core header dummy code."""
+        if not self.dtcs:
+            return ""
+
+        lines_to_write = []
+        for dtc in self.dtcs:
+            lines_to_write.append(f"UInt8 Rte_Call_Event_{dtc}_SetEventStatus(UInt8 EventStatus);")
+        lines_to_write.append("")
+        return "\n".join(lines_to_write)
+
+    def _get_core_source_dummy(self):
+        """Get core source dummy code."""
+        if not self.dtcs:
+            return ""
+
+        lines_to_write = []
+        for dtc in self.dtcs:
+            lines_to_write.append(f"UInt8 Rte_Call_Event_{dtc}_SetEventStatus(UInt8 EventStatus) {{ return 0U; }}")
+        lines_to_write.append("")
+        return "\n".join(lines_to_write)
+
     def generate_rte_dummy(self):
         """Generate RTE dummy files."""
         src_code_dest_dir = self.build_cfg.get_src_code_dst_dir()
@@ -245,10 +269,12 @@ class RteDummy(ProblemLogger):
         with type_header_file.open(mode="w", encoding="utf-8") as type_header_fh:
             type_header_fh.write(self._get_type_header_header())
             type_header_fh.write(self._get_typedef_dummy())
+            type_header_fh.write(self._get_core_header_dummy())
             type_header_fh.write(self._get_nvm_header_dummy())
             type_header_fh.write(self._get_calibration_header_dummy())
             type_header_fh.write(self._get_type_header_footer())
         with source_file.open(mode="w", encoding="utf-8") as source_fh:
             source_fh.write(self._get_source_header())
+            source_fh.write(self._get_core_source_dummy())
             source_fh.write(self._get_nvm_source_dummy())
             source_fh.write(self._get_calibration_source_dummy())

powertrain_build/zone_controller/calibration.py

@@ -15,7 +15,7 @@ class ZoneControllerCalibration(ProblemLogger):
     calibration_function_step_template = '{swc_name}_ZcCalibrationStep'
     trigger_read_rte_cdata_signal = {
         'name_template': 'c{swc_name}_TriggerReadRteCData',
-        'data_type': 'Float32'
+        'data_type': 'UInt8'
     }
 
     def __init__(self, build_cfg, calib_data):
@@ -45,7 +45,22 @@ class ZoneControllerCalibration(ProblemLogger):
         for signal_name, signal_data in self.calibration_variables.items():
             rte_call = f'Rte_CData_{self.swc_name}_{signal_name}()'
             if isinstance(signal_data["width"], list):
-                write_string_list.append(f'{"":{indent}}memcpy({signal_name}, {rte_call}, sizeof({signal_name}));\n')
+                # MAPs get typedef:ed to structs and need special data type mapping
+                if signal_name.startswith("m") and signal_name[-2:] not in ["_r", "_c"]:
+                    write_string_list.append(
+                        f'{"":{indent}}const {signal_data["autosar_type"]} *{signal_name}_ptr = {rte_call};\n'
+                    )
+                    write_string_list.append(
+                        f'{"":{indent}}memcpy('
+                        f'{signal_name}, '
+                        f'{signal_name}_ptr->{signal_data["autosar_type"]}, '
+                        f'sizeof({signal_name})'
+                        ');\n'
+                    )
+                else:
+                    write_string_list.append(
+                        f'{"":{indent}}memcpy({signal_name}, {rte_call}, sizeof({signal_name}));\n'
+                    )
             else:
                 write_string_list.append(f'{"":{indent}}{signal_name} = {rte_call};\n')
         return write_string_list
@@ -123,7 +138,7 @@ class ZoneControllerCalibration(ProblemLogger):
         lines_to_write.append('\n')
         for signal_name, signal_data in self.calibration_variables.items():
             if isinstance(signal_data["width"], list):
-                # MAPs get typedef:ed to structs and need special data type mapping in calibration.py
+                # MAPs get typedef:ed to structs and need special data type mapping
                 if signal_name.startswith("m") and signal_name[-2:] not in ["_r", "_c"]:
                     return_type = f'const {signal_data["autosar_type"]}*'
                 else:

{powertrain_build-1.14.0.dist-info → powertrain_build-1.14.1.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.14.0
+Version: 1.14.1.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.14.0.dist-info → powertrain_build-1.14.1.dev3.dist-info}/RECORD

@@ -3,13 +3,13 @@ powertrain_build/__main__.py,sha256=KiSMgZgGBelcaf4uEIvdaNmCo2utZM9tWTkwHldhEXY,
 powertrain_build/a2l.py,sha256=7DBtaP2hOBPg0Q_GrgzD-SX7dodhaWfGajJBog_wBy8,23429
 powertrain_build/a2l_merge.py,sha256=k2Nv91TEXpiDmzNU5ufUhceWGjwFLcUJB42ppzWbELQ,31600
 powertrain_build/a2l_templates.py,sha256=Dn262lXFhHLH5OfCS9mK6tNyRaAEqI3RFTx11yEj8Yc,31720
-powertrain_build/build.py,sha256=TaJycIkp7ygbwBRnkwPJ7at7mDouTbUqi18JfsJ1prw,42786
+powertrain_build/build.py,sha256=J6N8eUbhWetp182ytKQZq19Cwarp0mO8JlLLD5Szhs4,42795
 powertrain_build/build_defs.py,sha256=0uI4GPcF6sd6BZVKKT27fneU74u-41ox2LuJ-klS-Vg,16898
 powertrain_build/build_proj_config.py,sha256=uLvIrEIM4p74adej31OHop1GkXkznDcRW_FY8SJawNI,26234
 powertrain_build/check_interface.py,sha256=aHo7NL1kdZ_BdICMNHWxaBrjQkOnOHG96B6UMs-exoQ,23686
 powertrain_build/cli.py,sha256=Z72b5gMvIHHb9Yx2jMaQVHqlak8p75bdWMzBkbU4oq4,5566
 powertrain_build/config.py,sha256=8KrhMgsndGx3cDMM-KftnkpFl0YzswZaKMktiSdFqjE,20365
-powertrain_build/core.py,sha256=W4GmZqqjMDKmIHRrHXMfwbfVav3sxYGb7XsBSxP4lSA,16146
+powertrain_build/core.py,sha256=JaBSVRAsagY044konqwGqfQWIvJqx9tVgQjkvYuXCrk,16172
 powertrain_build/core_dummy.py,sha256=kbv_lk8OoFr0dFC9E-f8KJubsNLI4dLPFMG2jkotPbI,18025
 powertrain_build/create_conversion_table.py,sha256=h63zWo6h646pOQL430pDoSTAn5hYLAHbjivccODboIQ,2289
 powertrain_build/dids.py,sha256=TTBE_7gaGU9KYFVqskVzGlf2wX-kvDMe3z5uP8oiFok,38322
@@ -29,7 +29,7 @@ powertrain_build/problem_logger.py,sha256=1jhUipQ3bwfMkNNYJM-GfFqbInQmVg2xoIanLq
 powertrain_build/pt_matlab.py,sha256=dqQvd4x-rg6ZKd9kVAVJEPCPxm3ORC7FkfVozVjUYcI,15132
 powertrain_build/pt_win32.py,sha256=R3v3IA7hMC5QyW-rVABALvqt-OqQq5x2ZzQ0xbvBsSU,5520
 powertrain_build/replace_compu_tab_ref.py,sha256=E4pN_SelWnvplgn4oVbZui0mC4NwWHjPmDQLbp6SeM8,4921
-powertrain_build/rte_dummy.py,sha256=JoC1VAc0Fg4BvOF_GgHS1HxZwD3D1gA2h_0BmhLJKz4,12505
+powertrain_build/rte_dummy.py,sha256=2thQwSOmceBcv4gP1pzOMnvrZCDH0gfgdmuEqcyFeRw,13516
 powertrain_build/sched_funcs.py,sha256=qUFfYQnEx_OuyRctz2jlnaJVY3w06NM9P_AbBBFN3y4,10589
 powertrain_build/signal.py,sha256=r43eTOfAn_lZ5vZtMv07eZ3SelPWfNAUEM6SdGf25bQ,160
 powertrain_build/signal_if_html_rep.py,sha256=FjaeQ_FP4jCbdkkTpm5A3NNXlIznCqiyvO0Nr-vZOcg,7978
@@ -117,14 +117,14 @@ powertrain_build/matlab_scripts/helperFunctions/updateModels.m,sha256=3hD54qmo2V
 powertrain_build/templates/Index_SigCheck_All.html,sha256=psLtxiw5UChCs35tYGwVkGujXHJNw3ibFaZc-JMMPdg,1602
 powertrain_build/templates/Index_SigIf_All.html,sha256=7hwH6XSrrh5sDDJAnGdJTjzI7HwOeZFfve60Ke4Wa_Q,1433
 powertrain_build/zone_controller/__init__.py,sha256=tzftZINv5NTXFxXz5H_ptDywSCr49cll2CVFtv4HyF8,113
-powertrain_build/zone_controller/calibration.py,sha256=2QZOFJMl4UP9GYlK4ZmAS9VoSlqSqJ2jSmGtVrSML6s,8380
+powertrain_build/zone_controller/calibration.py,sha256=JR2DqZPwgGvOidXWRyhO9Rz17NKRBmtFL7IADqKdT-0,9116
 powertrain_build/zone_controller/composition_yaml.py,sha256=0dCnmvFFh9GPjDgHqAQjKOl75DocqWwrueOOXql6rhY,41726
-powertrain_build-1.14.0.dist-info/licenses/AUTHORS,sha256=tP9V0duq5X9hw2pos8WTLXN7kNHmVnhJqpmBFqIdHKI,276
-powertrain_build-1.14.0.dist-info/licenses/LICENSE,sha256=0tJvKn_0AWjVNJ4hkDXhVQZLOdCNwR_2u0UcxVrToOg,10452
-powertrain_build-1.14.0.dist-info/licenses/NOTICE,sha256=NIT_NaKZs4t_tVT4VO_AtJl3X39O8nL8L3pGXn9jK8M,465187
-powertrain_build-1.14.0.dist-info/METADATA,sha256=rb7melarqsqdlrqJfFmIDmnS0dd4qFMGKf6TZBJgs90,5217
-powertrain_build-1.14.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-powertrain_build-1.14.0.dist-info/entry_points.txt,sha256=CdE3i43zDAllglVE3fwvKa7i0jvNqvipZJu0GTS5VOg,63
-powertrain_build-1.14.0.dist-info/pbr.json,sha256=F6j756U0kYhlsyPaqe0eFZkrxM1E0vXAWKYMolu8IOY,46
-powertrain_build-1.14.0.dist-info/top_level.txt,sha256=wAaR8OQEH2mb8_gudmo4l_RoNXgWvnB845ckD1BsguA,17
-powertrain_build-1.14.0.dist-info/RECORD,,
+powertrain_build-1.14.1.dev3.dist-info/licenses/AUTHORS,sha256=tP9V0duq5X9hw2pos8WTLXN7kNHmVnhJqpmBFqIdHKI,276
+powertrain_build-1.14.1.dev3.dist-info/licenses/LICENSE,sha256=0tJvKn_0AWjVNJ4hkDXhVQZLOdCNwR_2u0UcxVrToOg,10452
+powertrain_build-1.14.1.dev3.dist-info/licenses/NOTICE,sha256=NIT_NaKZs4t_tVT4VO_AtJl3X39O8nL8L3pGXn9jK8M,465187
+powertrain_build-1.14.1.dev3.dist-info/METADATA,sha256=cjT1RHcdcd9nc0LrI4GTqfFA5kvAN79a2mS-gDkbBDA,5222
+powertrain_build-1.14.1.dev3.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+powertrain_build-1.14.1.dev3.dist-info/entry_points.txt,sha256=CdE3i43zDAllglVE3fwvKa7i0jvNqvipZJu0GTS5VOg,63
+powertrain_build-1.14.1.dev3.dist-info/pbr.json,sha256=op5u0SksFkCv7AlO0hDUDsGxOtG4bjfvW77veTMott0,47
+powertrain_build-1.14.1.dev3.dist-info/top_level.txt,sha256=wAaR8OQEH2mb8_gudmo4l_RoNXgWvnB845ckD1BsguA,17
+powertrain_build-1.14.1.dev3.dist-info/RECORD,,

powertrain_build-1.14.1.dev3.dist-info/pbr.json

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

powertrain_build-1.14.0.dist-info/pbr.json

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