powertrain-build 1.13.3.dev3__tar.gz → 1.14.1.dev2__tar.gz

{powertrain_build-1.13.3.dev3 → powertrain_build-1.14.1.dev2}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+* Polyspace fixes for ZC calibration
+* New year(?) new secret
+
+1.14.0
+------
+
 * Add generateAccessPoints as False to ZC calibration runnable
 * Bug fix for: ZC calibration header should use PREDECL files
 * ZC calibration header should use PREDECL files

{powertrain_build-1.13.3.dev3 → powertrain_build-1.14.1.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.13.3.dev3
+Version: 1.14.1.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.13.3.dev3 → powertrain_build-1.14.1.dev2}/powertrain_build/zone_controller/calibration.py

@@ -15,7 +15,7 @@ class ZoneControllerCalibration(ProblemLogger):
     calibration_function_step_template = '{swc_name}_ZcCalibrationStep'
     trigger_read_rte_cdata_signal = {
         'name_template': 'c{swc_name}_TriggerReadRteCData',
-        'data_type': 'Float32'
+        'data_type': 'UInt8'
     }
 
     def __init__(self, build_cfg, calib_data):
@@ -45,7 +45,22 @@ class ZoneControllerCalibration(ProblemLogger):
         for signal_name, signal_data in self.calibration_variables.items():
             rte_call = f'Rte_CData_{self.swc_name}_{signal_name}()'
             if isinstance(signal_data["width"], list):
-                write_string_list.append(f'{"":{indent}}memcpy({signal_name}, {rte_call}, sizeof({signal_name}));\n')
+                # MAPs get typedef:ed to structs and need special data type mapping
+                if signal_name.startswith("m") and signal_name[-2:] not in ["_r", "_c"]:
+                    write_string_list.append(
+                        f'{"":{indent}}const {signal_data["autosar_type"]} *{signal_name}_ptr = {rte_call};\n'
+                    )
+                    write_string_list.append(
+                        f'{"":{indent}}memcpy('
+                        f'{signal_name}, '
+                        f'{signal_name}_ptr->{signal_data["autosar_type"]}, '
+                        f'sizeof({signal_name})'
+                        ');\n'
+                    )
+                else:
+                    write_string_list.append(
+                        f'{"":{indent}}memcpy({signal_name}, {rte_call}, sizeof({signal_name}));\n'
+                    )
             else:
                 write_string_list.append(f'{"":{indent}}{signal_name} = {rte_call};\n')
         return write_string_list
@@ -123,7 +138,7 @@ class ZoneControllerCalibration(ProblemLogger):
         lines_to_write.append('\n')
         for signal_name, signal_data in self.calibration_variables.items():
             if isinstance(signal_data["width"], list):
-                # MAPs get typedef:ed to structs and need special data type mapping in calibration.py
+                # MAPs get typedef:ed to structs and need special data type mapping
                 if signal_name.startswith("m") and signal_name[-2:] not in ["_r", "_c"]:
                     return_type = f'const {signal_data["autosar_type"]}*'
                 else:

{powertrain_build-1.13.3.dev3 → powertrain_build-1.14.1.dev2}/powertrain_build.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.13.3.dev3
+Version: 1.14.1.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.14.1.dev2/powertrain_build.egg-info/pbr.json

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

powertrain_build-1.13.3.dev3/powertrain_build.egg-info/pbr.json

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