From cb839690af5ae6ea272a3cb303fcf97761f3d84d Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 18 Jul 2018 12:11:20 +0300
Subject: IDS Distance to spool - stop dispensers sensor break in comment

---
 Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 6a0bac394..6822493cd 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -352,7 +352,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         for (i=0;i<MotorsControl[index].pvinputfilterfactormode;i++)
             avreageSampleValue += MotorSamples[index][i];
         avreageSampleValue = avreageSampleValue / MotorsControl[index].pvinputfilterfactormode;
-        //Stop Execution if the dancer moves too much
+        /*
         if (index == POOLER_MOTOR)
         {
             if (JobCounter > eOneSecond)
@@ -365,10 +365,12 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
                 }
             }
         }
+        */
+        //Stop Execution if the dancer moves too much
         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);
-
+            usnprintf(Message, 60, "Dancer %d limit %d value %d Zero %d",DancerId,DancerStopActivityLimit[index],avreageSampleValue,DancersCfg[DancerId].zeropoint);
+            JobAbortedByUser = true;
             EndState(CurrentJob,Message );
         }
         NormalizedError = avreageSampleValue*NormalizedErrorCoEfficient[index];
-- 
cgit v1.3.1


From 27f843a93af1fdda7e79ad4e1579f7f2de3d2e8d Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 18 Jul 2018 12:16:55 +0300
Subject: remove the "Progress" message text

---
 Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c       | 2 +-
 Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c     | 6 ++++--
 .../Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c     | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c')

diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 6822493cd..ad3c731cb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -196,7 +196,7 @@ uint32_t ThreadLengthCBFunction(uint32_t IfIndex, uint32_t ReadValue)
         }
         else
         {
-            SendJobProgress(TotalProcessedLength,0,false, "Progress");
+            SendJobProgress(TotalProcessedLength,0,false, NULL);
         }
 
     }
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
index d33cb0265..aa616fee2 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c
@@ -410,8 +410,10 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes
     JobResponse response = JOB_RESPONSE__INIT;
     JobStatus jobStatus = JOB_STATUS__INIT;
 
-    jobStatus.message = Message;
-
+    if (Message)
+    {
+        jobStatus.message = Message;
+    }
     //previousJobLength =  ProcessedLength;
     jobStatus.has_progress = true;
     jobStatus.progress = TotalProcessedLength;
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
index 10e865bdc..a3ffe0c66 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.c
@@ -345,11 +345,11 @@ uint32_t DistanceToSpoolReady(int ModuleId, ModuleStateEnum result)
 static uint32_t DistanceToSpoolState(void *JobDetails)
 {
     SendJobProgress(0.0, 0, false, "DistanceToSpool Start");
-    /*if (Configured[Module_IDS])
+    if (Configured[Module_IDS])
     {
-        //DistanceToSpoolWaiting[Module_IDS] = ModuleWaiting;
-        IDSSegmentState(JobDetails,SegmentId);
-    }*/
+        DistanceToSpoolWaiting[Module_IDS] = ModuleWaiting;
+        IDSDistanceToSpoolState();
+    }
     if (Configured[Module_Thread])
     {
         DistanceToSpoolWaiting[Module_Thread] = ModuleWaiting;
-- 
cgit v1.3.1