diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-26 16:34:16 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-26 16:34:16 +0300 |
| commit | 5accee4df85cc47b5700ad32090451ded2a121fa (patch) | |
| tree | 11dc6229de126d5c9fc8135bfeacd88151e6ed77 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 4ff8fc0265f11be7b73548e36c7ee3d1debfb8e4 (diff) | |
| download | Tango-5accee4df85cc47b5700ad32090451ded2a121fa.tar.gz Tango-5accee4df85cc47b5700ad32090451ded2a121fa.zip | |
warning removed. diagnostics stops when the commtx mailbox is full.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 1 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index c8d2e6362..0680e97a4 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -10,6 +10,7 @@ #include "drivers/Motors/Motor.h" #include "StateMachines/Printing/PrintingSTM.h" #include "Modules/Control/Control.h" +#include "Modules/Control/MillisecTask.h" #include "modules/General/process.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index d19b447d9..b6c1fea57 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -360,6 +360,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) if (ReadBreakSensor()==ERROR) { //LOG_ERROR(index, "ReadBreakSensor Error"); + JobEndReason = JOB_DANCER_FAIL; //SendJobProgress(0.0,0,false, "ReadBreakSensor Error"); EndState(CurrentJob,"ReadBreakSensor Error" ); } @@ -371,6 +372,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) { usnprintf(Message, 60, "Dancer %d limit %d value %d Zero %d",DancerId,DancerStopActivityLimit[index],avreageSampleValue,DancersCfg[DancerId].zeropoint); JobAbortedByUser = true; + JobEndReason = JOB_THREAD_BREAK; EndState(CurrentJob,Message ); } NormalizedError = avreageSampleValue*NormalizedErrorCoEfficient[index]; |
