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

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

@@ -1,7 +1,8 @@
 CHANGES
 =======
 
-* Populate missing swAddrMethods for shared variables
+* Dummy 1
+* Add option for periodically running ZC calibration read
 
 1.16.4
 ------

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.16.5.dev1
+Version: 1.16.5.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
 
-# powertrain-build
+# wertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

{powertrain_build-1.16.5.dev1 → powertrain_build-1.16.5.dev2}/README.md

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

{powertrain_build-1.16.5.dev1 → powertrain_build-1.16.5.dev2}/powertrain_build/build_proj_config.py

@@ -68,6 +68,7 @@ class BuildProjConfig:
             'generalAsilLevelDependability': 'B',
             'generateCalibrationInterfaceFiles': False,
             'useCalibrationRteMacroExpansion': False,
+            'periodicCalibrationRead': False,
             'generateCoreDummy': False,
             'generateDummyVar': False,
             'generateInterfaceHeaders': False,

{powertrain_build-1.16.5.dev1 → powertrain_build-1.16.5.dev2}/powertrain_build/zone_controller/calibration.py

@@ -13,6 +13,7 @@ class ZoneControllerCalibration(ProblemLogger):
 
     calibration_function_init_template = '{swc_name}_ZcCalibrationInit'
     calibration_function_step_template = '{swc_name}_ZcCalibrationStep'
