powertrain-build 1.4.3.dev8__tar.gz → 1.4.3.dev9__tar.gz

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/ChangeLog

@@ -1,28 +1,12 @@
 CHANGES
 =======
 
-* Dummy 7
-* Dummy 6
-* Dummy 5
-* Dummy 4
-* Dummy 3
-* Dummy 2
-* Dummy 1
-* Compatability fix in build.py
-
-1.4.2
------
+1.4.3.dev9
+----------
 
+* New scope on nvm block generated code: type 2 write calls should be written manually, no init calls needed
 * Bug fix for ZC dids
-
-1.4.1
------
-
 * Bug fix in composition\_yaml.py
-
-1.4.0
------
-
 * Added RTE interface enum doc
 * Adding lsb, offset to curves and maps
 * Fix issue with mapping to Rte enums when enum does not have a key for integer 0

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev8
+Version: 1.4.3.dev9
 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/
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Embedded Systems
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
+License-File: AUTHORS
 Requires-Dist: gitpython>=3.1.8
 Requires-Dist: pbr>=6.0.0
 Requires-Dist: requests==2.32.3
@@ -48,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# ain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/README.md

@@ -1,4 +1,4 @@
-# ain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/powertrain_build/build.py

@@ -29,7 +29,7 @@ from powertrain_build.dummy_spm import DummySpm
 from powertrain_build.ext_dbg import ExtDbg
 from powertrain_build.ext_var import ExtVarCsv, ExtVarYaml
 from powertrain_build.feature_configs import FeatureConfigs
-from powertrain_build.lib.helper_functions import create_dir, get_repo_root, merge_dicts
+from powertrain_build.lib.helper_functions import get_repo_root, merge_dicts
 from powertrain_build.memory_section import MemorySection
 from powertrain_build.nvm_def import NVMDef, ZCNVMDef
 from powertrain_build.problem_logger import ProblemLogger
@@ -542,12 +542,8 @@ def copy_files_to_include(build_cfg):
     if missing_tree_paths:
         LOG.warning(f"Missing include paths: {missing_tree_paths}")
     for path in existing_tree_paths:
-        for file_ in path.rglob("*"):
-            if file_.is_file():
-                new_path = Path(src_dst_dir, file_.relative_to(path))
-                create_dir(new_path.parent)
-                shutil.copy2(file_, new_path)
-                LOG.debug("copied %s to %s", file_, new_path)
+        shutil.copytree(path, src_dst_dir, dirs_exist_ok=True)
+        LOG.debug(f"copied {path} to {src_dst_dir}")
     LOG.info(
         "Finished copying extra included files (in %4.2f s)", time.time() - start_time
     )

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/powertrain_build/nvm_def.py

@@ -660,35 +660,63 @@ class ZCNVMDef(NVMDef):
             f"{self.init_function} {{\n",
             "  //Call this function in the SWC init runnable\n"
         ]
-        main_function_lines = [
+        main_function = [
             f'#include "{bd.CVC_CODE_ASIL_D_START}"\n'
             f"{self.main_function} {{\n",
             "  //Call this function in the SWC main runnable\n",
-            "  UInt8 errorStatus = 0;\n",
         ]
         footer = [
             "}\n",
             f'#include "{bd.CVC_CODE_ASIL_D_END}"\n',
         ]
 
+        error_status = ""
+        nvsw_init_instructions = False
+        main_function_lines = []
+        type2_warning = False
+
         for nvm_name, nvm_data in self.valid_nvm_definitions.items():
-            pim_call = f"Rte_Pim_{nvm_name}()"
-            function_prefix = f"Rte_Call_{nvm_port_pattern.format(NvName=nvm_name)}"
-            main_function_lines.append(f"  *{pim_call} = {nvm_name.lower()};\n")
-            if nvm_data["type"] == "type1":
-                init_function_lines.append(f"  {function_prefix}_SetRamBlockStatus(TRUE);\n")
-            elif nvm_data["type"] == "type2":
-                main_function_lines.extend([
-                    f"  {function_prefix}_GetErrorStatus(&errorStatus);\n",
-                    "  if (errorStatus == 0) {\n",
-                    f"    {function_prefix}_WriteBlock({pim_call});\n",
-                    "  }\n",
-                ])
-            else:
-                self.critical(f"Unknown NVM type: {nvm_data['type']} for NVM: {nvm_name}")
+            if nvm_data["method"] == "DIRECT-CALL":
+                pim_call = f"Rte_Pim_{nvm_name}()"
+                function_prefix = f"Rte_Call_{nvm_port_pattern.format(NvName=nvm_name)}"
+                main_function_lines.append(f"  *{pim_call} = {nvm_name.lower()};\n")
+                if nvm_data["type"] == "type1":
+                    init_function_lines.append(f"  {function_prefix}_SetRamBlockStatus(TRUE);\n")
+                elif nvm_data["type"] == "type2":
+                    error_status = "  UInt8 errorStatus = 0;\n"
+                    main_function_lines.extend([
+                        f"  {function_prefix}_GetErrorStatus(&errorStatus);\n",
+                        "  if (errorStatus == 0) {\n",
+                        f"    {function_prefix}_WriteBlock({pim_call});\n",
+                        "  }\n",
+                    ])
+                else:
+                    self.critical(f"Unknown NVM type: {nvm_data['type']} for NVM: {nvm_name}")
+            elif nvm_data["method"] == "NVSWCOMPONENT":
+                if nvm_data["type"] == "type1":
+                    nvsw_init_instructions = True
+                    main_function.append(
+                        f"  (void)Rte_Write_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n"
+                    )
+                elif nvm_data["type"] == "type2":
+                    type2_warning = True
+                    main_function_lines.append(
+                        f"  // Nvm {nvm_name.lower()} is type 2, add call in manually written source code.\n"
+                    )
+        main_function.append(error_status)
+        if nvsw_init_instructions:
+            init_function_lines.append("  // NVSWCOMPONENTS init calls are scheduled by the arxml.\n")
+        main_function.extend(main_function_lines)
+
+        if type2_warning:
+            self.warning(
+                'NVSWCOMPONENT write calls are not generated automatically for type 2, \
+                they have to be written manually and added to source code.'
+            )
 
+        output = init_function_lines + footer + ["\n"] + main_function + footer
         with open(self._file_name + ".c", mode="a", encoding="utf-8") as cptr:
-            cptr.writelines(init_function_lines + footer + ["\n"] + main_function_lines + footer)
+            cptr.writelines(output)
 
     def generate_nvm_rte_files(self):
         """Generate the NVM RTE files."""

{powertrain_build-1.4.3.dev8 → powertrain_build-1.4.3.dev9}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev8
+Version: 1.4.3.dev9
 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/
@@ -21,6 +21,7 @@ Classifier: Topic :: Software Development :: Embedded Systems
 Description-Content-Type: text/x-rst; charset=UTF-8
 License-File: LICENSE
 License-File: NOTICE
+License-File: AUTHORS
 Requires-Dist: gitpython>=3.1.8
 Requires-Dist: pbr>=6.0.0
 Requires-Dist: requests==2.32.3
@@ -48,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# ain-build
+# powertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

powertrain_build-1.4.3.dev9/powertrain_build.egg-info/pbr.json

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

powertrain_build-1.4.3.dev8/powertrain_build.egg-info/pbr.json

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