powertrain-build 1.3.2.dev4__tar.gz → 1.3.2.dev5__tar.gz

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/ChangeLog

@@ -2,7 +2,8 @@ CHANGES
 =======
 
 * Dummy 1
-* Hacks for LVCSC\_HIB 2310
+* Adding lsb, offset to curves and maps
+* Copy all keys in parsed ZC files
 * Allow comments in enum definition file
 * Also init calibration variables in the calibration init function
 

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.3.2.dev4
+Version: 1.3.2.dev5
 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.3.2.dev4 → powertrain_build-1.3.2.dev5}/powertrain_build/build_proj_config.py

@@ -269,6 +269,7 @@ class BuildProjConfig:
             'includeDiagnostics': file_config.get('includeDiagnostics', True),
             'includeNvm': file_config.get('includeNvm', True),
             'nvmPortPattern': file_config.get('nvmPortPattern', None),
+            'scaleMapsAndCurves': file_config.get('scaleMapsAndCurves', True),
         }
         composition_name = file_config.get("compositionName", None)
         if composition_name is not None:

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/powertrain_build/interface/zone_controller.py

@@ -141,7 +141,7 @@ class ZCAL(BaseApplication):
         """
         raw = self.read_translation_files(definition)
         self.composition_spec = {
-            key: raw[key] for key in ("port_interfaces", "data_types", "calls", "diagnostics", "nv-needs") if key in raw
+            key: value for key, value in raw.items() if key not in ["ports"]
         }
         ports_info = {}
         for port_name, port in raw.get("ports", {}).items():

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/powertrain_build/nvm_def.py

@@ -568,7 +568,7 @@ class ZCNVMDef(NVMDef):
             nvm_vars (dict): NVM variables from unit configurations.
         """
         super().__init__(project_config, unit_cfg, nvm_vars)
-        self.struct_member_prefix = ""
+        self.struct_member_prefix = "e_"
         self._valid_nvm_definitions = None
         self._update_nvm_base_struct()
         prefix = self._project_config.get_scheduler_prefix()

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/powertrain_build/zone_controller/composition_yaml.py

@@ -100,26 +100,6 @@ class CompositionYaml(ProblemLogger):
             }
         return base_data_types
 
-    def check_unsupported_fields(self, signal_name, signal_data):
-        """Warn about signal data containing unsupported field values.
-
-        Unsupported fields will not be propagated to the ARXML.
-        If any signal contains non-default data, PyBuild should fail.
-
-        Args:
-            signal_name (string): Name of signal to process.
-            signal_data (dict): signal data.
-        """
-        unsupported_fields = {"lsb": 1, "offset": 0}
-        for field, default_value in unsupported_fields.items():
-            if signal_data[field] != "-" and signal_data[field] != default_value:
-                self.warning(
-                    "Unsupported configuration: %s -> %s, for signal %s.",
-                    field,
-                    signal_data[field],
-                    signal_name,
-                )
-
     def generate_yaml(self):
         """Generates a yaml from project/model information."""
         composition_name = self.build_cfg.get_composition_config("compositionName")
@@ -471,6 +451,7 @@ class CompositionYaml(ProblemLogger):
         standard_init_function = autosar_prefix + swc_prefix + "VcExtINI"
         init_function = custom_init_function if custom_init_function is not None else standard_init_function
         call_dict = self._get_runnable_calls_info()
+        mode_switch_points_dict = self.composition_spec.get("mode_switch_points", {})
         runnables = self.build_cfg.get_units_raster_cfg()["SampleTimes"]
         calibration_variables = list(self.cal_class_info["autosar"]["class_info"].keys())
         swc_content = {init_function: {"type": "INIT", "accesses": calibration_variables}}
@@ -489,6 +470,8 @@ class CompositionYaml(ProblemLogger):
             }
             if call_dict:
                 swc_content[custom_step_function]["calls"] = call_dict
+            if mode_switch_points_dict:
+                swc_content[custom_step_function]["mode_switch_points"] = mode_switch_points_dict
             return swc_content
 
         if custom_step_function is not None:
@@ -505,6 +488,8 @@ class CompositionYaml(ProblemLogger):
             }
             if call_dict:
                 swc_content[key]["calls"] = call_dict
+            if mode_switch_points_dict:
+                swc_content[key]["mode_switch_points"] = mode_switch_points_dict
 
         return swc_content
 
@@ -572,7 +557,6 @@ class CompositionYaml(ProblemLogger):
                     else:
                         self.critical("Signal %s has no class defined.", signal_name)
                         continue
-                    self.check_unsupported_fields(signal_name, info)
         return calibration_variables, measurable_variables
 
     def _get_class_info(self, variable_dict):
@@ -687,6 +671,9 @@ class CompositionYaml(ProblemLogger):
                         "label": "Val",
                     },
                 }
+            if self.build_cfg.get_composition_config("scaleMapsAndCurves") and "int" in info["type"].lower():
+                new_data_type_data["slope"] = info["lsb"]
+                new_data_type_data["bias"] = info["offset"]
         elif signal_name.startswith("m"):
             new_data_type_data = {
                 "type": "COM_AXIS",
@@ -719,6 +706,9 @@ class CompositionYaml(ProblemLogger):
                         "label": "Val",
                     },
                 }
+            if self.build_cfg.get_composition_config("scaleMapsAndCurves") and "int" in info["type"].lower():
+                new_data_type_data["slope"] = info["lsb"]
+                new_data_type_data["bias"] = info["offset"]
         elif info["width"][0] == 1:
             new_data_type_name = f"dt_{signal_name}_{info['width'][1]}"
             new_data_type_data = {

{powertrain_build-1.3.2.dev4 → powertrain_build-1.3.2.dev5}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: powertrain-build
-Version: 1.3.2.dev4
+Version: 1.3.2.dev5
 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.3.2.dev5/powertrain_build.egg-info/pbr.json

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

powertrain_build-1.3.2.dev4/powertrain_build.egg-info/pbr.json

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