Bug fix, order in calibration.py

Change-Id: Ic5144b7431c8f76248a47761863b046e03057078
This commit is contained in:
Henrik Wahlqvist 2024-11-04 09:24:15 +01:00
parent 248ab888bf
commit 9e2c29fd4a
2 changed files with 17 additions and 17 deletions
powertrain_build/zone_controller
tests/zone_controller

@ -131,7 +131,7 @@ class ZoneControllerCalibration(ProblemLogger):
for signal_name, signal_data in self.calibration_variables.items():
if isinstance(signal_data["width"], list):
rte_call = f'Rte_CData_{self.swc_name}_{signal_name}()'
body.append(f' memcpy({rte_call}, &{signal_name}, sizeof({signal_data["type"]}));\n')
body.append(f' memcpy({signal_name}, {rte_call}, sizeof({signal_name}));\n')
else:
body.append(f' {signal_name} = Rte_CData_{self.swc_name}_{signal_name}();\n')
body.append(' }\n')

@ -21,19 +21,19 @@ class TestZoneControllerCalibration(TestCase):
build_cfg.get_composition_config.return_value = "testName_SC"
dummy_calib_data = {
"class_info": {
"dummy_signal_one": {
"dummy_one": {
"type": "Float32",
"width": 1
},
"dummy_signal_two": {
"dummy_two": {
"type": "UInt8",
"width": 1
},
"dummy_signal_three": {
"dummy_three": {
"type": "UInt8",
"width": [1, 2]
},
"dummy_signal_four": {
"dummy_four": {
"type": "UInt8",
"width": [2, 2]
}
@ -55,18 +55,18 @@ class TestZoneControllerCalibration(TestCase):
"\n",
"#define testName_SC_START_SEC_VCC_CAL\n",
'#include "testName_SC_MemMap.h"\n',
"extern CVC_CAL Float32 dummy_signal_one;\n",
"extern CVC_CAL UInt8 dummy_signal_two;\n",
"extern CVC_CAL UInt8 dummy_signal_three[2];\n",
"extern CVC_CAL UInt8 dummy_signal_four[2][2];\n",
"extern CVC_CAL Float32 dummy_one;\n",
"extern CVC_CAL UInt8 dummy_two;\n",
"extern CVC_CAL UInt8 dummy_three[2];\n",
"extern CVC_CAL UInt8 dummy_four[2][2];\n",
"extern CVC_CAL Float32 ctestName_SC_TriggerReadRteCData;\n",
"#define testName_SC_STOP_SEC_VCC_CAL\n",
'#include "testName_SC_MemMap.h"\n',
"\n",
"extern Float32 Rte_CData_testName_SC_dummy_signal_one(void);\n",
"extern UInt8 Rte_CData_testName_SC_dummy_signal_two(void);\n",
"extern const UInt8* Rte_CData_testName_SC_dummy_signal_three(void);\n",
"extern const UInt8* Rte_CData_testName_SC_dummy_signal_four(void);\n",
"extern Float32 Rte_CData_testName_SC_dummy_one(void);\n",
"extern UInt8 Rte_CData_testName_SC_dummy_two(void);\n",
"extern const UInt8* Rte_CData_testName_SC_dummy_three(void);\n",
"extern const UInt8* Rte_CData_testName_SC_dummy_four(void);\n",
"extern Float32 Rte_CData_testName_SC_ctestName_SC_TriggerReadRteCData(void);\n",
"\n",
"void testName_SC_ZcCalibrationStep(void);\n",
@ -92,10 +92,10 @@ class TestZoneControllerCalibration(TestCase):
"void testName_SC_ZcCalibrationStep(void)\n{\n",
" if (ctestName_SC_TriggerReadRteCData != Rte_CData_testName_SC_ctestName_SC_TriggerReadRteCData())\n",
" {\n",
" dummy_signal_one = Rte_CData_testName_SC_dummy_signal_one();\n",
" dummy_signal_two = Rte_CData_testName_SC_dummy_signal_two();\n",
" memcpy(Rte_CData_testName_SC_dummy_signal_three(), &dummy_signal_three, sizeof(UInt8));\n",
" memcpy(Rte_CData_testName_SC_dummy_signal_four(), &dummy_signal_four, sizeof(UInt8));\n",
" dummy_one = Rte_CData_testName_SC_dummy_one();\n",
" dummy_two = Rte_CData_testName_SC_dummy_two();\n",
" memcpy(dummy_three, Rte_CData_testName_SC_dummy_three(), sizeof(dummy_three));\n",
" memcpy(dummy_four, Rte_CData_testName_SC_dummy_four(), sizeof(dummy_four));\n",
" ctestName_SC_TriggerReadRteCData = Rte_CData_testName_SC_ctestName_SC_TriggerReadRteCData();\n",
" }\n",
"}\n",