aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/General
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-11-26 17:10:36 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-11-26 17:10:36 +0200
commit36509bce0c02233b16dcdb39de450bcb30fdc1fc (patch)
treed195373257b23082a0c24e2e69c64d252fb3edab /Software/Embedded_SW/Embedded/Modules/General
parentebe229368ce63bf5a2522fb9b6b3dd248daedc9f (diff)
downloadTango-36509bce0c02233b16dcdb39de450bcb30fdc1fc.tar.gz
Tango-36509bce0c02233b16dcdb39de450bcb30fdc1fc.zip
shinko to a separate task. test heaters prepare process. NOT TESTED
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/General')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 6c4293f6f..cdc6afa50 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -450,7 +450,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
{
Report("HWConfigurationInit repeated failure",__FILE__,__LINE__,(int)InitFailures,RpWarning,(int)EEPROM_INIT_FAILURE_COUNTER,0);
AlarmHandlingSetAlarm (EVENT_TYPE__POWER_UP_BIT_FAILURE,ON);
- return ERROR;
+ //return ERROR;
}
else
{
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index bf68b64f0..e6c596d15 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -313,8 +313,8 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot, int32_t index, CartridgeState
SendChars((char*)container_buffer, container_size);
//MessageContainer responseContainer;
- my_free(response.status);
my_free(response.status->cartridgesstatuses);
+ my_free(response.status);
return status;
}