streamline all job actions (end, abort) htrough the process task.

1 files changed, 13 insertions, 5 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 54a47e927..69eafe152 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -377,10 +377,13 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
                     {
                         //consider applying the debouce parameters later
                         //BreakSensordebouncetimemilli
-                        //LOG_ERROR(index, "ReadBreakSensor Error");
                         JobEndReason = JOB_THREAD_BREAK;
-                        //SendJobProgress(0.0,0,false, "ReadBreakSensor Error");
-                       EndState(CurrentJob,"ReadBreakSensor Error" );
+                        ThreadControlActive = false;
+                        SendJobProgress(0.0,0,false, "ReadBreakSensor Error");
+                        SegmentReady(Module_Thread,ModuleFail);
+                       //EndState(CurrentJob,"ReadBreakSensor Error" );
+                        LOG_ERROR(index, "ReadBreakSensor Error");
+                        return OK;
                     }
                 }
             }
@@ -390,9 +393,14 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         if ((abs(avreageSampleValue)> DancerStopActivityLimit[index])&&(JobCounter > eOneSecond))
         {
             usnprintf(Message, 60, "Dancer %d limit %d value %d Zero %d",DancerId,DancerStopActivityLimit[index],avreageSampleValue,DancersCfg[DancerId].zeropoint);
-            JobAbortedByUser = true;
+            //JobAbortedByUser = true;
+            ThreadControlActive = false;
             JobEndReason = JOB_DANCER_FAIL;
-            EndState(CurrentJob,Message );
+            SendJobProgress(0.0,0,false, Message);
+            //EndState(CurrentJob,Message );
+            SegmentReady(Module_Thread,ModuleFail);
+            LOG_ERROR (index, "Dancer Failure");
+            return OK;
         }
         NormalizedError = avreageSampleValue*NormalizedErrorCoEfficient[index];
         MotorControlConfig[index].m_mesuredParam = NormalizedError;