minor changes

3 files changed, 21 insertions, 7 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index c177b9b06..93048681d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -547,7 +547,7 @@ uint32_t PrepareHeater(int HeaterId, uint32_t SetTemperatue)
     HeaterPIDConfig[HeaterId].m_preError = 0;
     HeaterPIDConfig[HeaterId].m_SetParam = SetTemperatue*100;//need to update SetParams on presegment stage
 
-    int band = 8;
+    int band = 10;
     /*if (HeaterControl[HeaterId].outputproportionalband)
     {
         band = HeaterControl[HeaterId].outputproportionalband;
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index c4c9085ea..f3c5ad8da 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -661,7 +661,10 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback);
                      if (MotorsCfg[HW_Motor_Id].hardwaremotortype
                              != DispenserIdToMotorId[DispenserId])
                          continue;
-
+                     if ((DispenserId == CLEANER_DISPENSER)||(DispenserId == LUBRICANT_DISPENSER))
+                     {
+                         continue;
+                     }
                      //(Speed*uStep*PPR)/((2*PI*Dispenser_Radius)
                      segmentfirst_speed = Dispensers[Dispenser_i]->nanolitterpersecond
                              / Dispensers[Dispenser_i]->nanoliterperpulse;
@@ -677,7 +680,7 @@ uint32_t IDS_Cleaning_Stop_Cleaning_Solution (callback_fptr callback);
                      }
                      else
                      {
-                         //segmentfirst_speed/=MotorsCfg[HW_Motor_Id].microstep;  //the dye supply is calculated based on a 1/8 microstep
+                         segmentfirst_speed/=8;//MotorsCfg[HW_Motor_Id].microstep;  //the dye supply is calculated based on a 1/8 microstep
                          IDS_Dispenser_Set_Flow_Params(
                                  DispenserId, Dispensers[Dispenser_i]->nanoliterperpulse,
                                  MotorsCfg[HW_Motor_Id].microstep);
@@ -799,6 +802,13 @@ uint32_t IDSPreSegmentState(void *SegmentDetails, int SegmentId)
                 DispenserPreSegmentReady[DispenserId] = true; //27/03/19 check if job should be stopped
                 continue;
             }
+            if ((DispenserId == CLEANER_DISPENSER)||(DispenserId == LUBRICANT_DISPENSER))
+            {
+                REPORT_MSG(DispenserId,"Dispenser PreSegment cleaner or lubricant");
+                DispenserPreSegmentReady[DispenserId] = true; //27/03/19 check if job should be stopped
+                continue;
+            }
+
             //REPORT_MSG(DispenserId,"IDS_Valve_Presegment start");
             IDS_Dispenser_Set_Flow_Params(DispenserId,0,0);
             if (Dispensers[Dispenser_i]->dispenserstepdivision != DISPENSER_STEP_DIVISION__Auto)
@@ -842,7 +852,10 @@ void IDS_StartBrushStop(int n_dispensers,  JobDispenser** Dispensers)
             if (MotorsCfg[HW_Motor_Id].hardwaremotortype
                     != DispenserIdToMotorId[DispenserId])
                 continue;
-
+            if ((DispenserId == CLEANER_DISPENSER)||(DispenserId == LUBRICANT_DISPENSER))
+            {
+                continue;
+            }
             //(Speed*uStep*PPR)/((2*PI*Dispenser_Radius)
             segmentfirst_speed = Dispensers[Dispenser_i]->nanolitterpersecond
                     / Dispensers[Dispenser_i]->nanoliterperpulse;
@@ -858,7 +871,8 @@ void IDS_StartBrushStop(int n_dispensers,  JobDispenser** Dispensers)
             }
             else
             {
-                //segmentfirst_speed/=MotorsCfg[HW_Motor_Id].microstep;  //the dye supply is calculated based on a 1/8 microstep
+                segmentfirst_speed/=8;//MotorsCfg[HW_Motor_Id].microstep;  //the dye supply is calculated based on a 1/8 microstep
+
                 IDS_Dispenser_Set_Flow_Params(
                         DispenserId, Dispensers[Dispenser_i]->nanoliterperpulse,
                         MotorsCfg[HW_Motor_Id].microstep);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 1f7836ea5..0b19d835a 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -111,12 +111,12 @@ uint32_t Winder_Prepare(void)
     }*/
     if (FPGA_Read_limit_Switches(GPI_LS_SCREW_RIGHT)==LIMIT)
     {
-        //REPORT_MSG(LIMIT, "Winder_Prepare at limit");
+        REPORT_MSG(LIMIT, "Winder_Prepare at limit");
         Winder_PrepareStage2(0,0);
     }
     else
     {
-        //REPORT_MSG(ScrewSpeed, "Winder_Prepare");
+        REPORT_MSG(ScrewSpeed, "Winder_Prepare");
         Winder_ScrewHoming = true;
         //REPORT_MSG(MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, "Winder_Prepare move to limit");
         status = MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, ScrewSpeed, GPI_LS_SCREW_RIGHT, Winder_PrepareStage2,2000);