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

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

@@ -1,8 +1,15 @@
 CHANGES
 =======
 
+* ZC: Reverse DID bytes in S/R DIDs
+* ZC: Add proper swAddrMethod to calibration trigger signal
+* Revert "Freeze tox version until bug is solved"
+
+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.dev4}/PKG-INFO

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

@@ -667,6 +667,33 @@ class ZCDIDs(ProblemLogger):
             return {}
         return project_dids
 
+    def _get_sender_receiver_reverse_bytes_function_declaration(self):
+        """Get content for the declaration of the function that reverses the byte order of the S/R DID values.
+
+        Returns:
+            (str): Line resulting in the reverse byte order function declaration.
+        """
+        return '\nstatic UInt32 ReverseBytes(UInt32 value, UInt8 byteSize);\n'
+
+    def _get_sender_receiver_reverse_bytes_function(self):
+        """Get content for the function that reverses the byte order of the S/R DID values.
+
+        Returns:
+            (list(str)): List of lines resulting in the reverse byte order function.
+        """
+        return [
+            f'#include "{build_defs.CVC_CODE_ASIL_D_START}"\n',
+            'static UInt32 ReverseBytes(UInt32 value, UInt8 byteSize)\n',
+            '{\n',
+            '  UInt32 result = 0U;\n',
+            '  for (UInt8 i = 0; i < byteSize; i++) {\n',
+            '    result = (result << 8) | ((value >> (8 * i)) & 0xFF);\n',
+            '  }\n',
+            '  return result;\n',
+            '}\n',
+            f'#include "{build_defs.CVC_CODE_ASIL_D_END}"\n'
+        ]
+
     def _get_sender_receiver_header_file_content(self):
         """Get content for the S/R DID API header file.
 
@@ -713,6 +740,7 @@ class ZCDIDs(ProblemLogger):
             )
 
         function_declarations.append(f'\nvoid Run_{self.sender_receiver_file_name}(void);\n')
+        function_declarations.append(self._get_sender_receiver_reverse_bytes_function_declaration())
 
         body = [
             f'#include "{build_defs.PREDECL_DISP_ASIL_D_START}"\n',
@@ -758,11 +786,14 @@ class ZCDIDs(ProblemLogger):
                 )
                 continue
             sender_receiver_dids_exist = True
-            body.append(f'  Rte_Write_DataServices_DID_{did}_data({did});\n')
+            did_byte_size = byte_size(project_did_data['type'])
+            body.append(f'  Rte_Write_DataServices_DID_{did}_data(ReverseBytes({did}, {did_byte_size}));\n')
         body.extend([
             '}\n',
             f'#include "{build_defs.CVC_CODE_ASIL_D_END}"\n'
         ])
+        body.append('\n')
+        body.extend(self._get_sender_receiver_reverse_bytes_function())
 
         return sender_receiver_dids_exist, header + body
 

{powertrain_build-1.16.1.dev2 → powertrain_build-1.16.2.dev4}/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.dev4}/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.dev4
 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.dev4/powertrain_build.egg-info/pbr.json

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

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

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