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

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

@@ -1,21 +1,49 @@
 CHANGES
 =======
 
-1.1.2.dev1
+1.1.2.dev2
 ----------
 
-* Adding lsb, offset to curves and maps
+* Enable enums in interface for zone controller
+
+1.1.1
+-----
+
 * Need to generate ZC NVM structs in order to compile
+
+1.1.0
+-----
+
+
+1.0.8
+-----
+
 * Remove required key in config.py
+
+1.0.7
+-----
+
 * Bug fix, order in calibration.py
+
+1.0.6
+-----
+
 * Allow ZC ports without elements
 * Updates to be able to generate NVM RTE function calls
 * Adding NVM functionality to composition\_yaml
+
+1.0.5
+-----
+
 * Added powertrain-build entrypoint
 * Bug fix in \_add\_autosar\_data\_types
 * Join the use of useSwcAsPrefix and get\_scheduler\_prefix
 * Forcing LF in NOTICE file
 * Added support for Python 3.13
+
+1.0.4
+-----
+
 * Missed to update use of get function
 * Measure code coverage in tox tests
 * Add option for supplying custom step function name

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev1
+Version: 1.1.2.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/

{powertrain_build-1.1.2.dev1 → powertrain_build-1.1.2.dev2}/powertrain_build/build.py

@@ -904,8 +904,7 @@ def build(
             zc_nvm = ZCNVMDef(build_cfg, unit_cfg, project_nvm_defintions)
             axis_data = merged_a2l.get_characteristic_axis_data()
             composition_yaml = CompositionYaml(
-                build_cfg, signal_if.composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, axis_data
-            )
+                build_cfg, signal_if.composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, axis_data, udt.get_enumerations())
             LOG.info("******************************************************")
             composition_yaml.generate_yaml()
             LOG.info("******************************************************")

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

@@ -677,6 +677,21 @@ class BuildProjConfig:
             )
         return None
 
+    def enable_snake_case_enums(self):
+        """Return True/False whether enums should be snake case in source code. Default is false (all caps).
+
+        Returns:
+            (bool): True/False whether enums should be snake case in source code
+        """
+        return self._prj_cfg['ProjectInfo'].get('snakeCaseEnums', False)
+
+    def enable_external_rte_headers(self):
+        """Return True/False whether external RTE headers should be included in ext vars. Default is false.
+
+        Returns:
+            (bool): True/False whether external RTE headers should be included in ext vars
+        """
+        return self._prj_cfg['CodeGenerationConfig'].get('enableExternalRteHeaders', False)
 
 if __name__ == '__main__':
     # Function for testing the module

{powertrain_build-1.1.2.dev1 → powertrain_build-1.1.2.dev2}/powertrain_build/ext_var.py

@@ -160,6 +160,10 @@ class ExtVarBase(ProblemLogger):
 
             for common_header_file in self._common_header_files:
                 fh_c.write(f'#include "{common_header_file}"\n')
+            if self._prj_cfg.enable_external_rte_headers():
+                fh_c.write('#include "Rte_Type.h"\n')
+                composition_name = self._prj_cfg.get_composition_config("softwareComponentName")
+                fh_c.write(f'#include "Rte_{ composition_name }_Type.h"\n')
             fh_c.write("\n")
 
             fh_c.write(f'#include "{self._decl_start}"\n')

{powertrain_build-1.1.2.dev1 → powertrain_build-1.1.2.dev2}/powertrain_build/user_defined_types.py

@@ -437,6 +437,8 @@ class UserDefinedTypes(ProblemLogger):
         for signal_type in ['inports', 'outports', 'local_vars', 'calib_consts']:
             for signal_data in u_cfg[signal_type].values():
                 if enum_name == signal_data['type'] and 'default' in signal_data:
