fix brushstop stop dispensers bug

2 files changed, 13 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 3eaa2f9c2..492dce2cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -285,7 +285,7 @@ void IDS_Dispenser_Set_Flow_Params (char DispenserId,double nanolitterperpulse,c
     IDS_Dispenser_Data[DispenserId].nanolitterperpulse = nanolitterperpulse;
     IDS_Dispenser_Data[DispenserId].microsteps = microsteps;
     IDS_Dispenser_Data[DispenserId].direction = 1;
-    Report("IDS_Dispenser_Set_Flow_Params",__FILE__,DispenserId,(int)nanolitterperpulse,RpWarning,microsteps,0);
+    //Report("IDS_Dispenser_Set_Flow_Params",__FILE__,DispenserId,(int)nanolitterperpulse,RpWarning,microsteps,0);
 }
 void IDS_Dispenser_RefillStarted (char DispenserId)
 {
@@ -294,7 +294,7 @@ void IDS_Dispenser_RefillStarted (char DispenserId)
     IDS_Dispenser_Data[DispenserId].nanolitterperpulse = assumedFlow;
     IDS_Dispenser_Data[DispenserId].microsteps = 1;
     IDS_Dispenser_Data[DispenserId].direction = 0;
-    Report("IDS_Dispenser_RefillStarted",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)(assumedFlow*100),0);
+    //Report("IDS_Dispenser_RefillStarted",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)(assumedFlow*100),0);
 }
 void IDS_Dispenser_RefillEnded (char DispenserId)
 {
@@ -302,7 +302,7 @@ void IDS_Dispenser_RefillEnded (char DispenserId)
     IDS_Dispenser_Data[DispenserId].numberofrefills++;
     IDS_Dispenser_Data[DispenserId].direction = 1;
     IDS_Dispenser_Data[DispenserId].consumedinnanolitter = 0;
-    Report("IDS_Dispenser_RefillEnded",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)IDS_Dispenser_Data[DispenserId].numberofrefills,0);
+    //Report("IDS_Dispenser_RefillEnded",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)IDS_Dispenser_Data[DispenserId].numberofrefills,0);
 }
 void IDS_Dispenser_MovingDirection (char DispenserId, bool direction)
 {
@@ -314,6 +314,6 @@ void IDS_Dispenser_MovingDirection (char DispenserId, bool direction)
     {
         IDS_Dispenser_Data[DispenserId].direction = 0;
     }
-    Report("IDS_Dispenser_MovingDirection",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)direction,0);
+    //Report("IDS_Dispenser_MovingDirection",__FILE__,__LINE__,(int)DispenserId,RpWarning,(int)direction,0);
 }
 
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index d868354dd..5b2332143 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -515,7 +515,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
              return OK; //not all configured heaters are ready
          }
      }
-     REPORT_MSG(deviceID,"IDS_Valve_Presegment all Ready!!");
+     REPORT_MSG(deviceID,"IDS Presegment Ready!!");
      PreSegmentReady(Module_IDS,ModuleDone);
   return OK; // all configured heaters are ready
  }
@@ -526,7 +526,7 @@ c.  Go to step 2.a x Segment.BrushStopsCount.
  uint32_t InterSegmentStartRocking;
  uint32_t InterSegmentCenterRockers;
  uint32_t InterSegmentStartWFCFDispensers;
- bool EnableCleaning = false;
+ bool EnableCleaning = true;
 
 
  uint32_t DispenserPreSegmentControlId = 0xFF;
@@ -688,7 +688,7 @@ uint32_t IDSPreSegmentState(void *SegmentDetails, int SegmentId)
                 DispenserPreSegmentReady[DispenserId] = true; //27/03/19 check if job should be stopped
                 continue;
             }
-            REPORT_MSG(DispenserId,"IDS_Valve_Presegment start");
+            //REPORT_MSG(DispenserId,"IDS_Valve_Presegment start");
             IDS_Dispenser_Set_Flow_Params(DispenserId,0,0);
             if (Dispensers[Dispenser_i]->dispenserstepdivision != DISPENSER_STEP_DIVISION__Auto)
             {
@@ -767,6 +767,12 @@ void IDS_StartBrushStop(int n_dispensers,  JobDispenser** Dispensers)
                 Report(IdsMessage, __FILE__, __LINE__, Dispenser_i, RpWarning,   segmentfirst_speed, 0);
                 SendJobProgress(0.0, 0, false, IdsMessage);
             }
+            else
+            {
+                DispenserSegmentReady[DispenserId] = true;
+                IDS_Dispenser_Close_Valve_And_Stop_Motor(DispenserId,NULL);
+                Report("inActive dispenser stopped", __FILE__, __LINE__, DispenserId, RpWarning,   segmentfirst_speed, 0);
+            }
         }
     }
 }