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

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

@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-1.4.3.dev7
+1.4.3.dev9
 ----------
 
 * New scope on nvm block generated code: type 2 write calls should be written manually, no init calls needed

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.4.3.dev7
+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/

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

@@ -660,7 +660,7 @@ 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",
@@ -671,9 +671,9 @@ class ZCNVMDef(NVMDef):
         ]
 
         error_status = ""
-        rte_write_instructions = ""
-        nvsw_init_instructions = ""
-        manual_signals = []
+        nvsw_init_instructions = False
+        main_function_lines = []
+        type2_warning = False
 
         for nvm_name, nvm_data in self.valid_nvm_definitions.items():
             if nvm_data["method"] == "DIRECT-CALL":
@@ -683,7 +683,7 @@ class ZCNVMDef(NVMDef):
                 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",
+                    error_status = "  UInt8 errorStatus = 0;\n"
                     main_function_lines.extend([
                         f"  {function_prefix}_GetErrorStatus(&errorStatus);\n",
                         "  if (errorStatus == 0) {\n",
@@ -693,21 +693,30 @@ class ZCNVMDef(NVMDef):
                 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")
+                    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":
-                    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.')
+                    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.dev7 → powertrain_build-1.4.3.dev9}/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.dev9}/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.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/

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.dev7/powertrain_build.egg-info/pbr.json

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