+                    if self._build_prj_cfg.enable_snake_case_enums():
+                        return f"{enum_name}_{signal_data['default']}"
                     return f"{enum_name.upper()}_{signal_data['default'].upper()}"
 
         self.warning(
@@ -533,14 +535,17 @@ class UserDefinedTypes(ProblemLogger):
         with file_path.open('w') as fh:
             fh.write(self._get_header_file_header(guard))
             fh.write('/* VCC Enumerations */\n')
-            for enum_name, enum_data in enumerations.items():
-                fh.write('\n')
-                fh.write(f'typedef enum {enum_name}_tag {{\n')
-                nr_of_enum_members = len(enum_data['members'])
-                for idx, enum_member_name in enumerate(enum_data['members']):
-                    ending = ', ' if idx < nr_of_enum_members - 1 else ' '
-                    fh.write(f"   {enum_member_name} = {enum_data['members'][enum_member_name]}{ending}\n")
-                fh.write(f'}} {enum_name};\n')
+            if self._build_prj_cfg.enable_external_rte_headers():
+                fh.write('\n/* External enums located in rte headers */\n\n')
+            else:
+                for enum_name, enum_data in enumerations.items():
+                    fh.write('\n')
+                    fh.write(f'typedef enum {enum_name}_tag {{\n')
+                    nr_of_enum_members = len(enum_data['members'])
+                    for idx, enum_member_name in enumerate(enum_data['members']):
+                        ending = ', ' if idx < nr_of_enum_members - 1 else ' '
+                        fh.write(f"   {enum_member_name} = {enum_data['members'][enum_member_name]}{ending}\n")
+                    fh.write(f'}} {enum_name};\n')
             fh.write(f'#endif /* {guard} */\n')
 
     def generate_common_header_files(self):

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

@@ -15,7 +15,7 @@ from powertrain_build.zone_controller.calibration import ZoneControllerCalibrati
 class CompositionYaml(ProblemLogger):
     """Class for handling ZoneController composition yaml generation."""
 
-    def __init__(self, build_cfg, composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, a2l_axis_data):
+    def __init__(self, build_cfg, composition_spec, unit_cfg, zc_core, zc_dids, zc_nvm, a2l_axis_data, enums):
         """Init.
 
         Args:
@@ -44,6 +44,7 @@ class CompositionYaml(ProblemLogger):
         self.zc_core = zc_core
         self.zc_dids = zc_dids
         self.zc_nvm = zc_nvm
+        self.enums = enums
         self.a2l_axis_data = a2l_axis_data
         base_data_types = self.get_base_data_types()  # Might not be necessary in the long run
         self.data_types = {
@@ -188,6 +189,10 @@ class CompositionYaml(ProblemLogger):
                 re.compile(r"^\s*CVC_CAL[A-Z_]*\s+\w+\s+(?P<name>\w+)\[(?P<rows>[\d]+)\]\[(?P<cols>[\d]+)\]\s*=\s*"),
                 self._get_matrix_init_values,
             ),
+            (
+                re.compile(r"^\s*CVC_CAL[A-Z_]*\s+\w+\s+(?P<name>\w+)\s*=\s*(?P<enum>[a-zA-Z_$][\w_]*?)*;"),
+                lambda regex_match, _: regex_match.group("enum"),
+            ),
         ]
 
         init_values = {}
@@ -591,13 +596,22 @@ class CompositionYaml(ProblemLogger):
             data_types (dict): Dictionary with data types.
             signal_name (string): Name of signal to process.
             info (dict): signal data.
-        Returns:
+        Returns::wq
+
             class_info (dict): Updated dictionary with variables.
             data_types (dict): Updated dictionary with data types.
         """
         if "Bool" in info["type"]:
             upper = 1
             lower = 0
+        elif info["type"] in self.enums:
+            new_data_type = {info["type"]: {"type": "ENUMERATION", "enums": self.enums[info["type"]]["members"]}}
+            class_info[signal_name] = {
+                "type": info["type"], "access": ("READ-ONLY" if "CVC_DISP" in info["class"] else "READ-WRITE"),
+                "init": self.enums[info["type"]]["default_value"]
+            }
+            #data_types = {**data_types, **new_data_type}
+            return class_info, data_types
         else:
             base_type_lower = self.data_types[info["type"]]["limits"]["lower"]
             base_type_upper = self.data_types[info["type"]]["limits"]["upper"]
@@ -641,8 +655,6 @@ class CompositionYaml(ProblemLogger):
                     "axis-index": 1,
                     "size": info["width"][1],
                     "limits": {"lower": lower, "upper": upper},
-                    "slope": info["lsb"],
-                    "bias": info["offset"],
                     "swrecordlayout": {
                         "name": f"Distr_{signal_name}",
                         "type": "INDEX_INCR",
@@ -656,8 +668,6 @@ class CompositionYaml(ProblemLogger):
                     "type": "CURVE",
                     "axis": f"dt_{axis}",
                     "limits": {"lower": lower, "upper": upper},
-                    "slope": info["lsb"],
-                    "bias": info["offset"],
                     "swrecordlayout": {
                         "name": f"Curve_{signal_name}",
                         "type": "COLUMN_DIR",
@@ -670,8 +680,6 @@ class CompositionYaml(ProblemLogger):
                 "type": "COM_AXIS",
                 "size": info["width"][1],
                 "limits": {"lower": lower, "upper": upper},
-                "slope": info["lsb"],
-                "bias": info["offset"],
                 "swrecordlayout": {
                     "name": f"Distr_{signal_name}",
                     "type": "INDEX_INCR",
@@ -692,8 +700,6 @@ class CompositionYaml(ProblemLogger):
                     "x-axis": f"dt_{axis_r}",
                     "y-axis": f"dt_{axis_c}",
                     "limits": {"lower": lower, "upper": upper},
-                    "slope": info["lsb"],
-                    "bias": info["offset"],
                     "swrecordlayout": {
                         "name": f"Map_{signal_name}",
                         "type": "COLUMN_DIR",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: powertrain-build
-Version: 1.1.2.dev1
+Version: 1.1.2.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/

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

@@ -0,0 +1 @@
+{"git_version": "99becbd", "is_release": true}

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

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