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

3 files changed, 15 insertions, 6 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
index 960581da7..9879f5ad7 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/DiagnosticsHoming.c
@@ -266,7 +266,7 @@ uint32_t DispenserHomingRequestFunc(MessageContainer* requestContainer)
         {
             if (request->direction == MOTOR_DIRECTION__Backward) //dispenser homing
                 IDS_HomeDispenser(request->index,speed,DispenserHomingRequestCallback);
-            else //empty dispenser - support TBD
+            else //empty dispenser -
                 IDS_EmptyDispenser(request->index,speed,DispenserHomingRequestCallback);//return ERROR;
         }
     }
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
index b90ed3a1f..e4d4c7b9c 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c
@@ -154,14 +154,14 @@ uint32_t IDS_EmptyDispenser (uint32_t deviceID, uint32_t speed , callback_fptr c
     if ( Dispenser_Id_to_LS_Empty_Id[deviceID] != MAX_GPI)
     {
         //open dispenser valve dispenser to midtank direction
-        Control3WayValvesWithCallback ((Valves_t)deviceID, MidTank_Dispenser, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
-        //Valve_Set((Valves_t) request->index, MidTank_Dispenser);
+        Control3WayValvesWithCallback ((Valves_t)deviceID, Dispenser_Mixer, NULL); //direction: MidTank_Dispenser or Dispenser_Mixer
+        //Valve_Set((Valves_t) request->index, Dispenser_Mixer);
         MotorSetMicroStep(deviceID, 1);
         //open dry air valve in the dispenser
-        Valve_Set(IDS_Id_to_AirValve[deviceID], Atm_MidTank_ON);
+        //Valve_Set(IDS_Id_to_AirValve[deviceID], Atm_MidTank_ON);
 
 
-        MotorMovetoLimitSwitch (MotorId,1-MotorsCfg[MotorId].directionthreadwize, speed,  Dispenser_Id_to_LS_Empty_Id[deviceID], IDS_HomeDispenserCallback);
+        MotorMovetoLimitSwitch (MotorId,MotorsCfg[MotorId].directionthreadwize, speed,  Dispenser_Id_to_LS_Empty_Id[deviceID], IDS_HomeDispenserCallback);
         return OK;
     }
     return ERROR;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 320c0810f..f00954b06 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -165,7 +165,16 @@ bool IDS_isDispenserUsedNextSegment(void *JobDetails,int DispenserId, int Segmen
         for (Dispenser_i = 0;Dispenser_i < n_dispensers;Dispenser_i++)
         {
             if (DispenserId == JobTicket->segments[SegmentId]->brushstops[0]->dispensers[Dispenser_i]->index) //dispenser is in use next segment
-                return true;
+            {
+                if (JobTicket->segments[SegmentId]->brushstops[0]->dispensers[Dispenser_i]->nanolitterpersecond>0)
+                {
+                    return true;
+                }
+                else
+                {
+                    return false;
+                }
+            }
         }
     }