powertrain-build 1.16.1.dev2__tar.gz → 1.16.2.dev1__tar.gz

{powertrain_build-1.16.1.dev2 → powertrain_build-1.16.2.dev1}/ChangeLog

@@ -1,8 +1,13 @@
 CHANGES
 =======
 
+* ZC: Add proper swAddrMethod to calibration trigger signal
+
+1.16.1
+------
+
 * Remove old ZC e2e\_status requirement
-* Update A2L regex for EC
+* Freeze tox version until bug is solved
 
 1.16.0
 ------

{powertrain_build-1.16.1.dev2 → powertrain_build-1.16.2.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.16.1.dev2
+Version: 1.16.2.dev1
 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.16.1.dev2 → powertrain_build-1.16.2.dev1}/powertrain_build/a2l_merge.py

@@ -93,11 +93,11 @@ class A2lMerge(ProblemLogger):
         #   /* Upper Limit            */      3.0
         # /end CHARACTERISTIC
 
-        self._block_finder = re.compile(r'(?:\s*\n)*'                    # Optional blank lines
-                                        r'(\s*/begin[^\S\r\n]+(\w+)\s*'  # begin <something> block
-                                        r'\n\s*([\w.]+).*?\n'            # label. (Bosch-nvm contains the .)
-                                        r'.*?'                           # block definition
-                                        r'/end\s+\2)',                   # end <something> block. Same something as before
+        self._block_finder = re.compile(r'(?:\s*\n)*'           # Optional blank lines
+                                        r'(\s*/begin (\w+)\s*'  # begin <something> block
+                                        r'\n\s*([\w.]+).*?\n'   # label. (Bosch-nvm contains the .)
+                                        r'.*?'                  # block definition
+                                        r'/end\s+\2)',          # end <something> block. Same something as before
                                         flags=re.M | re.DOTALL)
 
         self._tl_compu_method_parser = re.compile(
@@ -195,7 +195,7 @@ class A2lMerge(ProblemLogger):
                 code_generator = 'target_link'
 
             if code_generator == 'embedded_coder':
-                blks = re.findall(r'(?:\s*\n)*(\s*/begin[^\S\r\n]+'
+                blks = re.findall(r'(?:\s*\n)*(\s*/begin '
                                   r'(?!PROJECT|HEADER|MODULE|MOD_PAR|MOD_COMMON)(\w+)\s*(?:\n\s*)?'
                                   r'(?:/\*\s*[\w ]+\s*\*/\s*)?(\w+)([\[\d+\]]*).*?\n.*?/end\s+\2)',
                                   a2ld, flags=re.M | re.DOTALL)

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

@@ -69,22 +69,26 @@ class CompositionYaml(ProblemLogger):
             if self.build_cfg.get_code_generation_config(item="useCalibrationRteMacroExpansion"):
                 self.include_calibration_interface_files = False
         if self.include_calibration_interface_files:
-            trigger_read_rte_cdata_signal_name = self._get_calibration_trigger_signal_name(calibration_variables)
+            calib_trigger_signal = self._get_calibration_trigger_signal_name(calibration_variables)
             self.cal_class_info["tl"]["class_info"].update({
-                trigger_read_rte_cdata_signal_name: {
+                calib_trigger_signal: {
                     "type": ZCC.trigger_read_rte_cdata_signal['data_type'],
                     "width": 1,
                 }
             })
             self.cal_class_info["autosar"]["class_info"].update(
                 {
-                    trigger_read_rte_cdata_signal_name: {
+                    calib_trigger_signal: {
                         "type": ZCC.trigger_read_rte_cdata_signal["data_type"],
                         "access": "READ-WRITE",
                         "init": 0,
                     }
                 }
             )
+            if self.sharedSwAddrMethod is not None:
+                calib_trigger_signal_swAddrMethod = f"{self.sharedSwAddrMethod}_{calib_trigger_signal.split('_')[0]}"
+                (self.cal_class_info
+                 ["autosar"]["class_info"][calib_trigger_signal]["swAddrMethod"]) = calib_trigger_signal_swAddrMethod
 
     @staticmethod
     def _cast_init_value(value_str):

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.16.1.dev2
+Version: 1.16.2.dev1
 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.16.2.dev1/powertrain_build.egg-info/pbr.json

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

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

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