aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-18 16:43:49 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-18 16:43:49 +0200
commit8906274180ae356fcf08893b313f852546181514 (patch)
treebb870377521946e9e1bec623bc175f85468e3e1a /Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
parenta9d18c495bfb4232b61bf4b45f1ba3c626cdb61b (diff)
downloadTango-8906274180ae356fcf08893b313f852546181514.tar.gz
Tango-8906274180ae356fcf08893b313f852546181514.zip
preparation for light colors
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index cc2c508c0..6abf05539 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -628,7 +628,6 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
return OK;
}
char Serial[21];
-MidTankData MidTankInfo[MAX_SYSTEM_DISPENSERS];
uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestContainer)
{
@@ -636,6 +635,7 @@ uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestContainer)
MachineCalibrationDataRequest *request = machine_calibration_data_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
uint32_t *DancersData = my_malloc(MAX_SYSTEM_DANCERS*sizeof(uint32_t));
MidTankData ** MidTankDataCollect = my_malloc(sizeof(MidTankData *)*MAX_SYSTEM_DISPENSERS);
+ MidTankData MidTankInfo[MAX_SYSTEM_DISPENSERS];
int i;
for (i = 0;i<MAX_SYSTEM_DANCERS;i++)
@@ -655,7 +655,8 @@ uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestContainer)
//MCU_E2PromSerialNumRead(&Serial);
MachineCalibrationDataResponse response = MACHINE_CALIBRATION_DATA_RESPONSE__INIT;
- machine_calibration_data__init(&response.machinecalibrationdata);
+ response.machinecalibrationdata = my_malloc(sizeof(MachineCalibrationData));
+ machine_calibration_data__init(response.machinecalibrationdata);
response.machinecalibrationdata->n_dancermiddlepoint = MAX_SYSTEM_DANCERS;
response.machinecalibrationdata->dancermiddlepoint = DancersData;
response.machinecalibrationdata->machineserialnumber = Serial;