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

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

@@ -1,12 +1,28 @@
 CHANGES
 =======
 
-1.4.3.dev7
-----------
+* Dummy 7
+* Dummy 6
+* Dummy 5
+* Dummy 4
+* Dummy 3
+* Dummy 2
+* Dummy 1
+* Compatability fix in build.py
+
+1.4.2
+-----
 
-* 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.dev7 → powertrain_build-1.4.3.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev7
+Version: 1.4.3.dev8
 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,7 +21,6 @@ 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
@@ -49,7 +48,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+# ain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

{powertrain_build-1.4.3.dev7 → powertrain_build-1.4.3.dev8}/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 get_repo_root, merge_dicts
+from powertrain_build.lib.helper_functions import create_dir, 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,8 +542,12 @@ 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:
-        shutil.copytree(path, src_dst_dir, dirs_exist_ok=True)
-        LOG.debug(f"copied {path} to {src_dst_dir}")
+        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)
     LOG.info(
         "Finished copying extra included files (in %4.2f s)", time.time() - start_time
     )

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

@@ -664,48 +664,29 @@ class ZCNVMDef(NVMDef):
             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 = ""
-        rte_write_instructions = ""
-        nvsw_init_instructions = ""
-        manual_signals = []
-
         for nvm_name, nvm_data in self.valid_nvm_definitions.items():
-            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":
-                nvsw_init_instructions = "  // NVSWCOMPONENTS init calls are scheduled by the arxml.\n"
-                if nvm_data["type"] == "type1":
-                    # main_function_lines.append(f"  const {nvm_name.upper()} {nvm_name.lower()}_const = {nvm_name.lower()};\n")  
-                    main_function_lines.append(f"  (void)Rte_Write_{nvm_name.upper()}_{nvm_name.upper()}(&{nvm_name.lower()});\n")
-                elif nvm_data["type"] == "type2":
-                    rte_write_instructions = "  // Nvm write calls are not generated for type2, they need to be added manually to src.\n  // Nvm signals:\n"
-                    manual_signals.append(f"  // Nvm {nvm_name.lower()} is type 2 and needs a manually written write call in source code.\n")
-        init_function_lines.append(nvsw_init_instructions)
-        main_function_lines.append(error_status)
-        main_function_lines.extend(manual_signals)
-
-        if len(manual_signals) > 0:
-            self.warning('NVSWCOMPONENT write calls are not generated automatically for type 2, they have to be written manually and added to source code.')
+            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}")
+
         with open(self._file_name + ".c", mode="a", encoding="utf-8") as cptr:
             cptr.writelines(init_function_lines + footer + ["\n"] + main_function_lines + footer)
 

{powertrain_build-1.4.3.dev7 → powertrain_build-1.4.3.dev8}/powertrain_build/zone_controller/composition_yaml.py

@@ -350,7 +350,7 @@ class CompositionYaml(ProblemLogger):
         for nvm_name, nvm_data in nvm_dict.items():
             init = []
             nr_of_unused_signals = self.zc_nvm.project_nvm_definitions[nvm_name]["size"]
-            data_type_name = f"{nvm_name}"
+            data_type_name = f"dt_{nvm_name}"
             data_types[data_type_name] = {"type": "RECORD", "elements": {}}
             for signal in self.zc_nvm.project_nvm_definitions[nvm_name]["signals"]:
                 element_name = f'{self.zc_nvm.struct_member_prefix}{signal["name"]}'

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev7
+Version: 1.4.3.dev8
 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,7 +21,6 @@ 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
@@ -49,7 +48,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# powertrain-build
+# ain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

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

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