Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

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];