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

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

@@ -1,7 +1,8 @@
 CHANGES
 =======
 
-* Add support for generating BURAM header files
+* ZC: Add new data types based on variable min/max
+* Update A2L regex for EC
 
 1.17.0
 ------

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

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

{powertrain_build-1.17.1.dev1 → powertrain_build-1.17.1.dev2}/powertrain_build/a2l_merge.py

@@ -93,11 +93,11 @@ class A2lMerge(ProblemLogger):
         #   /* Upper Limit            */      3.0
         # /end CHARACTERISTIC
 
-        self._block_finder = re.compile(r'(?:\s*\n)*'           # Optional blank lines
-                                        r'(\s*/begin (\w+)\s*'  # begin <something> block
-                                        r'\n\s*([\w.]+).*?\n'   # label. (Bosch-nvm contains the .)
-                                        r'.*?'                  # block definition
-                                        r'/end\s+\2)',          # end <something> block. Same something as before
+        self._block_finder = re.compile(r'(?:\s*\n)*'             # Optional blank lines
+                                        r'(\s*/begin\s+(\w+)\s*'  # begin <something> block
+                                        r'\n\s*([\w.]+).*?\n'     # label. (Bosch-nvm contains the .)
+                                        r'.*?'                    # block definition
+                                        r'/end\s+\2)',            # end <something> block. Same something as before
                                         flags=re.M | re.DOTALL)
 
         self._tl_compu_method_parser = re.compile(
@@ -195,7 +195,7 @@ class A2lMerge(ProblemLogger):
                 code_generator = 'target_link'
 
             if code_generator == 'embedded_coder':
-                blks = re.findall(r'(?:\s*\n)*(\s*/begin '
+                blks = re.findall(r'(?:\s*\n)*(\s*/begin\s+'
                                   r'(?!PROJECT|HEADER|MODULE|MOD_PAR|MOD_COMMON)(\w+)\s*(?:\n\s*)?'
                                   r'(?:/\*\s*[\w ]+\s*\*/\s*)?(\w+)([\[\d+\]]*).*?\n.*?/end\s+\2)',
                                   a2ld, flags=re.M | re.DOTALL)

{powertrain_build-1.17.1.dev1 → powertrain_build-1.17.1.dev2}/powertrain_build/build.py

@@ -890,7 +890,6 @@ def build(
         if code_generation_config["generateInterfaceHeaders"]:
             memory_section = MemorySection(build_cfg, unit_cfg, polyspace_comments)
             memory_section.generate_required_header_files()
-            memory_section.generate_optional_header_files()
 
         # Propagate tag name for release builds, TAG_NAME must be set in environment
         tag_name = os.environ.get("TAG_NAME", "")

{powertrain_build-1.17.1.dev1 → powertrain_build-1.17.1.dev2}/powertrain_build/build_defs.py

@@ -24,8 +24,6 @@ CVC_DISP_ASIL_C_START = 'CVC_DISP_ASIL_C_START.h'  # Header file name for CVC AS
 CVC_DISP_ASIL_C_END = 'CVC_DISP_ASIL_C_END.h'  # Header file name for CVC ASIL C measurable variables end
 CVC_DISP_ASIL_D_START = 'CVC_DISP_ASIL_D_START.h'  # Header file name for CVC ASIL D measurable variables start
 CVC_DISP_ASIL_D_END = 'CVC_DISP_ASIL_D_END.h'  # Header file name for CVC ASIL D measurable variables end
-CVC_DISP_BURAM_START = 'CVC_DISP_BURAM_START.h'  # Header file name for CVC BURAM measurable variables start
-CVC_DISP_BURAM_END = 'CVC_DISP_BURAM_END.h'  # Header file name for CVC BURAM measurable variables end
 CVC_DISP_SEC_START = 'CVC_DISP_SEC_START.h'  # Header file name for CVC secure measurable variables start
 CVC_DISP_SEC_END = 'CVC_DISP_SEC_END.h'  # Header file name for CVC secure measurable variables end
 
@@ -77,8 +75,6 @@ PREDECL_DISP_ASIL_C_START = 'PREDECL_DISP_ASIL_C_START.h'  # Header file name fo
 PREDECL_DISP_ASIL_C_END = 'PREDECL_DISP_ASIL_C_END.h'  # Header file name for CVC ASIL C measurable variables end
 PREDECL_DISP_ASIL_D_START = 'PREDECL_DISP_ASIL_D_START.h'  # Header file name for CVC ASIL D measurable variables start
 PREDECL_DISP_ASIL_D_END = 'PREDECL_DISP_ASIL_D_END.h'  # Header file name for CVC ASIL D measurable variables end
-PREDECL_DISP_BURAM_START = 'PREDECL_DISP_BURAM_START.h'  # Header file name for CVC BURAM measurable variables start
-PREDECL_DISP_BURAM_END = 'PREDECL_DISP_BURAM_END.h'  # Header file name for CVC BURAM measurable variables end
 PREDECL_DISP_SEC_START = 'PREDECL_DISP_SEC_START.h'  # Header file name for CVC secure measurable variables start
 PREDECL_DISP_SEC_END = 'PREDECL_DISP_SEC_END.h'  # Header file name for CVC secure measurable variables end
 
@@ -131,7 +127,6 @@ CVC_DISP_A = {'START': CVC_DISP_ASIL_A_START, 'END': CVC_DISP_ASIL_A_END}
 CVC_DISP_B = {'START': CVC_DISP_ASIL_B_START, 'END': CVC_DISP_ASIL_B_END}
 CVC_DISP_C = {'START': CVC_DISP_ASIL_C_START, 'END': CVC_DISP_ASIL_C_END}
 CVC_DISP_D = {'START': CVC_DISP_ASIL_D_START, 'END': CVC_DISP_ASIL_D_END}
-CVC_DISP_BURAM = {'START': CVC_DISP_BURAM_START, 'END': CVC_DISP_BURAM_END}
 CVC_DISP_SECURE = {'START': CVC_DISP_SEC_START, 'END': CVC_DISP_SEC_END}
 
 CVC_CAL_QM = {'START': CVC_CAL_START, 'END': CVC_CAL_END}
@@ -162,7 +157,6 @@ PREDECL_DISP_A = {'START': PREDECL_DISP_ASIL_A_START, 'END': PREDECL_DISP_ASIL_A
 PREDECL_DISP_B = {'START': PREDECL_DISP_ASIL_B_START, 'END': PREDECL_DISP_ASIL_B_END}
 PREDECL_DISP_C = {'START': PREDECL_DISP_ASIL_C_START, 'END': PREDECL_DISP_ASIL_C_END}
 PREDECL_DISP_D = {'START': PREDECL_DISP_ASIL_D_START, 'END': PREDECL_DISP_ASIL_D_END}
-PREDECL_DISP_BURAM = {'START': PREDECL_DISP_BURAM_START, 'END': PREDECL_DISP_BURAM_END}
 PREDECL_DISP_SECURE = {'START': PREDECL_DISP_SEC_START, 'END': PREDECL_DISP_SEC_END}
 
 PREDECL_CAL_QM = {'START': PREDECL_CAL_START, 'END': PREDECL_CAL_END}
@@ -276,15 +270,14 @@ PREDECL_EXTRA = {
     'CONST_MERG': PREDECL_CONST_MERG
 }
 
+NVM = {'CVC': CVC_NVM, 'PREDECL': PREDECL_NVM}
+NVM_P = {'CVC': CVC_NVM_P, 'PREDECL': PREDECL_NVM_P}
+SECURE = {'CVC': CVC_SECURE, 'PREDECL': PREDECL_SECURE}
 ASIL_QM = {'CVC': CVC_ASIL_QM, 'PREDECL': PREDECL_ASIL_QM}
 ASIL_A = {'CVC': CVC_ASIL_A, 'PREDECL': PREDECL_ASIL_A}
 ASIL_B = {'CVC': CVC_ASIL_B, 'PREDECL': PREDECL_ASIL_B}
 ASIL_C = {'CVC': CVC_ASIL_C, 'PREDECL': PREDECL_ASIL_C}
 ASIL_D = {'CVC': CVC_ASIL_D, 'PREDECL': PREDECL_ASIL_D}
-BURAM = {'CVC': CVC_DISP_BURAM, 'PREDECL': PREDECL_DISP_BURAM}  # Used for special RAM, DISP only
-SECURE = {'CVC': CVC_SECURE, 'PREDECL': PREDECL_SECURE}
-NVM = {'CVC': CVC_NVM, 'PREDECL': PREDECL_NVM}
-NVM_P = {'CVC': CVC_NVM_P, 'PREDECL': PREDECL_NVM_P}
 
 NVM_LEVEL_MAP = {
     'NORMAL': NVM,

{powertrain_build-1.17.1.dev1 → powertrain_build-1.17.1.dev2}/powertrain_build/memory_section.py

@@ -133,19 +133,6 @@ class MemorySection(ProblemLogger):
         ]
         return cvc_undefines, cvc_defines, memory_section_handling
 
-    def _get_buram(self, section):
-        cvc_undefines = ['#undef CVC_DISP_BURAM\n']
-        if section == 'START':
-            volatile_string = 'volatile' if self.use_volatile_globals else ''
-            cvc_defines = [f'#define CVC_DISP_BURAM {volatile_string}\n']
-        else:
-            cvc_defines = []
-        memory_section_handling = [
-            self.mem_map_config['projectDefines'][self._get_mem_map_section(section)]['buram'] + '\n',
-            self.mem_map_include
-        ]
-        return cvc_undefines, cvc_defines, memory_section_handling
-
     def _get_nvm(self, section):
         cvc_undefines = []
         cvc_defines = []
@@ -245,29 +232,4 @@ class MemorySection(ProblemLogger):
                     footer = self._get_footer(section_file)
                     with Path(src_dst_dir, section_file).open('w', encoding="utf-8") as header_file_handler:
                         header_file_handler.writelines(header + lines_to_write + footer)
-
         self.info('Finished generating required header files (in %4.2f s)', time.time() - start_time)
-
-    def generate_optional_header_files(self):
-        """Generate optional header files to delivery folder.
-
-        Files will only be generated if the corresponding section is present in the memory map configuration.
-        """
-        self.info('******************************************************')
-        self.info('Start generating optional header files')
-        start_time = time.time()
-        src_dst_dir = self.build_cfg.get_src_code_dst_dir()
-
-        for section_dict in build_defs.BURAM.values():
-            for section, section_file in section_dict.items():
-                section_config = self.mem_map_config['projectDefines'][self._get_mem_map_section(section)]
-                if "buram" not in section_config:
-                    continue
-                cvc_undefines, cvc_defines, memory_section_handling = self._get_buram(section)
-                header = self._get_header(section_file)
-                footer = self._get_footer(section_file)
-                lines_to_write = header + cvc_undefines + cvc_defines + memory_section_handling + footer
-                with Path(src_dst_dir, section_file).open('w', encoding="utf-8") as header_file_handler:
-                    header_file_handler.writelines(lines_to_write)
-
-        self.info('Finished generating optional header files (in %4.2f s)', time.time() - start_time)

{powertrain_build-1.17.1.dev1 → powertrain_build-1.17.1.dev2}/powertrain_build/zone_controller/composition_yaml.py

@@ -799,6 +799,8 @@ class CompositionYaml(ProblemLogger):
         if "Bool" in info["type"]:
             upper = 1
             lower = 0
+            base_type_upper = 1
+            base_type_lower = 0
         else:
             base_type_lower = self.data_types[info["type"]]["limits"]["lower"]
             base_type_upper = self.data_types[info["type"]]["limits"]["upper"]
@@ -806,15 +808,70 @@ class CompositionYaml(ProblemLogger):
             upper = info["max"] if info["max"] != "-" else base_type_upper
 
         if not isinstance(info["width"], list):
+            autosar_type = "FLOAT" if "Float" in info["type"] else "INTEGER"
+            unit_in_data_type = False
+            unit = info["unit"] if info["unit"] and info["unit"] != "-" else None
+            if unit is not None:
+                new_data_type_name_tmp = f"dt_{info['type']}_{lower}_{upper}_{unit}"
+            else:
+                new_data_type_name_tmp = f"dt_{info['type']}_{lower}_{upper}"
+            new_data_type_name = new_data_type_name_tmp.replace(
+                "-", "neg"
+            ).replace(
+                "+", "pos"
+            ).replace(
+                ".", "p"
+            ).replace(
+                "/", "per"
+            ).replace(
+                " ", ""
+            ).replace(
+                "%", "perc"
+            ).replace(
+                "*", "mul"
+            )
+
+            if lower == base_type_lower and upper == base_type_upper:
+                data_type_name = info["type"]
+            elif autosar_type == "INTEGER" and "U" not in info["type"] and lower >= 0:
+                self.warning(
+                    "Signal %s has a lower limit of zero or more but is defined as signed integer. "
+                    "Cannot get a unique data type.",
+                    signal_name
+                )
+                data_type_name = info["type"]
+            elif autosar_type == "INTEGER" and "U" in info["type"] and lower < 0:
+                self.warning(
+                    "Signal %s has a lower limit of less than zero but is defined an unsigned integer. "
+                    "Cannot get a unique data type.",
+                    signal_name
+                )
+                data_type_name = info["type"]
+            elif new_data_type_name not in data_types:
+                new_data_type = {}
+                new_data_type_data = {
+                    "type": autosar_type,
+                    "limits": {"lower": lower, "upper": upper},
+                }
+                if unit is not None:
+                    new_data_type_data["unit"] = unit
+                    unit_in_data_type = True
+                new_data_type[new_data_type_name] = new_data_type_data
+                data_types = {**data_types, **new_data_type}
+                data_type_name = new_data_type_name
+            else:
+                data_type_name = new_data_type_name
+                unit_in_data_type = True
+
             class_info[signal_name] = {
-                "type": info["type"],
+                "type": data_type_name,
                 "access": "READ-ONLY" if isReadOnly else "READ-WRITE",
                 "init": self.calibration_init_values.get(signal_name, max(min(0, upper), lower)),
             }
             if info["description"]:
                 class_info[signal_name]["longname"] = self._prepare_for_xml(signal_name, info["description"])
-            if info["unit"] and info["unit"] != "-":
-                class_info[signal_name]["unit"] = info["unit"]
+            if unit is not None and not unit_in_data_type:
+                class_info[signal_name]["unit"] = unit
             if self.sharedSwAddrMethod is not None and not isReadOnly:
                 class_info[signal_name]["swAddrMethod"] = f"{self.sharedSwAddrMethod}_{signal_name.split('_')[0]}"
             return class_info, data_types

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

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

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

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

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

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