powertrain-build 1.11.7.dev3__tar.gz → 1.11.8.dev2__tar.gz

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/ChangeLog

@@ -1,10 +1,14 @@
 CHANGES
 =======
 
-* Dummy 2
-* Dummy 1
+* DUMMY 1
 * ZC: Add support for S/R DIDs
 
+1.11.7
+------
+
+* Update includeSharedSwAddrMethod to take string to use as prefix
+
 1.11.6
 ------
 

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev3
+Version: 1.11.8.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/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# wertrain-build
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/README.md

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

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/powertrain_build/build_proj_config.py

@@ -268,7 +268,7 @@ class BuildProjConfig:
             'secure': file_config.get('secure', False),
             'includeStatic': file_config.get('includeStatic', True),
             'includeShared': file_config.get('includeShared', True),
-            'includeSharedSwAddrMethod': file_config.get('includeSharedSwAddrMethod', False),
+            'includeSharedSwAddrMethod': file_config.get('includeSharedSwAddrMethod', None),
             'includeDiagnostics': file_config.get('includeDiagnostics', True),
             'includeNvm': file_config.get('includeNvm', True),
             'scaleMapsAndCurves': file_config.get('scaleMapsAndCurves', True),

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/powertrain_build/dids.py

@@ -709,7 +709,7 @@ class ZCDIDs(ProblemLogger):
                 f'extern {define} {self.project_dids[did]["type"]} {self.project_dids[did]["name"]};\n'
             )
             function_declarations.append(
-                f'extern UInt8 Rte_Write_{did}({project_did_data["type"]} {did});\n'
+                f'extern UInt8 Rte_Write_DataServices_DID_{did}_data({project_did_data["type"]} {did});\n'
             )
 
         function_declarations.append(f'\nvoid Run_{self.sender_receiver_file_name}(void);\n')
@@ -742,6 +742,7 @@ class ZCDIDs(ProblemLogger):
         if not self.valid_dids:
             return False, header
 
+        name = self._build_cfg.get_composition_config("softwareComponentName")
         sender_receiver_dids_exist = False
         body = [
             f'#include "{build_defs.CVC_CODE_ASIL_D_START}"\n',
@@ -758,7 +759,7 @@ class ZCDIDs(ProblemLogger):
                 )
                 continue
             sender_receiver_dids_exist = True
-            body.append(f'  Rte_Write_{did}({did});\n')
+            body.append(f'  Rte_Write_DataServices_DID_{did}_data({did});\n')
         body.extend([
             '}\n',
             f'#include "{build_defs.CVC_CODE_ASIL_D_END}"\n'

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/powertrain_build/zone_controller/composition_yaml.py

@@ -54,6 +54,11 @@ class CompositionYaml(ProblemLogger):
             **self.composition_spec.get("data_types", {}),
         }
         self.port_interfaces = self.composition_spec.get("port_interfaces", {})
+        self.sharedSwAddrMethod = self.build_cfg.get_composition_config("includeSharedSwAddrMethod")
+        if self.sharedSwAddrMethod is not None and not isinstance(self.sharedSwAddrMethod, str):
+            self.sharedSwAddrMethod = None
+            self.critical("includeSharedSwAddrMethod must be a string if set.")
+
         calibration_variables, measurable_variables = self._get_variables()
         self.calibration_init_values = self.get_init_values(calibration_variables)
         self.cal_class_info = self._get_class_info(calibration_variables)
@@ -706,7 +711,6 @@ class CompositionYaml(ProblemLogger):
         if info["type"] in self.enums.keys():
             return class_info, data_types
 
-        includeSharedSwAddrMethod = self.build_cfg.get_composition_config("includeSharedSwAddrMethod")
         isReadOnly = "CVC_DISP" in info["class"] or info["class"] == "CVC_EXT"
         if "Bool" in info["type"]:
             upper = 1
@@ -727,8 +731,8 @@ class CompositionYaml(ProblemLogger):
                 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 includeSharedSwAddrMethod and not isReadOnly:
-                class_info[signal_name]["swAddrMethod"] = f"VCC_CALIBRATION_{signal_name.split('_')[0]}"
+            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
 
         if isinstance(lower, list) or isinstance(upper, list):
@@ -838,7 +842,7 @@ class CompositionYaml(ProblemLogger):
         }
         if info["description"]:
             class_info[signal_name]["longname"] = self._prepare_for_xml(signal_name, info["description"])
-        if includeSharedSwAddrMethod and not isReadOnly:
-            class_info[signal_name]["swAddrMethod"] = f"VCC_CALIBRATION_{signal_name.split('_')[0]}"
+        if self.sharedSwAddrMethod is not None and not isReadOnly:
+            class_info[signal_name]["swAddrMethod"] = f"{self.sharedSwAddrMethod}_{signal_name.split('_')[0]}"
         data_types = {**data_types, **new_data_type}
         return class_info, data_types

{powertrain_build-1.11.7.dev3 → powertrain_build-1.11.8.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.11.7.dev3
+Version: 1.11.8.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/
@@ -49,7 +49,7 @@ Dynamic: provides-extra
 Dynamic: requires-dist
 Dynamic: summary
 
-# wertrain-build
+# owertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

powertrain_build-1.11.7.dev3/powertrain_build.egg-info/pbr.json

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