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

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

@@ -1,6 +1,8 @@
 CHANGES
 =======
 
+* Fixes for TL enumerations
+* Make rte\_dummy generate ZC DTC dummy functions
 * Polyspace fixes for ZC calibration
 * New year(?) new secret
 

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

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

@@ -20,12 +20,16 @@ class UserDefinedTypes(ProblemLogger):
     FILE_PREFIXES = ['udt_']  # Add more as needed
     UNDERLYING_DATA_TYPES = {  # Add more as needed
         'target_link': {
+            'u32': 'UInt32',
+            'i32': 'Int32',
             'u16': 'UInt16',
             'i16': 'Int16',
             'u8': 'UInt8',
             'i8': 'Int8'
         },
         'embedded_coder': {
+            'u32': 'uint32_T',
+            'i32': 'int32_T',
             'u16': 'uint16_T',
             'i16': 'int16_T',
             'u8': 'uint8_T',
@@ -35,6 +39,7 @@ class UserDefinedTypes(ProblemLogger):
     SIMULINK_DATA_TYPES = {  # Add more as needed
         'target_link': {
             'Simulink.IntEnumType': 'Int32',
+            'uint32': 'UInt32',
             'int32': 'Int32',
             'uint16': 'UInt16',
             'int16': 'Int16',
@@ -43,6 +48,7 @@ class UserDefinedTypes(ProblemLogger):
         },
         'embedded_coder': {
             'Simulink.IntEnumType': 'int32_T',
+            'uint32': 'uint32_T',
             'int32': 'int32_T',
             'uint16': 'uint16_T',
             'int16': 'int16_T',
@@ -371,14 +377,23 @@ class UserDefinedTypes(ProblemLogger):
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u8']
             elif max_value <= 65535:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u16']
+            elif max_value <= 4294967295:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['u32']
         elif min_value >= -128:
             if max_value <= 127:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i8']
             elif max_value <= 32767:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i16']
+            elif max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
         elif min_value >= -32768:
             if max_value <= 32767:
                 underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i16']
+            elif max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
+        elif min_value >= -2147483648:
+            if max_value <= 2147483647:
+                underlying_data_type = self.UNDERLYING_DATA_TYPES[code_generator]['i32']
 
         if underlying_data_type is None:
             self.critical(
@@ -427,7 +442,7 @@ class UserDefinedTypes(ProblemLogger):
 
             get_default_value = re.search(
                 r'function ([A-Za-z0-9]+) = getDefaultValue\(\)[\s\n]*'
-                r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9]+);[\s\n]*'
+                r'\1 = [A-Za-z0-9]+\.([A-Za-z0-9_]+);[\s\n]*'
                 r'end',
                 enum_file_content,
                 flags=re.MULTILINE

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

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

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

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

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