diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-20 14:05:26 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-20 14:05:26 +0200 |
| commit | 53daee7d858e4795d681ebd8641bd370eb36dadc (patch) | |
| tree | d8a1aa2ec3b2822eff9e708e9fe86beda66c3113 /Software | |
| parent | 3480a47e555c1c9027d6dab4f66347b9bd369797 (diff) | |
| download | Tango-53daee7d858e4795d681ebd8641bd370eb36dadc.tar.gz Tango-53daee7d858e4795d681ebd8641bd370eb36dadc.zip | |
bugs fix - job abort
Diffstat (limited to 'Software')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 11 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index ff0353b23..1cc8e766b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -722,10 +722,13 @@ uint32_t MillisecLowLoop(uint32_t tick) PressureCalc[Disp_i] = MillisecCalculatePressures(Disp_i); } } - Trigger_WHS_PT100_Read_All(); - WHS_Blower_Avarege_ORF1(); //drier - WHS_Blower_Avarege_ORF3(); //head - WHS_Start_Blower_Control_Closed_Loop (); + if (WHS_Type == WHS_TYPE_NEW) + { + Trigger_WHS_PT100_Read_All(); + WHS_Blower_Avarege_ORF1(); //drier + WHS_Blower_Avarege_ORF3(); //head + WHS_Start_Blower_Control_Closed_Loop (); + } } if (OneMinute_Tick) { diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index 7eb621c81..f295f2475 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -930,7 +930,6 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes responseContainer.has_continuous = true; responseContainer.continuous = true; - container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); if (done == true) { if(JobEndReason != JOB_OK) @@ -945,6 +944,7 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes responseContainer.error = ERROR_CODE__CONTINUOUS_RESPONSE_ABORTED; } } + container_buffer = my_malloc(message_container__get_packed_size(&responseContainer)); if (container_buffer) { size_t container_size = message_container__pack(&responseContainer, container_buffer); |