+    calibration_function_step_period = 0.1
     trigger_read_rte_cdata_signal = {
         'name_template': 'c{swc_name}_TriggerReadRteCData',
         'data_type': 'UInt8'
@@ -35,6 +36,7 @@ class ZoneControllerCalibration(ProblemLogger):
         self.trigger_read_rte_cdata_signal_name = self.trigger_read_rte_cdata_signal['name_template'].format(
             swc_name=self.swc_name
         )
+        self.periodic_calibration_read = build_cfg.get_code_generation_config(item='periodicCalibrationRead')
 
     def _get_header_guard(self):
         header_guard_tmp = Path(self.calibration_interface_header).stem
@@ -86,15 +88,18 @@ class ZoneControllerCalibration(ProblemLogger):
         header = [f'#include "{start_include}"\n']
         footer = [f'#include "{stop_include}"\n']
 
-        trigger_read_calibration_function = f'Rte_CData_{self.swc_name}_{self.trigger_read_rte_cdata_signal_name}()'
         body = [
             f'void {self.calibration_function_step_template.format(swc_name=self.swc_name)}(void)\n',
-            '{\n',
-            f'    if ({self.trigger_read_rte_cdata_signal_name} != {trigger_read_calibration_function})\n'
+            '{\n'
         ]
-        body.append('    {\n')
-        body.extend(self._get_calibration_variables_write_string_list(indent=8))
-        body.append('    }\n')
+        if self.periodic_calibration_read:
+            body.extend(self._get_calibration_variables_write_string_list())
+        else:
+            trigger_read_calibration_function = f'Rte_CData_{self.swc_name}_{self.trigger_read_rte_cdata_signal_name}()'
+            body.append(f'    if ({self.trigger_read_rte_cdata_signal_name} != {trigger_read_calibration_function})\n')
+            body.append('    {\n')
+            body.extend(self._get_calibration_variables_write_string_list(indent=8))
+            body.append('    }\n')
         body.append('}\n')
 
         return header + body + footer

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

@@ -536,6 +536,7 @@ class CompositionYaml(ProblemLogger):
             swc_name = self.build_cfg.get_composition_config("softwareComponentName")
             cal_init_function = autosar_prefix + ZCC.calibration_function_init_template.format(swc_name=swc_name)
             cal_step_function = autosar_prefix + ZCC.calibration_function_step_template.format(swc_name=swc_name)
+            cal_step_function_period = ZCC.calibration_function_step_period
             swc_content[cal_init_function] = {
                 "type": "INIT",
                 "mode_ref": {
@@ -548,7 +549,7 @@ class CompositionYaml(ProblemLogger):
             }
             swc_content[cal_step_function] = {
                 "type": "PERIODIC",
-                "period": 0.1,
+                "period": cal_step_function_period,
                 "mode_suppression": [
                     {"port": "EcuMVccActivationMode", "disabled_mode": ["VCC_NOT_ACTIVE"]}
                 ],
@@ -612,44 +613,6 @@ class CompositionYaml(ProblemLogger):
 
         return swc_content
 
-    def _populate_missing_swaddrmethods(self, shared_variables):
-        """Populate missing swAddrMethods for shared variables.
-
-        This is needed to ensure that all swAddrMethods are available from the start for a new model.
-        Without this change, any new swAddrMethod would require a platform update.
-        Now, only new models require a platform update.
-
-        Args:
-            shared_variables (dict): Dict with shared variables.
-        """
-        if self.sharedSwAddrMethod is None:
-            return
-
-        allowed_prefixes = ("c", "t", "m")
-        calib_trigger_signal = self._get_calibration_trigger_signal_name({})
-
-        sw_addr_methods = set()
-        all_sw_addr_methods = set()
-        for signal_data in shared_variables.values():
-            if "swAddrMethod" in signal_data:
-                # Skip shared swAddrMethod prefix
-                sw_addr_method_name = signal_data["swAddrMethod"].replace(f"{self.sharedSwAddrMethod}_", "")
-                # Skip swAddrMethod for calibration trigger signal
-                if calib_trigger_signal.startswith(sw_addr_method_name):
-                    continue
-                sw_addr_methods.add(sw_addr_method_name)
-                all_sw_addr_methods.update({f"{prefix}{sw_addr_method_name[1:]}" for prefix in allowed_prefixes})
-        missing_sw_addr_methods = all_sw_addr_methods - sw_addr_methods
-
-        for sw_addr_method in missing_sw_addr_methods:
-            shared_variables[f"{sw_addr_method}_B_Dummy"] = {
-                "longname": "Dummy variable to ensure swAddrMethod is available",
-                "type": "Bool",
-                "access": "READ-WRITE",
-                "init": 0,
-                "swAddrMethod": f"{self.sharedSwAddrMethod}_{sw_addr_method}",
-            }
-
     def _get_software_components(self):
         """Creates a dict with swc information and referred data types.
 
@@ -659,12 +622,10 @@ class CompositionYaml(ProblemLogger):
         """
         software_component_name = self.build_cfg.get_composition_config("softwareComponentName")
         swcs = {software_component_name: {}}
-
         swcs[software_component_name]["type"] = "SWC"  # Other types than swc??
         swcs[software_component_name]["asil"] = self.build_cfg.get_composition_config("asil")
         swcs[software_component_name]["secure"] = self.build_cfg.get_composition_config("secure")
         swcs[software_component_name]["runnables"] = self._get_runnable_info()
-
         if self.build_cfg.get_composition_config("includeShared") is True:
             swcs[software_component_name]["shared"] = self.cal_class_info["autosar"]["class_info"]
             for variable_name, variable_info in self.composition_spec.get("shared", {}).items():
@@ -676,9 +637,6 @@ class CompositionYaml(ProblemLogger):
             swcs[software_component_name]["shared"] = {}
             for variable_name, variable_info in self.composition_spec.get("shared", {}).items():
                 swcs[software_component_name]["shared"][variable_name] = variable_info
-
-        self._populate_missing_swaddrmethods(swcs[software_component_name].get("shared", {}))
-
         if self.build_cfg.get_composition_config("includeStatic") is True:
             swcs[software_component_name]["static"] = self.meas_class_info["autosar"]["class_info"]
             for variable_name, variable_info in self.composition_spec.get("static", {}).items():
@@ -690,19 +648,14 @@ class CompositionYaml(ProblemLogger):
             swcs[software_component_name]["static"] = {}
             for variable_name, variable_info in self.composition_spec.get("static", {}).items():
                 swcs[software_component_name]["static"][variable_name] = variable_info
-
         swcs[software_component_name]["ports"] = self._get_ports_info()
-
         if self.composition_spec.get("io") is not None:
             swcs[software_component_name]["io"] = self.composition_spec["io"]
-
         if self.composition_spec.get("ecu") is not None:
             swcs[software_component_name]["ecu"] = self.composition_spec["ecu"]
-
         diagnostic_info = self._get_diagnostic_info()
         if self.build_cfg.get_composition_config("includeDiagnostics") is not False:
             swcs[software_component_name]["diagnostics"] = diagnostic_info
-
         nvm_info, nvm_data_types_tmp, static_variables = self._get_nvm_info()
         if self.build_cfg.get_composition_config("includeNvm"):
             swcs[software_component_name]["nv-needs"] = nvm_info

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.16.5.dev1
+Version: 1.16.5.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
 
-# powertrain-build
+# wertrain-build
 
 A Continuous Integration (CI) build system, testing all configurations where a TargetLink model is used.
 

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

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

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

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