powertrain-build 1.14.0__py3-none-any.whl → 1.14.1.dev2__py3-none-any.whl

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.14.0.dist-info → powertrain_build-1.14.1.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: powertrain-build
-Version: 1.14.0
+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.0.dist-info → powertrain_build-1.14.1.dev2.dist-info}/RECORD

@@ -117,14 +117,14 @@ powertrain_build/matlab_scripts/helperFunctions/updateModels.m,sha256=3hD54qmo2V
 powertrain_build/templates/Index_SigCheck_All.html,sha256=psLtxiw5UChCs35tYGwVkGujXHJNw3ibFaZc-JMMPdg,1602
 powertrain_build/templates/Index_SigIf_All.html,sha256=7hwH6XSrrh5sDDJAnGdJTjzI7HwOeZFfve60Ke4Wa_Q,1433
 powertrain_build/zone_controller/__init__.py,sha256=tzftZINv5NTXFxXz5H_ptDywSCr49cll2CVFtv4HyF8,113
-powertrain_build/zone_controller/calibration.py,sha256=2QZOFJMl4UP9GYlK4ZmAS9VoSlqSqJ2jSmGtVrSML6s,8380
+powertrain_build/zone_controller/calibration.py,sha256=JR2DqZPwgGvOidXWRyhO9Rz17NKRBmtFL7IADqKdT-0,9116
 powertrain_build/zone_controller/composition_yaml.py,sha256=0dCnmvFFh9GPjDgHqAQjKOl75DocqWwrueOOXql6rhY,41726
-powertrain_build-1.14.0.dist-info/licenses/AUTHORS,sha256=tP9V0duq5X9hw2pos8WTLXN7kNHmVnhJqpmBFqIdHKI,276
-powertrain_build-1.14.0.dist-info/licenses/LICENSE,sha256=0tJvKn_0AWjVNJ4hkDXhVQZLOdCNwR_2u0UcxVrToOg,10452
-powertrain_build-1.14.0.dist-info/licenses/NOTICE,sha256=NIT_NaKZs4t_tVT4VO_AtJl3X39O8nL8L3pGXn9jK8M,465187
-powertrain_build-1.14.0.dist-info/METADATA,sha256=rb7melarqsqdlrqJfFmIDmnS0dd4qFMGKf6TZBJgs90,5217
-powertrain_build-1.14.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-powertrain_build-1.14.0.dist-info/entry_points.txt,sha256=CdE3i43zDAllglVE3fwvKa7i0jvNqvipZJu0GTS5VOg,63
-powertrain_build-1.14.0.dist-info/pbr.json,sha256=F6j756U0kYhlsyPaqe0eFZkrxM1E0vXAWKYMolu8IOY,46
-powertrain_build-1.14.0.dist-info/top_level.txt,sha256=wAaR8OQEH2mb8_gudmo4l_RoNXgWvnB845ckD1BsguA,17
-powertrain_build-1.14.0.dist-info/RECORD,,
+powertrain_build-1.14.1.dev2.dist-info/licenses/AUTHORS,sha256=tP9V0duq5X9hw2pos8WTLXN7kNHmVnhJqpmBFqIdHKI,276
+powertrain_build-1.14.1.dev2.dist-info/licenses/LICENSE,sha256=0tJvKn_0AWjVNJ4hkDXhVQZLOdCNwR_2u0UcxVrToOg,10452
+powertrain_build-1.14.1.dev2.dist-info/licenses/NOTICE,sha256=NIT_NaKZs4t_tVT4VO_AtJl3X39O8nL8L3pGXn9jK8M,465187
+powertrain_build-1.14.1.dev2.dist-info/METADATA,sha256=7C01G-Ex0XZDvgzxnWBqrkQPJJGqnX-LGdfE65GAZJ8,5222
+powertrain_build-1.14.1.dev2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+powertrain_build-1.14.1.dev2.dist-info/entry_points.txt,sha256=CdE3i43zDAllglVE3fwvKa7i0jvNqvipZJu0GTS5VOg,63
+powertrain_build-1.14.1.dev2.dist-info/pbr.json,sha256=DYQflvn3zA3RirHeY6987KvTq7xFrt8m-8PfQW9-KuY,47
+powertrain_build-1.14.1.dev2.dist-info/top_level.txt,sha256=wAaR8OQEH2mb8_gudmo4l_RoNXgWvnB845ckD1BsguA,17
+powertrain_build-1.14.1.dev2.dist-info/RECORD,,

powertrain_build-1.14.1.dev2.dist-info/pbr.json

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

powertrain_build-1.14.0.dist-info/pbr.json

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