diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:59 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-08-26 11:04:59 +0300 |
| commit | f851e980e49a4737e03335665b9c3a3a529ea326 (patch) | |
| tree | f9a2877bd8cd4886f9d5fa4a86805f47cf1e2fb1 /Software/Embedded_SW/Embedded/StateMachines | |
| parent | ce95311e3ca782c405591d12da7cf4366c8dcfb2 (diff) | |
| parent | d493603b5c99e0f0ba6858ba9011c83baa780d3b (diff) | |
| download | Tango-f851e980e49a4737e03335665b9c3a3a529ea326.tar.gz Tango-f851e980e49a4737e03335665b9c3a3a529ea326.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/StateMachines')
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c index 88fdff1b2..4577a7c55 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerOffSequence.c @@ -257,7 +257,7 @@ uint32_t PowerOffHeatersOff(void) if (HandleProcessParameters(&ProcessParametersClear,false)!= OK) { LOG_ERROR (PowerOffMachineState, "Turn Off Heaters failed"); - return ERROR; + //return ERROR; } PowerOffMachineState++; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c index 31872d932..52aac94f5 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c @@ -311,7 +311,7 @@ uint32_t PrintingHWConfiguration(void *Configuration) if ((IFS_Availability[1] == IFS_RECOGNIZED_INIT_PASSED)&&(IFS_Availability[2] == IFS_RECOGNIZED_INIT_PASSED)) //ifs installed -check cartridges Configured[Module_Waste] = true; - if (request->n_motors < HARDWARE_MOTOR_TYPE__MOTO_SPARE1_1) + if (request->n_motors) { for (i = 0; i < request->n_motors ; i++) { |